Update to latest version 1.1.10.
Index: Makefile =================================================================== RCS file: /home/pascal/cvs/ports/graphics/openimageio/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 11 Mar 2013 11:10:54 -0000 1.5 +++ Makefile 3 May 2013 20:25:21 -0000 @@ -6,14 +6,11 @@ COMMENT = library for reading and writi BROKEN-hppa = missing atomic ops BROKEN-mips64 = missing atomic ops -MAJ = 1.0 -V = ${MAJ}.4 -REV = 513d0dd -DISTNAME = OpenImageIO-oiio-Release-${V}-0-g${REV} +V = 1.1.10 +DISTNAME = Release-${V} PKGNAME = openimageio-${V} -REVISION = 0 -SHARED_LIBS += OpenImageIO 0.0 # 1.0 +SHARED_LIBS += OpenImageIO 1.0 # 1.0 CATEGORIES = graphics devel @@ -28,8 +25,10 @@ WANTLIB += GL GLEW GLU Half ICE Iex IlmI WANTLIB += QtOpenGL SM X11 Xext boost_filesystem-mt boost_python-mt WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c jpeg WANTLIB += m openjpeg png pthread ${MODPY_WANTLIB} stdc++ tiff webp z +WANTLIB += freetype -MASTER_SITES = https://github.com/OpenImageIO/oiio/tarball/RB-${MAJ}/ +MASTER_SITES = https://github.com/OpenImageIO/oiio/archive/ +DIST_SUBDIR = openimageio MODULES = devel/cmake \ lang/python \ @@ -45,7 +44,10 @@ LIB_DEPENDS = devel/boost \ CONFIGURE_ARGS += -DPYLIB_INSTALL_DIR="lib/python${MODPY_VERSION}/site-packages" CFLAGS += -pthread -WRKDIST = ${WRKDIR}/OpenImageIO-oiio-${REV} +WRKDIST = ${WRKDIR}/oiio-Release-$V WRKSRC = ${WRKDIST}/src + +post-install: + find ${PREFIX} -name '*.orig' -exec rm -f {} \; .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/pascal/cvs/ports/graphics/openimageio/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 9 Jan 2013 23:24:08 -0000 1.2 +++ distinfo 3 May 2013 19:43:13 -0000 @@ -1,2 +1,2 @@ -SHA256 (OpenImageIO-oiio-Release-1.0.4-0-g513d0dd.tar.gz) = enWGVpKs1w8nahMzlhH/RhiUi7kZesiTX2a2EGQw0is= -SIZE (OpenImageIO-oiio-Release-1.0.4-0-g513d0dd.tar.gz) = 4195575 +SHA256 (openimageio/Release-1.1.10.tar.gz) = Fagso/0j2c79It6NDTXuFi0JZ4ID3zyTNSp7DIeKG4k= +SIZE (openimageio/Release-1.1.10.tar.gz) = 9501789 Index: patches/patch-src_cmake_oiio_macros_cmake =================================================================== RCS file: /home/pascal/cvs/ports/graphics/openimageio/patches/patch-src_cmake_oiio_macros_cmake,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_cmake_oiio_macros_cmake --- patches/patch-src_cmake_oiio_macros_cmake 9 May 2012 12:42:06 -0000 1.1.1.1 +++ patches/patch-src_cmake_oiio_macros_cmake 3 May 2013 19:44:35 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-src_cmake_oiio_macros_cmake,v 1.1.1.1 2012/05/09 12:42:06 pascal Exp $ ---- src/cmake/oiio_macros.cmake.orig Thu Apr 19 18:51:13 2012 -+++ src/cmake/oiio_macros.cmake Mon May 7 14:52:40 2012 +--- src/cmake/oiio_macros.cmake.orig Sat Apr 13 04:30:27 2013 ++++ src/cmake/oiio_macros.cmake Fri May 3 21:44:29 2013 @@ -103,7 +103,7 @@ macro (oiio_add_tests) if (_has_generator_expr) set (_add_test_args NAME ${_testname} @@ -18,4 +18,4 @@ $OpenBSD: patch-src_cmake_oiio_macros_cm + set (_add_test_args ${_testname} ${PYTHON_EXECUTABLE}) set (_extra_test_args "") endif () - message (STATUS "TEST ${_testname}: ${CMAKE_BINARY_DIR}/testsuite/runtest.py ${_testdir} ${_extra_test_args}") + if (VERBOSE) Index: patches/patch-src_cmake_platform_cmake =================================================================== RCS file: /home/pascal/cvs/ports/graphics/openimageio/patches/patch-src_cmake_platform_cmake,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_cmake_platform_cmake --- patches/patch-src_cmake_platform_cmake 9 May 2012 12:42:06 -0000 1.1.1.1 +++ patches/patch-src_cmake_platform_cmake 3 May 2013 19:44:35 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_cmake_platform_cmake,v 1.1.1.1 2012/05/09 12:42:06 pascal Exp $ ---- src/cmake/platform.cmake.orig Thu Apr 19 18:51:13 2012 -+++ src/cmake/platform.cmake Fri Apr 20 14:51:41 2012 -@@ -23,6 +23,10 @@ if (UNIX) +--- src/cmake/platform.cmake.orig Sat Apr 13 04:30:27 2013 ++++ src/cmake/platform.cmake Fri May 3 21:44:29 2013 +@@ -33,6 +33,10 @@ if (UNIX) else () string (TOLOWER ${CMAKE_SYSTEM_NAME} platform) endif () Index: patches/patch-src_include_thread_h =================================================================== RCS file: /home/pascal/cvs/ports/graphics/openimageio/patches/patch-src_include_thread_h,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_include_thread_h --- patches/patch-src_include_thread_h 16 May 2012 12:09:35 -0000 1.1 +++ patches/patch-src_include_thread_h 3 May 2013 19:44:35 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_include_thread_h,v 1.1 2012/05/16 12:09:35 sthen Exp $ ---- src/include/thread.h.orig Wed May 16 05:35:18 2012 -+++ src/include/thread.h Wed May 16 05:36:30 2012 -@@ -103,7 +103,7 @@ +--- src/include/thread.h.orig Sat Apr 13 04:30:27 2013 ++++ src/include/thread.h Fri May 3 21:44:29 2013 +@@ -110,7 +110,7 @@ InterlockedExchangeAdd64 (volatile long long *Addend, #endif #if defined(__GNUC__) && (defined(_GLIBCXX_ATOMIC_BUILTINS) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 401)) Index: patches/patch-src_libutil_sysutil_cpp =================================================================== RCS file: /home/pascal/cvs/ports/graphics/openimageio/patches/patch-src_libutil_sysutil_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-src_libutil_sysutil_cpp --- patches/patch-src_libutil_sysutil_cpp 9 May 2012 12:42:06 -0000 1.1.1.1 +++ patches/patch-src_libutil_sysutil_cpp 3 May 2013 19:44:35 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-src_libutil_sysutil_cpp,v 1.1.1.1 2012/05/09 12:42:06 pascal Exp $ ---- src/libutil/sysutil.cpp.orig Thu Apr 19 18:51:13 2012 -+++ src/libutil/sysutil.cpp Fri Apr 20 14:51:41 2012 -@@ -118,7 +118,6 @@ Sysutil::memory_used (bool resident) +--- src/libutil/sysutil.cpp.orig Sat Apr 13 04:30:27 2013 ++++ src/libutil/sysutil.cpp Fri May 3 21:44:29 2013 +@@ -124,7 +124,6 @@ Sysutil::memory_used (bool resident) #else // No idea what platform this is @@ -9,8 +9,8 @@ $OpenBSD: patch-src_libutil_sysutil_cpp, return 0; // Punt #endif } -@@ -166,7 +165,7 @@ Sysutil::this_program_path () - sysctl(mib, 4, filename, &cb, NULL, 0); +@@ -176,7 +175,7 @@ Sysutil::this_program_path () + int r = 0; #else // No idea what platform this is - ASSERT (0); Index: pkg/PLIST =================================================================== RCS file: /home/pascal/cvs/ports/graphics/openimageio/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- pkg/PLIST 9 Jan 2013 23:24:09 -0000 1.2 +++ pkg/PLIST 3 May 2013 20:26:55 -0000 @@ -4,7 +4,6 @@ @bin bin/idiff @bin bin/igrep @bin bin/iinfo -@bin bin/iprocess @bin bin/iv @bin bin/maketx @bin bin/oiiotool @@ -36,12 +35,14 @@ include/OpenImageIO/tbb/_tbb_windef.h include/OpenImageIO/tbb/aligned_space.h include/OpenImageIO/tbb/atomic.h include/OpenImageIO/tbb/machine/ +include/OpenImageIO/tbb/machine/gcc_generic.h include/OpenImageIO/tbb/machine/ibm_aix51.h include/OpenImageIO/tbb/machine/linux_common.h include/OpenImageIO/tbb/machine/linux_ia32.h include/OpenImageIO/tbb/machine/linux_ia64.h include/OpenImageIO/tbb/machine/linux_intel64.h include/OpenImageIO/tbb/machine/mac_ppc.h +include/OpenImageIO/tbb/machine/sunos_sparc.h include/OpenImageIO/tbb/machine/windows_ia32.h include/OpenImageIO/tbb/machine/windows_intel64.h include/OpenImageIO/tbb/spin_mutex.h @@ -51,15 +52,14 @@ include/OpenImageIO/tbb/tbb_assert_impl. include/OpenImageIO/tbb/tbb_config.h include/OpenImageIO/tbb/tbb_exception.h include/OpenImageIO/tbb/tbb_machine.h -include/OpenImageIO/tbb/tbb_machine.h.orig include/OpenImageIO/tbb/tbb_misc.h -include/OpenImageIO/tbb/tbb_misc.h.orig include/OpenImageIO/tbb/tbb_profiling.h include/OpenImageIO/tbb/tbb_stddef.h include/OpenImageIO/tbb/tbb_version.h include/OpenImageIO/texture.h include/OpenImageIO/thread.h include/OpenImageIO/timer.h +include/OpenImageIO/tinyformat.h include/OpenImageIO/typedesc.h include/OpenImageIO/ustring.h include/OpenImageIO/varyingref.h