Date: Thursday, May 12, 2016 @ 13:24:29 Author: bpiotrowski Revision: 174942
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: openimageio/repos/community-staging-i686/ openimageio/repos/community-staging-i686/PKGBUILD (from rev 174941, openimageio/trunk/PKGBUILD) openimageio/repos/community-staging-i686/fix-compiler-warning.patch (from rev 174941, openimageio/trunk/fix-compiler-warning.patch) openimageio/repos/community-staging-i686/stdmath.patch (from rev 174941, openimageio/trunk/stdmath.patch) openimageio/repos/community-staging-i686/ustring-cxx11-std-string.patch (from rev 174941, openimageio/trunk/ustring-cxx11-std-string.patch) openimageio/repos/community-staging-x86_64/ openimageio/repos/community-staging-x86_64/PKGBUILD (from rev 174941, openimageio/trunk/PKGBUILD) openimageio/repos/community-staging-x86_64/fix-compiler-warning.patch (from rev 174941, openimageio/trunk/fix-compiler-warning.patch) openimageio/repos/community-staging-x86_64/stdmath.patch (from rev 174941, openimageio/trunk/stdmath.patch) openimageio/repos/community-staging-x86_64/ustring-cxx11-std-string.patch (from rev 174941, openimageio/trunk/ustring-cxx11-std-string.patch) ---------------------------------------------------------+ community-staging-i686/PKGBUILD | 45 ++++++++++++++ community-staging-i686/fix-compiler-warning.patch | 22 ++++++ community-staging-i686/stdmath.patch | 18 +++++ community-staging-i686/ustring-cxx11-std-string.patch | 35 ++++++++++ community-staging-x86_64/PKGBUILD | 45 ++++++++++++++ community-staging-x86_64/fix-compiler-warning.patch | 22 ++++++ community-staging-x86_64/stdmath.patch | 18 +++++ community-staging-x86_64/ustring-cxx11-std-string.patch | 35 ++++++++++ 8 files changed, 240 insertions(+) Copied: openimageio/repos/community-staging-i686/PKGBUILD (from rev 174941, openimageio/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,45 @@ +# $Id$ +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> + +pkgname=openimageio +pkgver=1.6.12 +pkgrel=2 +pkgdesc="A library for reading and writing images, including classes, utilities, and applications" +arch=(i686 x86_64) +url="http://www.openimageio.org/" +license=('custom') +depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb' 'openssl') +makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa' 'git') +optdepends=('qt4: iv image viewer' + 'python2: bindings support') +source=(git+git://github.com/OpenImageIO/oiio.git#tag=Release-${pkgver}) +md5sums=('SKIP') + +build() { + cd oiio + + [[ -d build ]] && rm -r build + mkdir build && cd build + + # Python is currently broken :( + cmake .. \ + -DUSE_PYTHON=OFF \ + -DUSE_PYTHON3=OFF \ + -DUSE_OPENSSL=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \ + -DOIIO_BUILD_TESTS=ON \ + -DOIIO_BUILD_TOOLS=ON + make +} + +package() { + cd oiio/build + + make DESTDIR="$pkgdir" install + + # license + cd .. + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: openimageio/repos/community-staging-i686/fix-compiler-warning.patch (from rev 174941, openimageio/trunk/fix-compiler-warning.patch) =================================================================== --- community-staging-i686/fix-compiler-warning.patch (rev 0) +++ community-staging-i686/fix-compiler-warning.patch 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,22 @@ +From 4e3371d2e37512c5fa8b1f297ad9af52417fec9e Mon Sep 17 00:00:00 2001 +From: Larry Gritz <l...@larrygritz.com> +Date: Wed, 11 Feb 2015 15:27:40 -0800 +Subject: [PATCH] Fix compiler warning about unused variable + +--- + src/ptex.imageio/ptex/PtexHalf.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ptex.imageio/ptex/PtexHalf.cpp b/src/ptex.imageio/ptex/PtexHalf.cpp +index a880971..3c17369 100644 +--- a/src/ptex.imageio/ptex/PtexHalf.cpp ++++ b/src/ptex.imageio/ptex/PtexHalf.cpp +@@ -80,7 +80,7 @@ static bool PtexHalfInit() + return 1; + } + +-static bool PtexHalfInitialized = PtexHalfInit(); ++bool PtexHalfInitialized = PtexHalfInit(); + + + /** Handle exceptional cases for half-to-float conversion */ Copied: openimageio/repos/community-staging-i686/stdmath.patch (from rev 174941, openimageio/trunk/stdmath.patch) =================================================================== --- community-staging-i686/stdmath.patch (rev 0) +++ community-staging-i686/stdmath.patch 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,18 @@ +diff --git a/src/include/OpenImageIO/fmath.h b/src/include/OpenImageIO/fmath.h +index 8db8442..751cd07 100644 +--- a/src/include/OpenImageIO/fmath.h ++++ b/src/include/OpenImageIO/fmath.h +@@ -1298,9 +1298,9 @@ OIIO_NAMESPACE_EXIT + + #ifndef _MSC_VER + // Some systems have isnan, isinf and isfinite in the std namespace. +- using std::isnan; +- using std::isinf; +- using std::isfinite; ++ using ::isnan; ++ using ::isinf; ++ using OIIO::isfinite; + #endif + + #if (defined(__FreeBSD__) && (__FreeBSD_version < 803000)) + Copied: openimageio/repos/community-staging-i686/ustring-cxx11-std-string.patch (from rev 174941, openimageio/trunk/ustring-cxx11-std-string.patch) =================================================================== --- community-staging-i686/ustring-cxx11-std-string.patch (rev 0) +++ community-staging-i686/ustring-cxx11-std-string.patch 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,35 @@ +From a2ccfad7c4962a5203ea2cf755fd102b4c67f997 Mon Sep 17 00:00:00 2001 +From: Larry Gritz <l...@larrygritz.com> +Date: Fri, 26 Jun 2015 11:46:23 -0700 +Subject: [PATCH] ustring fixes for new gcc (5.1+) std::string ABI + +This makes it work (and adds a test). +We still need to return and do something more clever for that case. +I'll need to install gcc 5.1 first to see how the internals work. +But in the mean time, at least this will unbreak things for people +already on gcc 5.1. + +Fixes #1174 +--- + src/libutil/ustring.cpp | 7 ++++++- + src/libutil/ustring_test.cpp | 2 ++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/libutil/ustring.cpp b/src/libutil/ustring.cpp +index 1d12533..4b4a8c2 100644 +--- a/src/libutil/ustring.cpp ++++ b/src/libutil/ustring.cpp +@@ -318,7 +318,12 @@ ustring::TableRep::TableRep (string_view strref, size_t hash) + // the std::string to make it point to our chars! In such a case, the + // destructor will be careful not to allow a deallocation. + +-#if defined(__GNUC__) && !defined(_LIBCPP_VERSION) ++#if defined(__GNUC__) && !defined(_LIBCPP_VERSION) && defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI ++ // NEW gcc ABI ++ // FIXME -- do something smart with this. ++ ++#elif defined(__GNUC__) && !defined(_LIBCPP_VERSION) ++ // OLD gcc ABI + // It turns out that the first field of a gcc std::string is a pointer + // to the characters within the basic_string::_Rep. We merely redirect + // that pointer, though for std::string to function properly, the chars Copied: openimageio/repos/community-staging-x86_64/PKGBUILD (from rev 174941, openimageio/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,45 @@ +# $Id$ +# Contributor: SpepS <dreamspepser at yahoo dot it> +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> + +pkgname=openimageio +pkgver=1.6.12 +pkgrel=2 +pkgdesc="A library for reading and writing images, including classes, utilities, and applications" +arch=(i686 x86_64) +url="http://www.openimageio.org/" +license=('custom') +depends=('openexr' 'boost-libs' 'jasper' 'glew' 'libtiff' 'opencolorio' 'intel-tbb' 'openssl') +makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa' 'git') +optdepends=('qt4: iv image viewer' + 'python2: bindings support') +source=(git+git://github.com/OpenImageIO/oiio.git#tag=Release-${pkgver}) +md5sums=('SKIP') + +build() { + cd oiio + + [[ -d build ]] && rm -r build + mkdir build && cd build + + # Python is currently broken :( + cmake .. \ + -DUSE_PYTHON=OFF \ + -DUSE_PYTHON3=OFF \ + -DUSE_OPENSSL=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \ + -DOIIO_BUILD_TESTS=ON \ + -DOIIO_BUILD_TOOLS=ON + make +} + +package() { + cd oiio/build + + make DESTDIR="$pkgdir" install + + # license + cd .. + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} Copied: openimageio/repos/community-staging-x86_64/fix-compiler-warning.patch (from rev 174941, openimageio/trunk/fix-compiler-warning.patch) =================================================================== --- community-staging-x86_64/fix-compiler-warning.patch (rev 0) +++ community-staging-x86_64/fix-compiler-warning.patch 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,22 @@ +From 4e3371d2e37512c5fa8b1f297ad9af52417fec9e Mon Sep 17 00:00:00 2001 +From: Larry Gritz <l...@larrygritz.com> +Date: Wed, 11 Feb 2015 15:27:40 -0800 +Subject: [PATCH] Fix compiler warning about unused variable + +--- + src/ptex.imageio/ptex/PtexHalf.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ptex.imageio/ptex/PtexHalf.cpp b/src/ptex.imageio/ptex/PtexHalf.cpp +index a880971..3c17369 100644 +--- a/src/ptex.imageio/ptex/PtexHalf.cpp ++++ b/src/ptex.imageio/ptex/PtexHalf.cpp +@@ -80,7 +80,7 @@ static bool PtexHalfInit() + return 1; + } + +-static bool PtexHalfInitialized = PtexHalfInit(); ++bool PtexHalfInitialized = PtexHalfInit(); + + + /** Handle exceptional cases for half-to-float conversion */ Copied: openimageio/repos/community-staging-x86_64/stdmath.patch (from rev 174941, openimageio/trunk/stdmath.patch) =================================================================== --- community-staging-x86_64/stdmath.patch (rev 0) +++ community-staging-x86_64/stdmath.patch 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,18 @@ +diff --git a/src/include/OpenImageIO/fmath.h b/src/include/OpenImageIO/fmath.h +index 8db8442..751cd07 100644 +--- a/src/include/OpenImageIO/fmath.h ++++ b/src/include/OpenImageIO/fmath.h +@@ -1298,9 +1298,9 @@ OIIO_NAMESPACE_EXIT + + #ifndef _MSC_VER + // Some systems have isnan, isinf and isfinite in the std namespace. +- using std::isnan; +- using std::isinf; +- using std::isfinite; ++ using ::isnan; ++ using ::isinf; ++ using OIIO::isfinite; + #endif + + #if (defined(__FreeBSD__) && (__FreeBSD_version < 803000)) + Copied: openimageio/repos/community-staging-x86_64/ustring-cxx11-std-string.patch (from rev 174941, openimageio/trunk/ustring-cxx11-std-string.patch) =================================================================== --- community-staging-x86_64/ustring-cxx11-std-string.patch (rev 0) +++ community-staging-x86_64/ustring-cxx11-std-string.patch 2016-05-12 11:24:29 UTC (rev 174942) @@ -0,0 +1,35 @@ +From a2ccfad7c4962a5203ea2cf755fd102b4c67f997 Mon Sep 17 00:00:00 2001 +From: Larry Gritz <l...@larrygritz.com> +Date: Fri, 26 Jun 2015 11:46:23 -0700 +Subject: [PATCH] ustring fixes for new gcc (5.1+) std::string ABI + +This makes it work (and adds a test). +We still need to return and do something more clever for that case. +I'll need to install gcc 5.1 first to see how the internals work. +But in the mean time, at least this will unbreak things for people +already on gcc 5.1. + +Fixes #1174 +--- + src/libutil/ustring.cpp | 7 ++++++- + src/libutil/ustring_test.cpp | 2 ++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/libutil/ustring.cpp b/src/libutil/ustring.cpp +index 1d12533..4b4a8c2 100644 +--- a/src/libutil/ustring.cpp ++++ b/src/libutil/ustring.cpp +@@ -318,7 +318,12 @@ ustring::TableRep::TableRep (string_view strref, size_t hash) + // the std::string to make it point to our chars! In such a case, the + // destructor will be careful not to allow a deallocation. + +-#if defined(__GNUC__) && !defined(_LIBCPP_VERSION) ++#if defined(__GNUC__) && !defined(_LIBCPP_VERSION) && defined(_GLIBCXX_USE_CXX11_ABI) && _GLIBCXX_USE_CXX11_ABI ++ // NEW gcc ABI ++ // FIXME -- do something smart with this. ++ ++#elif defined(__GNUC__) && !defined(_LIBCPP_VERSION) ++ // OLD gcc ABI + // It turns out that the first field of a gcc std::string is a pointer + // to the characters within the basic_string::_Rep. We merely redirect + // that pointer, though for std::string to function properly, the chars