summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@linux.com>2018-04-21 12:14:43 +1000
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-04-28 06:40:20 +0700
commitd08a608226dc2c3d5934d5cba8880c3654f46a07 (patch)
treeb4463e8a735edccd9dee724d8282bc7c4626f3c6 /graphics
parent5ac8c2a41c4bdf2679032376f07fb1c40c86db9d (diff)
downloadslackbuilds-d08a608226dc2c3d5934d5cba8880c3654f46a07.tar.gz
graphics/openimageio: Use internal pugixml
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Diffstat (limited to 'graphics')
-rw-r--r--graphics/openimageio/openimageio.SlackBuild6
-rw-r--r--graphics/openimageio/openimageio.info2
2 files changed, 4 insertions, 4 deletions
diff --git a/graphics/openimageio/openimageio.SlackBuild b/graphics/openimageio/openimageio.SlackBuild
index 8f950c3b92..ffc6af3264 100644
--- a/graphics/openimageio/openimageio.SlackBuild
+++ b/graphics/openimageio/openimageio.SlackBuild
@@ -25,7 +25,7 @@
PRGNAM=openimageio
SRCNAM=oiio-Release
VERSION=${VERSION:-1.8.10}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PYLIB_INSTALL_DIRECTORY=$(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
@@ -75,7 +75,7 @@ find -L . \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Remove bundled pugixml
-rm -f src/include/OpenImageIO/pugi*
+#rm -f src/include/OpenImageIO/pugi*
# save this for GCC 7.0
#sed -i "s|std=c++11|std=c++11 -Wno-error=maybe-uninitialized -Wno-error=format-truncation -Wno-error=noexcept-type -faligned-new|" CMakeLists.txt
@@ -98,7 +98,7 @@ cd build
-DUSE_OCIO:BOOL=TRUE \
-DUSE_PYTHON:BOOL=TRUE \
-DUSE_PYTHON3:BOOL=TRUE \
- -DUSE_EXTERNAL_PUGIXML:BOOL=TRUE \
+ -DUSE_EXTERNAL_PUGIXML:BOOL=FALSE \
make
make install DESTDIR=$PKG
diff --git a/graphics/openimageio/openimageio.info b/graphics/openimageio/openimageio.info
index 866f7d5dab..db2565ba0c 100644
--- a/graphics/openimageio/openimageio.info
+++ b/graphics/openimageio/openimageio.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://github.com/OpenImageIO/oiio/archive/Release-1.8.10/oiio-Release
MD5SUM="a129a4caa39d7ad79aa1a3dc60cb0418"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="ffmpeg libwebp opencv opencolorio pugixml"
+REQUIRES="ffmpeg libwebp opencv opencolorio"
MAINTAINER="Christoph Willing"
EMAIL="chris.willing@linux.com"