From 32852865d59bc3ab579d4664d5c9b5790edfca46 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Mon, 7 Jan 2019 13:35:48 +0100 Subject: [PATCH] media-libs/openimageio: Removed old. Closes: https://bugs.gentoo.org/668412 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Lars Wendler --- media-libs/openimageio/Manifest | 2 - .../files/openimageio-1.8.7-ffmpeg4.patch | 26 ---- .../openimageio/openimageio-1.8.13.ebuild | 114 ----------------- .../openimageio/openimageio-1.8.7.ebuild | 116 ------------------ 4 files changed, 258 deletions(-) delete mode 100644 media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch delete mode 100644 media-libs/openimageio/openimageio-1.8.13.ebuild delete mode 100644 media-libs/openimageio/openimageio-1.8.7.ebuild diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 43aff67028b0..e1d63745cb33 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,6 +1,4 @@ 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 -DIST openimageio-1.8.13.tar.gz 27829708 BLAKE2B 8c3a6721f7039e22fcea538694c32651e042d926f40494e5b3623c11158da2f49a8e49698920269d0f3076d060c5849c62f2a6bb256d77dcd5565f86e6de04d2 SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7 -DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963 diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch deleted file mode 100644 index 92cad26c9335..000000000000 --- a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 810a0235837d6f31d8b3c05544f99461df71403e -Author: Larry Gritz -Date: Mon Apr 23 15:50:14 2018 -0700 - - Changes to allow building against the new ffmpeg 4.0 (#1926) - -diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp -index 4e0cb3b9..548ddba4 100644 ---- a/src/ffmpeg.imageio/ffmpeginput.cpp -+++ b/src/ffmpeg.imageio/ffmpeginput.cpp -@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture, - } - #endif - -+ -+// Changes for ffmpeg 4.0 -+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100)) -+ -+#if USE_FFMPEG_4_0 -+# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY -+#endif -+ -+ - #include - - #include diff --git a/media-libs/openimageio/openimageio-1.8.13.ebuild b/media-libs/openimageio/openimageio-1.8.13.ebuild deleted file mode 100644 index 7e8ccfa61034..000000000000 --- a/media-libs/openimageio/openimageio-1.8.13.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit cmake-utils python-single-r1 - -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" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="colorio 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 - -RDEPEND=">=dev-libs/boost-1.62:= - dev-libs/pugixml:= - >=media-libs/ilmbase-2.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=media-libs/openexr-2.2.0-r2:= - media-libs/tiff:0= - sys-libs/zlib:= - virtual/jpeg:0 - colorio? ( media-libs/opencolorio:= ) - 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? ( - virtual/glu - virtual/opengl - media-libs/glew:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raw? ( media-libs/libraw:= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - truetype? ( media-libs/freetype:2= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[latex] )" - -DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -S="${WORKDIR}/oiio-Release-${PV}" - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -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_CPP14=ON - -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 colorio) - -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_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - - cmake-utils_src_configure -} diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild deleted file mode 100644 index 22956201293b..000000000000 --- a/media-libs/openimageio/openimageio-1.8.7.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit cmake-utils vcs-snapshot python-single-r1 - -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" - -X86_CPU_FEATURES=( - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c -) -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) - -IUSE="colorio 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 - -RDEPEND=">=dev-libs/boost-1.62:= - dev-libs/pugixml:= - >=media-libs/ilmbase-2.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.2.1:= - >=media-libs/openexr-2.2.0-r2:= - media-libs/tiff:0= - sys-libs/zlib:= - virtual/jpeg:0 - colorio? ( media-libs/opencolorio:= ) - 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? ( - virtual/glu - virtual/opengl - media-libs/glew:= - ) - ptex? ( media-libs/ptex:= ) - python? ( - ${PYTHON_DEPS} - dev-libs/boost:=[python,${PYTHON_USEDEP}] - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) - raw? ( media-libs/libraw:= ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - truetype? ( media-libs/freetype:2= )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen[latex] )" - -PATCHES=( - "${FILESDIR}/${P}-ffmpeg4.patch" -) - -DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf ) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - # Build with SIMD support - local cpufeature - local mysimd=() - for cpufeature in "${CPU_FEATURES[@]}"; do - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}") - done - - # If no CPU SIMDs were used, completely disable them - [[ -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_CPP14=ON - -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 colorio) - -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_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - - cmake-utils_src_configure -} -- 2.26.2