[Pkg-phototools-commits] [SCM] openimageio branch, master, updated. upstream/1.1.2+dfsg0-93-g1228be7

Matteo F. Vescovi mfv.debian at gmail.com
Thu Dec 27 09:27:23 UTC 2012


The following commit has been merged in the master branch:
commit fcfefabcf36ccf13ca5cd69f7118cd14d4e7296b
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Mon Dec 24 16:04:26 2012 +0100

    debian/patches/: #0004 added to fix "pause" issue
    
    Upstream misused the "pause" command, avoiding
    architectures other than amd64/i386 to build fine.
    This patch should fix this problem.
    
    Thanks: Luca Falavigna (dktrkranz) for the hint.
    Git-Dch: Short

diff --git a/debian/patches/0001-Fix_docs_generation.patch b/debian/patches/0001-Fix_docs_generation.patch
index b9418b6..2559962 100644
--- a/debian/patches/0001-Fix_docs_generation.patch
+++ b/debian/patches/0001-Fix_docs_generation.patch
@@ -3,11 +3,6 @@ Date: Mon, 16 Apr 2012 10:11:46 +0200
 Subject: Fix_docs_generation
 
 ---
- From: David Paleino <dapal at debian.org>
- Subject: fix LaTeX→PDF generation
- Origin: vendor
- Forwarded: no
-
  src/doc/CMakeLists.txt | 1 -
  src/doc/Makefile       | 2 +-
  2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/debian/patches/0004-Fix_pause_issue.patch b/debian/patches/0004-Fix_pause_issue.patch
new file mode 100644
index 0000000..d8580d6
--- /dev/null
+++ b/debian/patches/0004-Fix_pause_issue.patch
@@ -0,0 +1,21 @@
+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 5682f9b..51efc4e 100644
+--- a/src/include/thread.h
++++ b/src/include/thread.h
+@@ -324,7 +324,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 dc15349..ebbe12e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Fix_docs_generation.patch
 0002-Fix_IlmBase_issue.patch
 0003-Fix_multiarch_paths.patch
+0004-Fix_pause_issue.patch

-- 
OpenImageIO packaging



More information about the Pkg-phototools-commits mailing list