[arch-commits] Commit in openimageio/repos (6 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Sat Mar 14 14:50:54 UTC 2015
Date: Saturday, March 14, 2015 @ 15:50:54
Author: svenstaro
Revision: 129261
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
openimageio/repos/community-staging-i686/PKGBUILD
(from rev 129260, openimageio/trunk/PKGBUILD)
openimageio/repos/community-staging-i686/stdmath.patch
(from rev 129260, openimageio/trunk/stdmath.patch)
openimageio/repos/community-staging-x86_64/PKGBUILD
(from rev 129260, openimageio/trunk/PKGBUILD)
openimageio/repos/community-staging-x86_64/stdmath.patch
(from rev 129260, openimageio/trunk/stdmath.patch)
Deleted:
openimageio/repos/community-staging-i686/PKGBUILD
openimageio/repos/community-staging-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 100 +++++++++++++++++++++++++++++++
community-staging-i686/PKGBUILD | 51 ---------------
community-staging-i686/stdmath.patch | 18 +++++
community-staging-x86_64/PKGBUILD | 51 ---------------
community-staging-x86_64/stdmath.patch | 18 +++++
5 files changed, 136 insertions(+), 102 deletions(-)
Deleted: community-staging-i686/PKGBUILD
===================================================================
--- community-staging-i686/PKGBUILD 2015-03-14 14:50:49 UTC (rev 129260)
+++ community-staging-i686/PKGBUILD 2015-03-14 14:50:54 UTC (rev 129261)
@@ -1,51 +0,0 @@
-# $Id$
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-pkgname=openimageio
-pkgver=1.4.16
-pkgrel=1
-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')
-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')
-
-prepare() {
- cd oiio
-
- #curl "https://github.com/OpenImageIO/oiio/pull/982.patch"|patch -Np1
- #curl "https://github.com/OpenImageIO/oiio/commit/e1150f22f012d8d86f14534eda14bec960e96f3e.patch"|patch -Np1
- # https://github.com/OpenImageIO/oiio/issues/987
- #git revert -n 6f0e019
-}
-
-build() {
- cd oiio
-
- [[ -d build ]] && rm -r build
- mkdir build && cd build
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
- -DUSE_EXTERNAL_TBB=ON \
- -DOIIO_BUILD_TESTS=OFF \
- ..
- 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/PKGBUILD (from rev 129260, openimageio/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-03-14 14:50:54 UTC (rev 129261)
@@ -0,0 +1,50 @@
+# $Id$
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+pkgname=openimageio
+pkgver=1.4.16
+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')
+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}
+ stdmath.patch)
+md5sums=('SKIP'
+ '7b819bf20cf2c13cbde5fc6511e39f35')
+
+prepare() {
+ cd oiio
+
+ patch -Np1 < $srcdir/stdmath.patch
+}
+
+build() {
+ cd oiio
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
+ -DUSE_EXTERNAL_TBB=ON \
+ -DOIIO_BUILD_TESTS=OFF \
+ ..
+ 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/stdmath.patch (from rev 129260, openimageio/trunk/stdmath.patch)
===================================================================
--- community-staging-i686/stdmath.patch (rev 0)
+++ community-staging-i686/stdmath.patch 2015-03-14 14:50:54 UTC (rev 129261)
@@ -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))
+
Deleted: community-staging-x86_64/PKGBUILD
===================================================================
--- community-staging-x86_64/PKGBUILD 2015-03-14 14:50:49 UTC (rev 129260)
+++ community-staging-x86_64/PKGBUILD 2015-03-14 14:50:54 UTC (rev 129261)
@@ -1,51 +0,0 @@
-# $Id$
-# Contributor: SpepS <dreamspepser at yahoo dot it>
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-pkgname=openimageio
-pkgver=1.4.16
-pkgrel=1
-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')
-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')
-
-prepare() {
- cd oiio
-
- #curl "https://github.com/OpenImageIO/oiio/pull/982.patch"|patch -Np1
- #curl "https://github.com/OpenImageIO/oiio/commit/e1150f22f012d8d86f14534eda14bec960e96f3e.patch"|patch -Np1
- # https://github.com/OpenImageIO/oiio/issues/987
- #git revert -n 6f0e019
-}
-
-build() {
- cd oiio
-
- [[ -d build ]] && rm -r build
- mkdir build && cd build
-
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
- -DUSE_EXTERNAL_TBB=ON \
- -DOIIO_BUILD_TESTS=OFF \
- ..
- 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/PKGBUILD (from rev 129260, openimageio/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-03-14 14:50:54 UTC (rev 129261)
@@ -0,0 +1,50 @@
+# $Id$
+# Contributor: SpepS <dreamspepser at yahoo dot it>
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+pkgname=openimageio
+pkgver=1.4.16
+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')
+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}
+ stdmath.patch)
+md5sums=('SKIP'
+ '7b819bf20cf2c13cbde5fc6511e39f35')
+
+prepare() {
+ cd oiio
+
+ patch -Np1 < $srcdir/stdmath.patch
+}
+
+build() {
+ cd oiio
+
+ [[ -d build ]] && rm -r build
+ mkdir build && cd build
+
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages \
+ -DUSE_EXTERNAL_TBB=ON \
+ -DOIIO_BUILD_TESTS=OFF \
+ ..
+ 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/stdmath.patch (from rev 129260, openimageio/trunk/stdmath.patch)
===================================================================
--- community-staging-x86_64/stdmath.patch (rev 0)
+++ community-staging-x86_64/stdmath.patch 2015-03-14 14:50:54 UTC (rev 129261)
@@ -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))
+
More information about the arch-commits
mailing list