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

[Matteo F. Vescovi]

The following commit has been merged in the master branch:
commit 36ea75e160b611f4b6df539ae7ea6b891411e0cf
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Fri Dec 21 16:39:35 2012 +0100

    debian/patches/: new #0002 and #0003 added
    
    Thanks: Pino Toscano (pino) for the huge help.

diff --git a/debian/patches/0001-Fix_docs_generation.patch b/debian/patches/0001-Fix_docs_generation.patch
index cf4e489..b9418b6 100644
--- a/debian/patches/0001-Fix_docs_generation.patch
+++ b/debian/patches/0001-Fix_docs_generation.patch
@@ -3,17 +3,17 @@ 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
+ 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 +-
+ src/doc/CMakeLists.txt | 1 -
+ src/doc/Makefile       | 2 +-
  2 files changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index 3cbdcff..e698a7b 100644
+index ec9f5b3..9f5d84f 100644
 --- a/src/doc/CMakeLists.txt
 +++ b/src/doc/CMakeLists.txt
 @@ -1,7 +1,6 @@
diff --git a/debian/patches/0002-Fix_IlmBase_issue-1of2.patch b/debian/patches/0002-Fix_IlmBase_issue-1of2.patch
new file mode 100644
index 0000000..ad78584
--- /dev/null
+++ b/debian/patches/0002-Fix_IlmBase_issue-1of2.patch
@@ -0,0 +1,23 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Fri, 21 Dec 2012 16:31:29 +0100
+Subject: Fix_IlmBase_issue-1of2
+
+This first patch hides the private symbols
+even on kFreeBSD and Hurd, besides Linux.
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index d1fcb98..bb0e0a8 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -111,7 +111,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 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
+             # other verions of our dependencies.
diff --git a/debian/patches/0003-Fix_IlmBase_issue-2of2.patch b/debian/patches/0003-Fix_IlmBase_issue-2of2.patch
new file mode 100644
index 0000000..2df3ce4
--- /dev/null
+++ b/debian/patches/0003-Fix_IlmBase_issue-2of2.patch
@@ -0,0 +1,39 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Fri, 21 Dec 2012 16:34:56 +0100
+Subject: Fix_IlmBase_issue-2of2
+
+This second patch adds paths with multiarch support
+for ilm and openexr libraries.
+---
+ src/cmake/modules/FindIlmBase.cmake | 2 ++
+ src/cmake/modules/FindOpenEXR.cmake | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/cmake/modules/FindIlmBase.cmake b/src/cmake/modules/FindIlmBase.cmake
+index b84567f..d4eac45 100644
+--- a/src/cmake/modules/FindIlmBase.cmake
++++ b/src/cmake/modules/FindIlmBase.cmake
+@@ -114,7 +114,9 @@ set (IlmBase_generic_include_paths
+   /opt/local/include)
+ set (IlmBase_generic_library_paths
+   /usr/lib
++  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+   /usr/local/lib
++  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+   /sw/lib
+   /opt/local/lib)
+ 
+diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
+index a4071bd..35880cd 100644
+--- a/src/cmake/modules/FindOpenEXR.cmake
++++ b/src/cmake/modules/FindOpenEXR.cmake
+@@ -110,7 +110,9 @@ set (OpenEXR_generic_include_paths
+   /opt/local/include)
+ set (OpenEXR_generic_library_paths
+   /usr/lib
++  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+   /usr/local/lib
++  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+   /sw/lib
+   /opt/local/lib)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f1e5cac..697d294 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 0001-Fix_docs_generation.patch
+0002-Fix_IlmBase_issue-1of2.patch
+0003-Fix_IlmBase_issue-2of2.patch

-- 
OpenImageIO packaging