The following commit has been merged in the jessie branch: commit 492423dbf0d24c533b72b8f26e2c767a4fe4e830 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Oct 9 01:42:31 2013 +0200
Add header for thread ID patch. diff --git a/debian/patches/kfreebsd-getCurrentThreadId.patch b/debian/patches/fallback-getCurrentThreadId.patch similarity index 61% rename from debian/patches/kfreebsd-getCurrentThreadId.patch rename to debian/patches/fallback-getCurrentThreadId.patch index 00e559c..711d05e 100644 --- a/debian/patches/kfreebsd-getCurrentThreadId.patch +++ b/debian/patches/fallback-getCurrentThreadId.patch @@ -1,7 +1,9 @@ -Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp -=================================================================== ---- osgearth-2.4.0+dfsg.orig/src/osgEarth/ThreadingUtils.cpp 2013-04-11 19:07:39.000000000 +0100 -+++ osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp 2013-10-04 22:04:38.898332000 +0100 +Description: Fallback to pthread_self() for thread ID on non-Linux kernels. +Author: Steven Chamberlain <ste...@pyro.eu.org> +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=725383 +Last-Update: 2013-10-04 +--- a/src/osgEarth/ThreadingUtils.cpp ++++ b/src/osgEarth/ThreadingUtils.cpp @@ -20,9 +20,11 @@ #ifdef _WIN32 @@ -15,7 +17,7 @@ Index: osgearth-2.4.0+dfsg/src/osgEarth/ThreadingUtils.cpp #endif using namespace osgEarth::Threading; -@@ -38,7 +40,10 @@ +@@ -38,7 +40,10 @@ unsigned osgEarth::Threading::getCurrent return (unsigned)::GetCurrentThreadId(); #elif __APPLE__ return ::syscall(SYS_thread_selfid); diff --git a/debian/patches/series b/debian/patches/series index 5fb7e42..213f5c1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ soversion.patch MPGeometry-OpenSceneGraph-3.1.8.patch becuase-typo.patch -kfreebsd-getCurrentThreadId.patch +fallback-getCurrentThreadId.patch -- osgEarth terrain rendering toolkit _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel