[Pkg-phototools-commits] [SCM] openimageio branch, master.experimental, updated. debian/1.2.0_dfsg0-2-5-g75dd4d7

Matteo F. Vescovi mfv.debian at gmail.com
Mon Aug 12 07:46:18 UTC 2013


The following commit has been merged in the master.experimental branch:
commit f42fc104481cd91985f8338d98753b3f6922735a
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Wed Aug 7 09:25:45 2013 +0200

    debian/patches/: patchset updated
    
    - 0001-Fix_docs_generation.patch refreshed
    - 0005-Fix_FTBFS_due_to_bit_range_convert_issue.patch dropped
      since applied upstream

diff --git a/debian/patches/0001-Fix_docs_generation.patch b/debian/patches/0001-Fix_docs_generation.patch
index b1e4d35..759e01e 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: Mon, 16 Apr 2012 10:11:46 +0200
+Date: Wed, 7 Aug 2013 09:17:07 +0200
 Subject: Fix_docs_generation
 
 ---
@@ -20,15 +20,15 @@ index ec9f5b3..9f5d84f 100644
       ${OpenImageIO_SOURCE_DIR}/../CHANGES
  )
 diff --git a/src/doc/Makefile b/src/doc/Makefile
-index cdc25e4..7b47251 100644
+index 86389a7..09cdcdd 100644
 --- a/src/doc/Makefile
 +++ b/src/doc/Makefile
-@@ -4,7 +4,7 @@ all: openimageio.pdf
+@@ -5,7 +5,7 @@ all: openimageio.pdf
  
  
  # document making rule: use pdflatex
 -openimageio.pdf: *.tex *.aux
 +openimageio.pdf: *.tex
- 	pdflatex openimageio
+ 	${PDFLATEX} openimageio
  
  
diff --git a/debian/patches/0002-Fix_IlmBase_issue.patch b/debian/patches/0002-Fix_IlmBase_issue.patch
index aa9e2d2..15f1fc4 100644
--- a/debian/patches/0002-Fix_IlmBase_issue.patch
+++ b/debian/patches/0002-Fix_IlmBase_issue.patch
@@ -9,7 +9,7 @@ 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 9b64aae..de94b3b 100644
+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/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch b/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
index b72d9cf..9831d71 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 cf3717e..23a8e56 100644
+index e389ebb..4735796 100644
 --- a/src/include/thread.h
 +++ b/src/include/thread.h
-@@ -222,7 +222,7 @@ inline int
+@@ -220,7 +220,7 @@ inline int
  atomic_exchange_and_add (volatile int *at, int x)
  {
  #ifdef USE_GCC_ATOMICS
@@ -19,7 +19,7 @@ index cf3717e..23a8e56 100644
  #elif USE_TBB
      atomic<int> *a = (atomic<int> *)at;
      return a->fetch_and_add (x);
-@@ -240,7 +240,7 @@ inline long long
+@@ -238,7 +238,7 @@ inline long long
  atomic_exchange_and_add (volatile long long *at, long long x)
  {
  #ifdef USE_GCC_ATOMICS
@@ -28,7 +28,7 @@ index cf3717e..23a8e56 100644
  #elif USE_TBB
      atomic<long long> *a = (atomic<long long> *)at;
      return a->fetch_and_add (x);
-@@ -268,7 +268,7 @@ inline bool
+@@ -266,7 +266,7 @@ inline bool
  atomic_compare_and_exchange (volatile int *at, int compareval, int newval)
  {
  #ifdef USE_GCC_ATOMICS
@@ -37,7 +37,7 @@ index cf3717e..23a8e56 100644
  #elif USE_TBB
      atomic<int> *a = (atomic<int> *)at;
      return a->compare_and_swap (newval, compareval) == newval;
-@@ -285,7 +285,7 @@ inline bool
+@@ -283,7 +283,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
deleted file mode 100644
index 4657b72..0000000
--- a/debian/patches/0005-Fix_FTBFS_due_to_bit_range_convert_issue.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 ef603ca..a340afe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 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