[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. debian/1.2.1_dfsg0-2

[Matteo F. Vescovi]

The following commit has been merged in the master branch:
commit d6a29f449f665d1d1fa1af0f1631ca9dbc8ad04d
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Fri Jun 28 10:00:37 2013 +0200

    debian/patches/: patchset updated
    
    - 0004-Fix_pause_issue.patch dropped (applied upstream)
    - 0005-Fix_FTBFS_on_atomic_operations.patch renamed to #0004

diff --git a/debian/patches/0005-Fix_FTBFS_on_atomic_operations.patch b/debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
similarity index 100%
rename from debian/patches/0005-Fix_FTBFS_on_atomic_operations.patch
rename to debian/patches/0004-Fix_FTBFS_on_atomic_operations.patch
diff --git a/debian/patches/0004-Fix_pause_issue.patch b/debian/patches/0004-Fix_pause_issue.patch
deleted file mode 100644
index a2561f0..0000000
--- a/debian/patches/0004-Fix_pause_issue.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Mon, 24 Dec 2012 16:02:50 +0100
-Subject: Fix_pause_issue
-
----
- src/include/thread.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/include/thread.h b/src/include/thread.h
-index 28645fc..30fe1bf 100644
---- a/src/include/thread.h
-+++ b/src/include/thread.h
-@@ -336,7 +336,7 @@ pause (int delay)
- {
- #if USE_TBB
-     __TBB_Pause(delay);
--#elif defined(__GNUC__)
-+#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
-     for (int i = 0; i < delay; ++i) {
-         __asm__ __volatile__("pause;");
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 7337228..a340afe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-Fix_docs_generation.patch
 0002-Fix_IlmBase_issue.patch
 0003-Fix_multiarch_paths.patch
-0004-Fix_pause_issue.patch
-0005-Fix_FTBFS_on_atomic_operations.patch
+0004-Fix_FTBFS_on_atomic_operations.patch

-- 
OpenImageIO packaging