commit: fec97980e4511ce4bf1d6b4da548d5cf346830aa Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> AuthorDate: Fri Jan 19 10:35:51 2018 +0000 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> CommitDate: Mon Jan 22 21:50:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec97980
media-libs/openimageio: clean up old. Closes: https://github.com/gentoo/gentoo/pull/6905 media-libs/openimageio/Manifest | 1 - .../files/openimageio-1.3.5-openexr-2.x.patch | 36 ------- media-libs/openimageio/openimageio-1.3.5.ebuild | 112 --------------------- 3 files changed, 149 deletions(-) diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index e1d646be24c..62c46fdb1ed 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,4 +1,3 @@ -DIST openimageio-1.3.5.tar.gz 13472488 BLAKE2B 2bd6985b338cc6ec4951d372c613aa79b10571b4a0f901f16ce34ecc9c03394aaa25de42b9e1a2e29f4c6f3a68694ee54788e766a2aaa6b5b782a6fd94cf5d22 SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94 diff --git a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch deleted file mode 100644 index 0668f0466a9..00000000000 --- a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch +++ /dev/null @@ -1,36 +0,0 @@ -There is no IlmBaseConfig.h in OpenEXR 2.x - -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_init' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_settype' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_destroy' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_lock' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_unlock' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_destroy' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_init' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_detach' - ---- src/cmake/modules/FindIlmBase.cmake -+++ src/cmake/modules/FindIlmBase.cmake -@@ -176,17 +176,11 @@ - set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE} - CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE) - --# Link with pthreads if required --if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h) -- file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h -- ILMBASE_HAVE_PTHREAD -- REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$" -- ) -- if (ILMBASE_HAVE_PTHREAD) -- find_package (Threads) -- if (CMAKE_USE_PTHREADS_INIT) -- set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT}) -- endif () -+# Always link to pthreads for OpenEXR 2.x -+if (NOT WIN32) -+ find_package (Threads) -+ if (CMAKE_USE_PTHREADS_INIT) -+ set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT}) - endif () - endif () - diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild deleted file mode 100644 index db5c150d475..00000000000 --- a/media-libs/openimageio/openimageio-1.3.5.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils eutils multilib 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="gif jpeg2k colorio opencv opengl python qt4 ssl tbb +truetype" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RESTRICT="test" #431412 - -RDEPEND=" - dev-libs/boost:= - dev-libs/pugixml:= - media-libs/glew:= - media-libs/ilmbase:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - media-libs/openexr:= - media-libs/tiff:0= - sci-libs/hdf5 - sys-libs/zlib:= - virtual/jpeg:0 - gif? ( media-libs/giflib ) - jpeg2k? ( >=media-libs/openjpeg-1.5:0= ) - colorio? ( >=media-libs/opencolorio-1.0.7:= ) - 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}] - ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - ) - ssl? ( dev-libs/openssl:0 ) - tbb? ( dev-cpp/tbb ) - truetype? ( media-libs/freetype:2= )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${P}/src -PATCHES=( "${FILESDIR}"/${P}-openexr-2.x.patch ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - # remove bundled code to make it build - # https://github.com/OpenImageIO/oiio/issues/403 - rm */pugixml* || die - - # fix man page building - # https://github.com/OpenImageIO/oiio/issues/404 - use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt - - use python && python_fix_shebang . -} - -src_configure() { - local mycmakeargs=( - -DLIB_INSTALL_DIR="/usr/$(get_libdir)" - -DBUILDSTATIC=OFF - -DLINKSTATIC=OFF - $(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)") - -DUSE_EXTERNAL_PUGIXML=ON - -DUSE_FIELD3D=OFF # missing in Portage - -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed - -DSTOP_ON_WARNING=OFF - $(cmake-utils_use_use truetype freetype) - $(cmake-utils_use_use colorio OCIO) - $(cmake-utils_use_use opencv) - $(cmake-utils_use_use opengl) - $(cmake-utils_use_use jpeg2k OPENJPEG) - $(cmake-utils_use_use python) - $(cmake-utils_use_use qt4 QT) - $(cmake-utils_use_use tbb) - $(cmake-utils_use_use ssl OPENSSL) - $(cmake-utils_use_use gif) - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - rm -rf "${ED}"/usr/share/doc - dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL} - docinto pdf - dodoc doc/*.pdf -}
