From 3bbc3b75e60a0607dedaa5e07b7ceb9d6721e646 Mon Sep 17 00:00:00 2001 From: Richard M. Shaw Date: Jun 28 2012 20:40:00 +0000 Subject: - Update to latest upstream release. - Fix linking against TBB which broke at some point. --- diff --git a/.gitignore b/.gitignore index 6e1ea50..3f9de0b 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /OpenImageIO-oiio-Release-1.0.4-0-g513d0dd.tar.gz /OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz +/OpenImageIO-oiio-Release-1.0.6-0-g47d4346.tar.gz diff --git a/OpenImageIO-1.0.0-use_external_tbb.patch b/OpenImageIO-1.0.0-use_external_tbb.patch index ac7db6b..9640b23 100644 --- a/OpenImageIO-1.0.0-use_external_tbb.patch +++ b/OpenImageIO-1.0.0-use_external_tbb.patch @@ -26,3 +26,42 @@ diff -Naur OpenImageIO-oiio-5b37f1c.orig/src/include/CMakeLists.txt OpenImageIO- install (DIRECTORY tbb DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT developer) endif () +diff -Naur OpenImageIO-oiio-f0a566a.orig/src/CMakeLists.txt OpenImageIO-oiio-f0a566a/src/CMakeLists.txt +--- OpenImageIO-oiio-f0a566a.orig/src/CMakeLists.txt 2012-06-12 13:03:37.000000000 -0500 ++++ OpenImageIO-oiio-f0a566a/src/CMakeLists.txt 2012-06-28 15:12:45.831826494 -0500 +@@ -34,6 +34,8 @@ + set (PYTHON_VERSION 2.6) + set (USE_EXTERNAL_PUGIXML OFF CACHE BOOL + "Use an externally built shared library version of the pugixml library") ++set (USE_EXTERNAL_TBB OFF CACHE BOOL ++ "Use system TBB library instead of bundled.") + + set (SOVERSION ${OIIO_VERSION_MAJOR}.${OIIO_VERSION_MINOR} + CACHE STRING "Set the SO version in the SO name of the output library") +diff -Naur OpenImageIO-oiio-f0a566a.orig/src/libOpenImageIO/CMakeLists.txt OpenImageIO-oiio-f0a566a/src/libOpenImageIO/CMakeLists.txt +--- OpenImageIO-oiio-f0a566a.orig/src/libOpenImageIO/CMakeLists.txt 2012-06-28 15:08:38.114834341 -0500 ++++ OpenImageIO-oiio-f0a566a/src/libOpenImageIO/CMakeLists.txt 2012-06-28 15:19:34.819584416 -0500 +@@ -63,7 +63,9 @@ + # Include our own TBB if using it + if (USE_TBB AND USE_EXTERNAL_TBB) + message (STATUS "System TBB library will be used.") +- set (libOpenImageIO_srcs ${libOpenImageIO_srcs}) ++ find_package (TBB REQUIRED) ++ include_directories (${TBB_INCLUDE_DIRS}) ++ set (libOpenImageIO_srcs ${libOpenImageIO_srcs}) + elseif (USE_TBB AND NOT USE_EXTERNAL_TBB) + message (STATUS "Built-in TBB library will be used.") + set (libOpenImageIO_srcs ${libOpenImageIO_srcs} ../libutil/tbb_misc.cpp) +@@ -211,7 +213,11 @@ + target_link_libraries (OpenImageIO ${OCIO_LIBRARIES}) + endif () + +- ++# Link against system TBB library if specified ++if (USE_TBB AND USE_EXTERNAL_TBB) ++ message (STATUS "Linking TBB: ${TBB_LIBRARIES}") ++ target_link_libraries (OpenImageIO ${TBB_LIBRARIES}) ++endif () + + + if (WIN32) diff --git a/OpenImageIO.spec b/OpenImageIO.spec index 5a98a91..546a195 100644 --- a/OpenImageIO.spec +++ b/OpenImageIO.spec @@ -1,8 +1,9 @@ -%global githash1 g28ba675 -%global githash2 2939154 +%global githash1 g47d4346 +%global githash2 f0a566a +%global githash3 9bf4356 Name: OpenImageIO -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} Summary: Library for reading and writing images @@ -11,7 +12,9 @@ License: BSD URL: https://sites.google.com/site/openimageio/home Source0: https://download.github.com/%{name}-oiio-Release-%{version}-0-%{githash1}.tar.gz -Source1: FindTBB.cmake +# Images for test suite +#Source1: %{name}-oiio-images-%{githash3}.tar.gz +Source101: FindTBB.cmake Patch0: OpenImageIO-1.0.0-use_external_tbb.patch Patch1: OpenImageIO-1.0.0-tbb_include.patch @@ -66,6 +69,9 @@ Development files for package %{name} %patch1 -p1 -b .tbbinc %patch2 -p1 -b .ppc +# Install FindTBB.cmake +install %{SOURCE101} src/cmake/modules/ + # Remove bundled pugixml rm -f src/include/pugixml.hpp \ src/include/pugiconfig.hpp \ @@ -73,13 +79,14 @@ rm -f src/include/pugixml.hpp \ # Remove bundled tbb rm -rf src/include/tbb -# Install FindTBB.cmake -install -pm 0644 %{SOURCE1} src/cmake/modules/ + +# Install test images +#rm -rf ../oiio-images && mkdir ../oiio-images && pushd ../oiio-images +#tar --strip-components=1 -xzf %{SOURCE1} %build -mkdir -p build -pushd build +rm -rf build/linux && mkdir -p build/linux && pushd build/linux # CMAKE_SKIP_RPATH is OK here because it is set to FALSE internally and causes # CMAKE_INSTALL_RPATH to be cleared, which is the desiered result. %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -97,13 +104,13 @@ pushd build %ifarch ppc ppc64 -DNOTHREADS:BOOL=TRUE \ %endif - ../src + ../../src make %{?_smp_mflags} %install -pushd build +pushd build/linux make DESTDIR=%{buildroot} install # Move man pages to the right directory @@ -116,8 +123,7 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1 %check -# Not all tests are expected to pass yet. -#pushd build && make test +#pushd build/linux && make test %files @@ -134,6 +140,10 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1 %changelog +* Thu Jun 28 2012 Richard Shaw - 1.0.6-1 +- Update to latest upstream release. +- Fix linking against TBB which broke at some point. + * Tue Jun 12 2012 Richard Shaw - 1.0.5-1 - Update to latest upstream release. @@ -144,11 +154,12 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1 * Thu May 03 2012 Richard Shaw - 1.0.4-1 - Update to latest upstream release. -* Thu Apr 19 2012 Richard Shaw - 1.0.3-1 -- Update to latest upstream release. +* Tue May 05 2012 Richard Shaw - 1.0.3-2 +- Add cmake as BuildRequire. +- Add webp-devel for additional format support. -* Tue Mar 13 2012 Richard Shaw - 1.0.0-2 -- Do not build against TBB for i686 because it fails. +* Tue Apr 24 2012 Richard Shaw - 1.0.3-1 +- Update to latest upstream release. * Fri Mar 02 2012 Richard Shaw - 1.0.0-1 - Update to latest upstream release. diff --git a/sources b/sources index 6285f75..40754f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c3955348d0232bbd2a8f60ff41ad161 OpenImageIO-oiio-Release-1.0.5-0-g28ba675.tar.gz +fa6e3f4be98d8e1868b389410b56563a OpenImageIO-oiio-Release-1.0.6-0-g47d4346.tar.gz