[Pkg-phototools-commits] [SCM] openimageio branch, master.experimental, updated. debian/1.2.0_dfsg0-1-3-gba84541

Matteo F. Vescovi mfv.debian at gmail.com
Tue Jul 16 15:38:58 UTC 2013


The following commit has been merged in the master.experimental branch:
commit 231e94f5f827bf88b1d69560a952c3211c4fec13
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Tue Jul 16 17:11:31 2013 +0200

    debian/patches/: patchset updated
    
    - 0005-Fix_FTBFS_due_to_bit_range_convert_issue.patch added
    
    Thanks: Larry Gritz (upstream devel) for the hint.

diff --git a/debian/patches/0002-Fix_IlmBase_issue.patch b/debian/patches/0002-Fix_IlmBase_issue.patch
index db0717f..aa9e2d2 100644
--- a/debian/patches/0002-Fix_IlmBase_issue.patch
+++ b/debian/patches/0002-Fix_IlmBase_issue.patch
@@ -9,10 +9,10 @@ even on kFreeBSD and Hurd, besides Linux.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b6f326f..a72ce9d 100644
+index 9b64aae..de94b3b 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -113,7 +113,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
+@@ -130,7 +130,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})
diff --git a/debian/patches/0003-Fix_multiarch_paths.patch b/debian/patches/0003-Fix_multiarch_paths.patch
index d7c2b80..436cc6a 100644
--- a/debian/patches/0003-Fix_multiarch_paths.patch
+++ b/debian/patches/0003-Fix_multiarch_paths.patch
@@ -10,10 +10,10 @@ 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 b84567f..d4eac45 100644
+index 9e2fe5b..041b470 100644
 --- a/src/cmake/modules/FindIlmBase.cmake
 +++ b/src/cmake/modules/FindIlmBase.cmake
-@@ -114,7 +114,9 @@ set (IlmBase_generic_include_paths
+@@ -118,7 +118,9 @@ set (IlmBase_generic_include_paths
    /opt/local/include)
  set (IlmBase_generic_library_paths
    /usr/lib
@@ -24,10 +24,10 @@ index b84567f..d4eac45 100644
    /opt/local/lib)
  
 diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
-index a4071bd..35880cd 100644
+index bd37e8a..955c025 100644
 --- a/src/cmake/modules/FindOpenEXR.cmake
 +++ b/src/cmake/modules/FindOpenEXR.cmake
-@@ -110,7 +110,9 @@ set (OpenEXR_generic_include_paths
+@@ -114,7 +114,9 @@ set (OpenEXR_generic_include_paths
    /opt/local/include)
  set (OpenEXR_generic_library_paths
    /usr/lib
diff --git a/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch b/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
index 8c3e51b..b72d9cf 100644
--- a/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
+++ b/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
@@ -7,10 +7,10 @@ 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 30fe1bf..cc80c1e 100644
+index cf3717e..23a8e56 100644
 --- a/src/include/thread.h
 +++ b/src/include/thread.h
-@@ -226,7 +226,7 @@ inline int
+@@ -222,7 +222,7 @@ inline int
  atomic_exchange_and_add (volatile int *at, int x)
  {
  #ifdef USE_GCC_ATOMICS
@@ -19,7 +19,7 @@ index 30fe1bf..cc80c1e 100644
  #elif USE_TBB
      atomic<int> *a = (atomic<int> *)at;
      return a->fetch_and_add (x);
-@@ -247,7 +247,7 @@ inline long long
+@@ -240,7 +240,7 @@ inline long long
  atomic_exchange_and_add (volatile long long *at, long long x)
  {
  #ifdef USE_GCC_ATOMICS
@@ -28,7 +28,7 @@ index 30fe1bf..cc80c1e 100644
  #elif USE_TBB
      atomic<long long> *a = (atomic<long long> *)at;
      return a->fetch_and_add (x);
-@@ -278,7 +278,7 @@ inline bool
+@@ -268,7 +268,7 @@ inline bool
  atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
  {
  #ifdef USE_GCC_ATOMICS
@@ -37,7 +37,7 @@ index 30fe1bf..cc80c1e 100644
  #elif USE_TBB
      atomic<int> *a = (atomic<int> *)at;
      return a->compare_and_swap (newval, compareval) == newval;
-@@ -297,7 +297,7 @@ inline bool
+@@ -285,7 +285,7 @@ inline bool
  atomic_compare_and_exchange (volatile long long *at, long long compareval, long long newval)
  {
  #ifdef USE_GCC_ATOMICS
diff --git a/debian/patches/0005-Fix_FTBFS_due_to_bit_range_convert_issue.patch b/debian/patches/0005-Fix_FTBFS_due_to_bit_range_convert_issue.patch
new file mode 100644
index 0000000..4657b72
--- /dev/null
+++ b/debian/patches/0005-Fix_FTBFS_due_to_bit_range_convert_issue.patch
@@ -0,0 +1,23 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Tue, 16 Jul 2013 16:48:28 +0200
+Subject: Fix_FTBFS_due_to_bit_range_convert_issue
+
+---
+ src/libOpenImageIO/fmath_test.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libOpenImageIO/fmath_test.cpp b/src/libOpenImageIO/fmath_test.cpp
+index fefaac0..fdf7f4e 100644
+--- a/src/libOpenImageIO/fmath_test.cpp
++++ b/src/libOpenImageIO/fmath_test.cpp
+@@ -72,8 +72,8 @@ void test_bit_range_convert ()
+     OIIO_CHECK_EQUAL ((bit_range_convert<2,20>(3)), 1048575);
+     OIIO_CHECK_EQUAL ((bit_range_convert<20,2>(1048575)), 3);
+     OIIO_CHECK_EQUAL ((bit_range_convert<20,21>(1048575)), 2097151);
+-    OIIO_CHECK_EQUAL ((bit_range_convert<32,32>(4294967295)), 4294967295);
+-    OIIO_CHECK_EQUAL ((bit_range_convert<32,16>(4294967295)), 65535);
++    OIIO_CHECK_EQUAL ((bit_range_convert<32,32>(4294967295U)), 4294967295U);
++    OIIO_CHECK_EQUAL ((bit_range_convert<32,16>(4294967295U)), 65535);
+ // These are not expected to work, since bit_range_convert only takes a
+ // regular 'unsigned int' as parameter.  If we need >32 bit conversion,
+ // we need to add a uint64_t version of bit_range_convert.
diff --git a/debian/patches/series b/debian/patches/series
index a340afe..ef603ca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Fix_IlmBase_issue.patch
 0003-Fix_multiarch_paths.patch
 0004-Fix_FTBFS_on_atomic_operations.patch
+0005-Fix_FTBFS_due_to_bit_range_convert_issue.patch

-- 
OpenImageIO packaging



More information about the Pkg-phototools-commits mailing list