[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.2.3_dfsg0-1-10-g704f2d1
Matteo F. Vescovi
mfvescovi at gmail.com
Tue Jan 7 08:55:48 UTC 2014
The following commit has been merged in the master branch:
commit dc58b94c610ac1b9352698d288c54b3f8c6ade07
Author: Matteo F. Vescovi <mfvescovi at gmail.com>
Date: Wed Dec 4 15:26:51 2013 +0100
debian/patches/: patchset refreshed against v1.3.9
diff --git a/debian/patches/0001-Fix_docs_generation.patch b/debian/patches/0001-Fix_docs_generation.patch
index 759e01e..7b819a6 100644
--- a/debian/patches/0001-Fix_docs_generation.patch
+++ b/debian/patches/0001-Fix_docs_generation.patch
@@ -1,5 +1,5 @@
From: David Paleino <dapal at debian.org>
-Date: Wed, 7 Aug 2013 09:17:07 +0200
+Date: Wed, 4 Dec 2013 14:48:25 +0100
Subject: Fix_docs_generation
---
@@ -8,7 +8,7 @@ Subject: Fix_docs_generation
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index ec9f5b3..9f5d84f 100644
+index 5e2e986..d754dfc 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -1,7 +1,6 @@
@@ -16,11 +16,11 @@ index ec9f5b3..9f5d84f 100644
set (public_docs
- openimageio.pdf
- ${OpenImageIO_SOURCE_DIR}/../LICENSE
- ${OpenImageIO_SOURCE_DIR}/../CHANGES
+ "${OpenImageIO_SOURCE_DIR}/LICENSE"
+ "${OpenImageIO_SOURCE_DIR}/CHANGES"
)
diff --git a/src/doc/Makefile b/src/doc/Makefile
-index 86389a7..09cdcdd 100644
+index 7e75955..96afb13 100644
--- a/src/doc/Makefile
+++ b/src/doc/Makefile
@@ -5,7 +5,7 @@ all: openimageio.pdf
@@ -29,6 +29,6 @@ index 86389a7..09cdcdd 100644
# document making rule: use pdflatex
-openimageio.pdf: *.tex *.aux
+openimageio.pdf: *.tex
- ${PDFLATEX} openimageio
+ ${PDFLATEX} openimageio.tex
diff --git a/debian/patches/0002-Fix_IlmBase_issue.patch b/debian/patches/0002-Fix_IlmBase_issue.patch
index 15f1fc4..a7b83ad 100644
--- a/debian/patches/0002-Fix_IlmBase_issue.patch
+++ b/debian/patches/0002-Fix_IlmBase_issue.patch
@@ -1,22 +1,22 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Fri, 21 Dec 2012 16:31:29 +0100
+From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
+Date: Wed, 4 Dec 2013 14:54:41 +0100
Subject: Fix_IlmBase_issue
-This first patch hides the private symbols
-even on kFreeBSD and Hurd, besides Linux.
+This patch hides the private symbols even
+on kFreeBSD and Hurd, besides Linux.
---
- src/CMakeLists.txt | 2 +-
+ CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index adb380c..71f9a3e 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -130,7 +130,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 00f347d..79ecece 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,7 +77,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
# Turn default symbol visibility to hidden
set (VISIBILITY_COMMAND "-fvisibility=hidden -fvisibility-inlines-hidden")
add_definitions (${VISIBILITY_COMMAND})
-- if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+- if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
# Linux: also hide all the symbols of dependent libraries to
# prevent clashes if an app using OIIO is linked against
diff --git a/debian/patches/0003-Fix_multiarch_paths.patch b/debian/patches/0003-Fix_multiarch_paths.patch
index 436cc6a..5bc62ea 100644
--- a/debian/patches/0003-Fix_multiarch_paths.patch
+++ b/debian/patches/0003-Fix_multiarch_paths.patch
@@ -1,8 +1,8 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Fri, 21 Dec 2012 16:34:56 +0100
+From: "Matteo F. Vescovi" <mfvescovi at gmail.com>
+Date: Wed, 4 Dec 2013 15:21:12 +0100
Subject: Fix_multiarch_paths
-This second patch adds multiarch paths to the
+This patch adds multiarch paths to the
standard ones for ilm and openexr libraries.
---
src/cmake/modules/FindIlmBase.cmake | 2 ++
@@ -10,12 +10,12 @@ standard ones for ilm and openexr libraries.
2 files changed, 4 insertions(+)
diff --git a/src/cmake/modules/FindIlmBase.cmake b/src/cmake/modules/FindIlmBase.cmake
-index 9e2fe5b..041b470 100644
+index 51f6a9c..f6a0b03 100644
--- a/src/cmake/modules/FindIlmBase.cmake
+++ b/src/cmake/modules/FindIlmBase.cmake
-@@ -118,7 +118,9 @@ set (IlmBase_generic_include_paths
- /opt/local/include)
+@@ -124,7 +124,9 @@ set (IlmBase_generic_include_paths
set (IlmBase_generic_library_paths
+ ${ILMBASE_CUSTOM_LIB_DIR}
/usr/lib
+ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/lib
@@ -24,12 +24,12 @@ index 9e2fe5b..041b470 100644
/opt/local/lib)
diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
-index bd37e8a..955c025 100644
+index ac8eda1..ebd1f24 100644
--- a/src/cmake/modules/FindOpenEXR.cmake
+++ b/src/cmake/modules/FindOpenEXR.cmake
-@@ -114,7 +114,9 @@ set (OpenEXR_generic_include_paths
- /opt/local/include)
+@@ -120,7 +120,9 @@ set (OpenEXR_generic_include_paths
set (OpenEXR_generic_library_paths
+ ${OPENEXR_CUSTOM_LIB_DIR}
/usr/lib
+ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
/usr/local/lib
diff --git a/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch b/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
index 9831d71..bc89a32 100644
--- a/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
+++ b/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
@@ -1,5 +1,5 @@
From: Roland Stigge <stigge at antcom.de>
-Date: Tue, 21 May 2013 15:09:00 +0200
+Date: Wed, 4 Dec 2013 15:25:33 +0100
Subject: Fix_FTBFS_on_atomic_operations
---
@@ -7,40 +7,40 @@ Subject: Fix_FTBFS_on_atomic_operations
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/include/thread.h b/src/include/thread.h
-index e389ebb..4735796 100644
+index ecf3e66..1a927ea 100644
--- a/src/include/thread.h
+++ b/src/include/thread.h
-@@ -220,7 +220,7 @@ inline int
- atomic_exchange_and_add (volatile int *at, int x)
- {
- #ifdef USE_GCC_ATOMICS
+@@ -223,7 +223,7 @@ atomic_exchange_and_add (volatile int *at, int x)
+ #ifdef NOTHREADS
+ int r = *at; *at += x; return r;
+ #elif defined(USE_GCC_ATOMICS)
- return __sync_fetch_and_add ((int *)at, x);
+ return __atomic_fetch_add ((int *)at, x, __ATOMIC_SEQ_CST);
#elif USE_TBB
atomic<int> *a = (atomic<int> *)at;
return a->fetch_and_add (x);
-@@ -238,7 +238,7 @@ inline long long
- atomic_exchange_and_add (volatile long long *at, long long x)
- {
- #ifdef USE_GCC_ATOMICS
+@@ -243,7 +243,7 @@ atomic_exchange_and_add (volatile long long *at, long long x)
+ #ifdef NOTHREADS
+ long long r = *at; *at += x; return r;
+ #elif defined(USE_GCC_ATOMICS)
- return __sync_fetch_and_add (at, x);
+ return __atomic_fetch_add (at, x, __ATOMIC_SEQ_CST);
#elif USE_TBB
atomic<long long> *a = (atomic<long long> *)at;
return a->fetch_and_add (x);
-@@ -266,7 +266,7 @@ inline bool
- atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
- {
- #ifdef USE_GCC_ATOMICS
+@@ -277,7 +277,7 @@ atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
+ return false;
+ }
+ #elif defined(USE_GCC_ATOMICS)
- return __sync_bool_compare_and_swap (at, compareval, newval);
+ return __atomic_compare_exchange_n (at, &compareval, newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
#elif USE_TBB
atomic<int> *a = (atomic<int> *)at;
return a->compare_and_swap (newval, compareval) == newval;
-@@ -283,7 +283,7 @@ inline bool
- atomic_compare_and_exchange (volatile long long *at, long long compareval, long long newval)
- {
- #ifdef USE_GCC_ATOMICS
+@@ -300,7 +300,7 @@ atomic_compare_and_exchange (volatile long long *at, long long compareval, long
+ return false;
+ }
+ #elif defined(USE_GCC_ATOMICS)
- return __sync_bool_compare_and_swap (at, compareval, newval);
+ return __atomic_compare_exchange_n (at, &compareval, newval, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST);
#elif USE_TBB
--
OpenImageIO packaging
More information about the Pkg-phototools-commits
mailing list