diff options
Diffstat (limited to 'media-libs/openimageio')
| -rw-r--r-- | media-libs/openimageio/Manifest | 7 | ||||
| -rw-r--r-- | media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch | 28 | ||||
| -rw-r--r-- | media-libs/openimageio/metadata.xml | 3 | ||||
| -rw-r--r-- | media-libs/openimageio/openimageio-1.6.13.ebuild | 97 | ||||
| -rw-r--r-- | media-libs/openimageio/openimageio-1.8.17-r1.ebuild (renamed from media-libs/openimageio/openimageio-1.8.17.ebuild) | 46 |
5 files changed, 61 insertions, 120 deletions
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 0aa2cebc4566..9822cf9bf211 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,5 +1,4 @@ -DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6 +AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7 -EBUILD openimageio-1.6.13.ebuild 2400 BLAKE2B 548b6e7df490f7ec13bbaeaf2da42b0806551342229cea39c61274acd7f0225d840b730d81a8b3233c55714f99f6c1b612373e3902e957fa28d19118bab76871 SHA512 88e37f6f647fff1feb647cdbd6dc5818aa1f4789f4d22689cb52668473f0cdfa254a3b12b25a50ed19fe4d185ffb05e34e0fea4e9ae473ea7ac718f99c5b966c -EBUILD openimageio-1.8.17.ebuild 2960 BLAKE2B e37af0c59780f6217aebe3f918e661a1e80f019ae036c69a1f86bc974b870c1e3629c233983f309581dc33c397fc1ecb39c6f7bbd0a12d955a9187b3d339b066 SHA512 07324f5f8db3a697ed6f66659ccc1ab9275b492a200da659d0b69e022454293b540e979b147d743a9f4684a5c88e2d82437741bee7cb581c51b5f93f3d3cf653 -MISC metadata.xml 863 BLAKE2B 947029ba73f4ef5efdbf5a0c85e151483343136a5c3480f8670d7c189e20c9f9cbeb73f1d8bf4cec3c12515d1e053b250e726c4cd81cc5c51fd520b0a2bec1a7 SHA512 4544932bdd65125e8c026fed8c573ccfd5f4dfce47798629dc6550dd641de2918b2bf5c5c13f4e57c54d8a0d68d3627eb81f3707ba7d15a3688b42c725cf4d94 +EBUILD openimageio-1.8.17-r1.ebuild 3137 BLAKE2B fe760def3e3e728504c3c1b974897a60d3487e9e8f1b7dd286e1d09e54efcae14143447767fd5ee2feb500643e8ddfcf6491bf9f664132d3bbd539e5745d9b6e SHA512 9ed1b289abb1c2fb42024a262a83ac8b108b6634facd8ea711053b603871445e41085f285bf186590a4d8b952442272cc82d550c56521c3c51ef553683a7ff37 +MISC metadata.xml 840 BLAKE2B b1eb9cb3531989610d82fdbff7e56f87e5ad059c8afd6f7c9f513bc5ef6c7eda497dc06a52e32e5da9cc0231cb1d3acd6ca1ddf4792de002273c599824336e0f SHA512 d183b91af486faaced4d6613eddb1f5e5a0b8007a4cb719875cb858bb1135b4db4c5ee4e70cf9db9e4468a4f044e150fcc6e54670b42f4748ba210d5bde778dd diff --git a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch new file mode 100644 index 000000000000..970ada64a1f8 --- /dev/null +++ b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch @@ -0,0 +1,28 @@ +From 22ce65bfbaa24d79427852755c4bf8a1d77159b4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 16 Jul 2019 17:03:40 +0200 +Subject: [PATCH] Find Boost_PYTHON + +--- + src/python/CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt +index e58d372d..98d91c48 100644 +--- a/src/python/CMakeLists.txt ++++ b/src/python/CMakeLists.txt +@@ -16,9 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED) + if (NOT BOOST_CUSTOM) + # Finding the python component for boost is a little tricky, since it has + # different names on different systems. Try the most common ones. +- foreach (_py_lib python-${PYTHON_VERSION_FOUND} python +- python${PYTHON_VERSION_MAJOR} +- python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) ++ foreach (_py_lib python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} ++ python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) + find_package (Boost QUIET COMPONENTS ${_py_lib}) + string (TOUPPER ${_py_lib} _py_lib_name) + if (Boost_${_py_lib_name}_FOUND) +-- +2.22.0 + diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml index 51a8e3601b05..5a6930d59d5d 100644 --- a/media-libs/openimageio/metadata.xml +++ b/media-libs/openimageio/metadata.xml @@ -6,9 +6,8 @@ <name>Gentoo Graphics Project</name> </maintainer> <use> - <flag name="cpu_flags_x86_avx512f">SIMD Optimization</flag> - <flag name="cpu_flags_x86_f16c">SIMD Optimization</flag> <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag> + <flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag> <flag name="field3d">Enable f3d file (write) support via <pkg>media-libs/Field3D</pkg></flag> <flag name="opencv">Enable OpenCV support via <pkg>media-libs/opencv</pkg></flag> <flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag> diff --git a/media-libs/openimageio/openimageio-1.6.13.ebuild b/media-libs/openimageio/openimageio-1.6.13.ebuild deleted file mode 100644 index 09f2d8e5ed0d..000000000000 --- a/media-libs/openimageio/openimageio-1.6.13.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_5} ) -inherit cmake-utils python-single-r1 vcs-snapshot - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO" -SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="color-management ffmpeg gif jpeg2k opencv opengl python raw ssl +truetype" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="test" #431412 - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml:= - media-libs/ilmbase:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - media-libs/openexr:= - media-libs/tiff:0= - sys-libs/zlib:= - virtual/jpeg:0 - color-management? ( >=media-libs/opencolorio-1.0.7:= ) - ffmpeg? ( media-video/ffmpeg:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) - opencv? ( - >=media-libs/opencv-2.3:= - python? ( >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - raw? ( media-libs/libraw:= ) - ssl? ( dev-libs/openssl:0 ) - truetype? ( media-libs/freetype:2= )" -DEPEND="${RDEPEND}" - -#S=${WORKDIR}/${P}/src - -DOCS=( CHANGES CREDITS README.rst src/doc/${PN}.pdf ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - use python && python_fix_shebang . -} - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="/usr/$(get_libdir)" - -DBUILDSTATIC=OFF - -DLINKSTATIC=OFF - -DINSTALL_DOCS=OFF - -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed - $(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)") - -DSTOP_ON_WARNING=OFF - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_FIELD3D=OFF # missing in Portage - -DUSE_FREETYPE=$(usex truetype) - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_GIF=$(usex gif) - -DUSE_OCIO=$(usex color-management) - -DUSE_OPENCV=$(usex opencv) - -DUSE_OPENGL=$(usex opengl) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENSSL=$(usex ssl) - -DUSE_PYTHON=$(usex python) - -DUSE_LIBRAW=$(usex raw) - -DUSE_QT=OFF # Deprecated - ) - - if [[ ${EPYTHON} == python3* ]]; then - mycmakeargs+=( -DUSE_PYTHON3=ON ) - else - mycmakeargs+=( -DUSE_PYTHON3=OFF ) - fi - - cmake-utils_src_configure -} diff --git a/media-libs/openimageio/openimageio-1.8.17.ebuild b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild index 4261aca86c63..8e563d74595e 100644 --- a/media-libs/openimageio/openimageio-1.8.17.ebuild +++ b/media-libs/openimageio/openimageio-1.8.17-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_{5,6}} ) +PYTHON_COMPAT=( python2_7 python3_{5,6} ) inherit cmake-utils python-single-r1 DESCRIPTION="A library for reading and writing images" @@ -12,7 +12,7 @@ SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 @@ -20,12 +20,16 @@ X86_CPU_FEATURES=( ) CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) -IUSE="color-management doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}" +IUSE="color-management dicom doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -RESTRICT="test" #431412 +RESTRICT="test" # bug 431412 -RDEPEND=">=dev-libs/boost-1.62:= +BDEPEND=" + doc? ( app-doc/doxygen[latex] ) +" +RDEPEND=" + >=dev-libs/boost-1.62:= dev-libs/pugixml:= >=media-libs/ilmbase-2.2.0-r1:= media-libs/libpng:0= @@ -35,15 +39,16 @@ RDEPEND=">=dev-libs/boost-1.62:= sys-libs/zlib:= virtual/jpeg:0 color-management? ( media-libs/opencolorio:= ) + dicom? ( sci-libs/dcmtk ) ffmpeg? ( media-video/ffmpeg:= ) field3d? ( media-libs/Field3D:= ) gif? ( media-libs/giflib:0= ) jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) opencv? ( media-libs/opencv:= ) opengl? ( + media-libs/glew:= virtual/glu virtual/opengl - media-libs/glew:= ) ptex? ( media-libs/ptex:= ) python? ( @@ -61,18 +66,25 @@ RDEPEND=">=dev-libs/boost-1.62:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - truetype? ( media-libs/freetype:2= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[latex] )" + truetype? ( media-libs/freetype:2= ) +" +DEPEND="${RDEPEND}" DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf ) +PATCHES=( "${FILESDIR}/${P}-boostpython.patch" ) + S="${WORKDIR}/oiio-Release-${PV}" pkg_setup() { use python && python-single-r1_pkg_setup } +src_prepare() { + cmake-utils_src_prepare + cmake_comment_add_subdirectory src/fonts +} + src_configure() { # Build with SIMD support local cpufeature @@ -85,27 +97,27 @@ src_configure() { [[ -z ${mysimd} ]] && mysimd=("0") local mycmakeargs=( - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" -DINSTALL_DOCS=$(usex doc) -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed -DSTOP_ON_WARNING=OFF -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_FFMPEG=$(usex ffmpeg) - -DUSE_FIELD3D=$(usex field3d) - -DUSE_FREETYPE=$(usex truetype) - -DUSE_GIF=$(usex gif) -DUSE_JPEGTURBO=ON - -DUSE_LIBRAW=$(usex raw) -DUSE_NUKE=NO # Missing in Gentoo -DUSE_NUKE=OFF -DUSE_OCIO=$(usex color-management) + -DUSE_DICOM=$(usex dicom) + -DUSE_FFMPEG=$(usex ffmpeg) + -DUSE_FIELD3D=$(usex field3d) + -DUSE_GIF=$(usex gif) + -DUSE_OPENJPEG=$(usex jpeg2k) -DUSE_OPENCV=$(usex opencv) -DUSE_OPENGL=$(usex opengl) - -DUSE_OPENJPEG=$(usex jpeg2k) - -DUSE_OPENSSL=$(usex ssl) -DUSE_PTEX=$(usex ptex) -DUSE_PYTHON=$(usex python) -DUSE_QT=$(usex qt5) + -DUSE_LIBRAW=$(usex raw) + -DUSE_OPENSSL=$(usex ssl) + -DUSE_FREETYPE=$(usex truetype) -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") ) |