[osgearth] 04/09: Drop patches applied upstream. Refresh remaining patches.
Bas Couwenberg
sebastic at debian.org
Fri Sep 9 20:41:14 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository osgearth.
commit 2d50e7e66f3f04d115e819814cf8daf1aa1b2097
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 9 20:15:55 2016 +0200
Drop patches applied upstream. Refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/fallback-getCurrentThreadId.patch | 33 ---------
debian/patches/kfreebsd-getCurrentThreadId.patch | 27 -------
debian/patches/series | 4 --
debian/patches/soversion.patch | 2 +-
debian/patches/spelling-errors.patch | 83 ----------------------
...ndefined-reference-to-symbol-XInitThreads.patch | 5 +-
debian/patches/version.patch | 16 -----
8 files changed, 4 insertions(+), 167 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c1dce20..7aab053 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
osgearth (2.8~rc2+dfsg-1) UNRELEASED; urgency=medium
* New upstream release candidate.
+ * Drop patches applied upstream. Refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 09 Sep 2016 20:14:13 +0200
diff --git a/debian/patches/fallback-getCurrentThreadId.patch b/debian/patches/fallback-getCurrentThreadId.patch
deleted file mode 100644
index 6ba673c..0000000
--- a/debian/patches/fallback-getCurrentThreadId.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fallback to pthread_self() for thread ID on non-Linux kernels.
-Author: Steven Chamberlain <steven at pyro.eu.org>
-Bug-Debian: http://bugs.debian.org/725383
-Forwarded: https://github.com/gwaldron/osgearth/pull/793
-Applied-Upstream: https://github.com/gwaldron/osgearth/commit/fd8b957470eedd1cdc35ccf943d983461b501d61
-
---- a/src/osgEarth/ThreadingUtils.cpp
-+++ b/src/osgEarth/ThreadingUtils.cpp
-@@ -20,9 +20,11 @@
-
- #ifdef _WIN32
- extern "C" unsigned long __stdcall GetCurrentThreadId();
--#else
-+#elif defined(__APPLE__) || defined(__LINUX__)
- # include <unistd.h>
- # include <sys/syscall.h>
-+#else
-+# include <pthread.h>
- #endif
-
- using namespace osgEarth::Threading;
-@@ -40,7 +42,10 @@ unsigned osgEarth::Threading::getCurrent
- return ::syscall(SYS_thread_selfid);
- #elif __ANDROID__
- return gettid();
--#else
-+#elif __LINUX__
- return (unsigned)::syscall(SYS_gettid);
-+#else
-+ /* :XXX: this truncates to 32 bits, but better than nothing */
-+ return (unsigned)pthread_self();
- #endif
- }
diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/kfreebsd-getCurrentThreadId.patch
deleted file mode 100644
index 8baa845..0000000
--- a/debian/patches/kfreebsd-getCurrentThreadId.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Use thr_self syscall on kFreeBSD.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/gwaldron/osgearth/pull/793
-Applied-Upstream: https://github.com/gwaldron/osgearth/commit/fd8b957470eedd1cdc35ccf943d983461b501d61
-
---- a/src/osgEarth/ThreadingUtils.cpp
-+++ b/src/osgEarth/ThreadingUtils.cpp
-@@ -20,7 +20,7 @@
-
- #ifdef _WIN32
- extern "C" unsigned long __stdcall GetCurrentThreadId();
--#elif defined(__APPLE__) || defined(__LINUX__)
-+#elif defined(__APPLE__) || defined(__LINUX__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- # include <unistd.h>
- # include <sys/syscall.h>
- #else
-@@ -44,6 +44,10 @@ unsigned osgEarth::Threading::getCurrent
- return gettid();
- #elif __LINUX__
- return (unsigned)::syscall(SYS_gettid);
-+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+ long tid;
-+ syscall(SYS_thr_self, &tid);
-+ return (unsigned)tid;
- #else
- /* :XXX: this truncates to 32 bits, but better than nothing */
- return (unsigned)pthread_self();
diff --git a/debian/patches/series b/debian/patches/series
index d6b3a53..4584f53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,2 @@
soversion.patch
-version.patch
-fallback-getCurrentThreadId.patch
-kfreebsd-getCurrentThreadId.patch
undefined-reference-to-symbol-XInitThreads.patch
-spelling-errors.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
index a9d9d1e..9aaddd5 100644
--- a/debian/patches/soversion.patch
+++ b/debian/patches/soversion.patch
@@ -5,7 +5,7 @@ Author: Pirmin Kalberer <pka at sourcepole.ch>
+++ b/CMakeLists.txt
@@ -34,7 +34,7 @@ PROJECT(OSGEARTH)
SET(OSGEARTH_MAJOR_VERSION 2)
- SET(OSGEARTH_MINOR_VERSION 9)
+ SET(OSGEARTH_MINOR_VERSION 8)
SET(OSGEARTH_PATCH_VERSION 0)
-SET(OSGEARTH_SOVERSION 0)
+SET(OSGEARTH_SOVERSION 5)
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 92fd79c..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Description: Fix spelling errors.
- proceses -> processes
- Faild -> Failed
- indiciating -> indicating
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/gwaldron/osgearth/pull/795
-Applied-Upstream: https://github.com/gwaldron/osgearth/commit/d20bd2f88578b8219ec561b4b40d82bdad425261
-
---- a/docs/source/user/tools.rst
-+++ b/docs/source/user/tools.rst
-@@ -95,7 +95,7 @@ The most common usage of osgearth_cache
- +-------------------------------------+--------------------------------------------------------------------+
- | ``--mt`` | Use multithreading to process the tiles. |
- +-------------------------------------+--------------------------------------------------------------------+
--| ``--concurrency`` | The number of threads or proceses to use if --mp or --mt |
-+| ``--concurrency`` | The number of threads or processes to use if --mp or --mt |
- | | are provided |
- +-------------------------------------+--------------------------------------------------------------------+
- | ``--min-level level`` | Lowest LOD level to seed (default=0) |
-@@ -160,7 +160,7 @@ osgearth_package creates a redistributab
- +------------------------------------+--------------------------------------------------------------------+
- | ``--mt`` | Use multithreading to process the tiles. |
- +------------------------------------+--------------------------------------------------------------------+
--| ``--concurrency`` | The number of threads or proceses to use if --mp or --mt |
-+| ``--concurrency`` | The number of threads or processes to use if --mp or --mt |
- | | are provided |
- +------------------------------------+--------------------------------------------------------------------+
- | ``--alpha-mask`` | Mask out imagery that isn't in the provided extents. |
---- a/src/applications/osgearth_package/osgearth_package.cpp
-+++ b/src/applications/osgearth_package/osgearth_package.cpp
-@@ -71,7 +71,7 @@ usage( const std::string& msg = "" )
- << " [--db-options] : db options string to pass to the image writer in quotes (e.g., \"JPEG_QUALITY 60\")\n"
- << " [--mp] ; Use multiprocessing to process the tiles. Useful for GDAL sources as this avoids the global GDAL lock" << std::endl
- << " [--mt] ; Use multithreading to process the tiles." << std::endl
-- << " [--concurrency] ; The number of threads or proceses to use if --mp or --mt are provided." << std::endl
-+ << " [--concurrency] ; The number of threads or processes to use if --mp or --mt are provided." << std::endl
- << " [--alpha-mask] ; Mask out imagery that isn't in the provided extents." << std::endl
- << std::endl
- << " [--verbose] ; Displays progress of the operation" << std::endl;
---- a/src/applications/osgearth_seed/osgearth_seed.cpp
-+++ b/src/applications/osgearth_seed/osgearth_seed.cpp
-@@ -89,7 +89,7 @@ int
- << " [--index shapefile] ; Use the feature extents in a shapefile to set the bounding boxes for seeding" << std::endl
- << " [--mp] ; Use multiprocessing to process the tiles. Useful for GDAL sources as this avoids the global GDAL lock" << std::endl
- << " [--mt] ; Use multithreading to process the tiles." << std::endl
-- << " [--concurrency] ; The number of threads or proceses to use if --mp or --mt are provided." << std::endl
-+ << " [--concurrency] ; The number of threads or processes to use if --mp or --mt are provided." << std::endl
- << " [--verbose] ; Displays progress of the seed operation" << std::endl
- << std::endl
- << " --purge file.earth ; Purges a layer cache in a .earth file (interactive)" << std::endl
---- a/src/osgEarthDrivers/osg/OSGTileSource.cpp
-+++ b/src/osgEarthDrivers/osg/OSGTileSource.cpp
-@@ -88,7 +88,7 @@ public:
-
- if ( !image.valid() )
- {
-- return Status::Error( Status::ResourceUnavailable, Stringify() << "Faild to load data from \"" << _options.url()->full() << "\"" );
-+ return Status::Error( Status::ResourceUnavailable, Stringify() << "Failed to load data from \"" << _options.url()->full() << "\"" );
- }
-
- // calculate and store the maximum LOD for which to return data
---- a/src/osgEarth/GPUClamping.vert.lib.glsl
-+++ b/src/osgEarth/GPUClamping.vert.lib.glsl
-@@ -27,7 +27,7 @@ void oe_getClampedViewVertex(in vec4 ver
- out_clampedVertView = oe_clamp_depthClip2cameraView * clampedVertDepthClip;
- }
-
--// Returns a vector indiciating the "down" direction.
-+// Returns a vector indicating the "down" direction.
- void oe_getClampingUpVector(out vec3 up)
- {
- up = normalize(mat3(oe_clamp_depthClip2cameraView) * vec3(0,0,-1));
---- a/src/osgEarthFeatures/ExtrudeGeometryFilter.cpp
-+++ b/src/osgEarthFeatures/ExtrudeGeometryFilter.cpp
-@@ -1222,7 +1222,7 @@ ExtrudeGeometryFilter::push( FeatureList
- AllocateAndMergeBufferObjectsVisitor allocAndMerge;
- group->accept( allocAndMerge );
-
-- // set a uniform indiciating that clamping attributes are available.
-+ // set a uniform indicating that clamping attributes are available.
- Clamping::installHasAttrsUniform( group->getOrCreateStateSet() );
-
- // if we drew outlines, apply a poly offset too.
diff --git a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
index 394f8a1..53b578c 100644
--- a/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
+++ b/debian/patches/undefined-reference-to-symbol-XInitThreads.patch
@@ -1,10 +1,9 @@
Description: Link X11 to fix FTBFS.
/usr/bin/ld: CMakeFiles/application_osgearth_package_qt.dir/package_qt.cpp.o: undefined reference to symbol 'XInitThreads'
- //usr/lib/x86_64-linux-gnu/libX11.so.6: error adding symbols: DSO missing from command line
+ /usr/lib/x86_64-linux-gnu/libX11.so.6: error adding symbols: DSO missing from command line
Author: Sandro Mani <manisandro at gmail.com>
Origin: https://kojipkgs.fedoraproject.org//packages/osgearth/2.6/4.fc22/src/osgearth-2.6-4.fc22.src.rpm
-Forwarded: https://github.com/gwaldron/osgearth/pull/794
-Applied-Upstream: https://github.com/gwaldron/osgearth/commit/e87df7d58c6cce9706a20d7ad66ba893aaad0422
+Forwarded: not-needed
--- a/src/applications/osgearth_demo/CMakeLists.txt
+++ b/src/applications/osgearth_demo/CMakeLists.txt
diff --git a/debian/patches/version.patch b/debian/patches/version.patch
deleted file mode 100644
index d32b6c9..0000000
--- a/debian/patches/version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix version for CMake build.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/gwaldron/osgearth/pull/792
-Applied-Upstream: https://github.com/gwaldron/osgearth/commit/2946c857ab07f807b93bda8e8b3ff6d3f6022de5
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,7 +32,7 @@ SET_PROPERTY( GLOBAL PROPERTY PREDEFINED
- PROJECT(OSGEARTH)
-
- SET(OSGEARTH_MAJOR_VERSION 2)
--SET(OSGEARTH_MINOR_VERSION 9)
-+SET(OSGEARTH_MINOR_VERSION 8)
- SET(OSGEARTH_PATCH_VERSION 0)
- SET(OSGEARTH_SOVERSION 5)
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osgearth.git
More information about the Pkg-grass-devel
mailing list