From 88348d434db27f2045228002948f6cc5cfc9da85 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 30 Jun 2019 22:53:26 +0100 Subject: Revert "media-libs/openimageio : add newer ebuild than what gentoo has" This reverts commit fb6daced97dba194dfb65dd10793f4039fe95a6d. --- media-libs/openimageio/Manifest | 1 - media-libs/openimageio/files/CMakeLists.txt.patch | 13 -- .../openimageio/files/externalpackages.cmake.patch | 11 -- media-libs/openimageio/files/ivgl_h.patch | 12 -- .../openimageio/openimageio-2.0.7-r314.ebuild | 138 --------------------- 5 files changed, 175 deletions(-) delete mode 100644 media-libs/openimageio/Manifest delete mode 100644 media-libs/openimageio/files/CMakeLists.txt.patch delete mode 100644 media-libs/openimageio/files/externalpackages.cmake.patch delete mode 100644 media-libs/openimageio/files/ivgl_h.patch delete mode 100644 media-libs/openimageio/openimageio-2.0.7-r314.ebuild (limited to 'media-libs') diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest deleted file mode 100644 index 97b97b81..00000000 --- a/media-libs/openimageio/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST openimageio-2.0.7.tar.gz 29789712 BLAKE2B 2ad79e8042b4dc68ff595c80e711836ad6779190435e68ff42f9155c720e6d43c0c5f21a54dd9e2ae87986026ff750b3052d7946d954d1cb433b123795c8509a SHA512 90a2089b05f1a753bc48a867650afb6d9eaf644c74a8d04a7b41feba46ad1f50ea9434d08a1ba698d785b9a43defecfa0ef15f971f205387e214fb83a26c44c9 diff --git a/media-libs/openimageio/files/CMakeLists.txt.patch b/media-libs/openimageio/files/CMakeLists.txt.patch deleted file mode 100644 index c4f3157a..00000000 --- a/media-libs/openimageio/files/CMakeLists.txt.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/libOpenImageIO/CMakeLists.txt -+++ b/src/libOpenImageIO/CMakeLists.txt -@@ -302,6 +302,10 @@ if (EMBEDPLUGINS) - endif () - endif () - -+if (CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8) -+ target_link_libraries (OpenImageIO atomic) -+endif () -+ - target_link_libraries (OpenImageIO ${ILMBASE_LIBRARIES}) - - if (USE_EXTERNAL_PUGIXML) diff --git a/media-libs/openimageio/files/externalpackages.cmake.patch b/media-libs/openimageio/files/externalpackages.cmake.patch deleted file mode 100644 index f8386e29..00000000 --- a/media-libs/openimageio/files/externalpackages.cmake.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -103,7 +102,7 @@ - if (NOT USE_STD_REGEX) - list (APPEND Boost_COMPONENTS regex) - endif () -- find_package (Boost 1.53 REQUIRED -+ find_package (Boost 1.69 REQUIRED - COMPONENTS ${Boost_COMPONENTS}) - endif () - diff --git a/media-libs/openimageio/files/ivgl_h.patch b/media-libs/openimageio/files/ivgl_h.patch deleted file mode 100644 index abb370e7..00000000 --- a/media-libs/openimageio/files/ivgl_h.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/iv/ivgl.h -+++ b/src/iv/ivgl.h -@@ -52,6 +52,9 @@ - #include - #include - -+#include -+#include -+ - using namespace OIIO; - - class IvImage; diff --git a/media-libs/openimageio/openimageio-2.0.7-r314.ebuild b/media-libs/openimageio/openimageio-2.0.7-r314.ebuild deleted file mode 100644 index bbab9e89..00000000 --- a/media-libs/openimageio/openimageio-2.0.7-r314.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 1999-2019 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_7 ) - -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" - -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.69 - dev-libs/robin-map - 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 - sci-libs/dcmtk - colorio? ( media-libs/opencolorio:= ) - ffmpeg? ( media-video/ffmpeg:= ) - field3d? ( media-libs/Field3D:= ) - gif? ( media-libs/giflib:0= ) - jpeg2k? ( >=media-libs/openjpeg-1.5 ) - 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 ) - -PATCHES=( - "${FILESDIR}"/ivgl_h.patch - "${FILESDIR}"/CMakeLists.txt.patch - "${FILESDIR}"/externalpackages.cmake.patch -) - -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 - - if use python; then - mycmakeargs+=( - -DPYLIB3_INSTALL_DIR=$(python_get_sitedir) - ) - - fi - - mycmakeargs+=( - -DBUILDSTATIC=OFF - -DLINKSTATIC=OFF - -DNOTHREADS=OFF - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_LIBDIR=$(get_libdir) - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DINSTALL_DOCS=$(usex doc) - -DOIIO_BUILD_TESTS=ON - -DOIIO_BUILD_TOOLS=ON - -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_PYTHON3=$(usex python) - -DUSE_QT=$(usex qt5) - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}") - ) - - cmake-utils_src_configure -} -- cgit v1.2.3