media-libs/openimageio: version bump

new maintainer with science
keyword ppc64 on closing of
Bug: https://bugs.gentoo.org/746011
Bug: https://bugs.gentoo.org/746014
Bug: https://bugs.gentoo.org/745783

Closes: https://bugs.gentoo.org/678294
Closes: https://bugs.gentoo.org/735598

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Aisha Tammy <gentoo@aisha.cc>
Closes: https://github.com/gentoo/gentoo/pull/17728
Signed-off-by: Sam James <sam@gentoo.org>

4 files changed, 170 insertions, 1 deletions

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 217a10ddff03..641925b4be04 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1 +1,2 @@
 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
+DIST openimageio-2.2.6.1.tar.gz 29187970 BLAKE2B 857659892009e1638b923e7f28d29d7a1416641284ead714373875a74b7607205c6bc6810179d63bb066034a32452e0f4c2b78a0578b006e87602c43f8a34783 SHA512 a23fa75d5de589ce6f73ff17870cd1df764bb92a0dbc32b36d0e799b30705e1f174e0763150d27611c0efa07a21cb7636508e3135942ee7c56d0d59940d3a053
diff --git a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
new file mode 100644
index 000000000000..d5cef06d38db
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
@@ -0,0 +1,21 @@
+https://github.com/OpenImageIO/oiio/issues/2732
+
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 1240f22..5cc5a2e 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -227,6 +227,14 @@ endif ()
+ # allow this to be overridden to use the distro-provided package if desired.
+ option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
+ if (USE_EXTERNAL_PUGIXML)
++    find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp)
++    find_library (PUGIXML_LIBRARIES NAMES pugixml)
++
++    set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR})
++    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES})
++    set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR})
++
+     checked_find_package (pugixml REQUIRED
+                           DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1)
+ endif()
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index 4593e8d4cbff..592d071e5e52 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,12 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo@aisha.cc</email>
+		<name>Aisha Tammy</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<use>
 		<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="openvdb">Enable OpenVDB support via <pkg>media-gfx/openvdb</pkg></flag>
 		<flag name="ptex">Enable Ptex texture mapping system file support via <pkg>media-libs/ptex</pkg></flag>
 	</use>
 	<upstream>
diff --git a/media-libs/openimageio/openimageio-2.2.6.1.ebuild b/media-libs/openimageio/openimageio-2.2.6.1.ebuild
new file mode 100644
index 000000000000..a1d2dcbdc3a9
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.6.1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake 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"
+S="${WORKDIR}/oiio-Release-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+	aes:aes 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="doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# test data in separate repo
+# second repo has no structure whatsoever
+RESTRICT="test"
+
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-bibtexextra
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-fontutils
+		dev-texlive/texlive-latex
+		dev-texlive/texlive-latexextra
+	)
+"
+RDEPEND="
+	>=dev-libs/boost-1.62:=
+	dev-cpp/robin-map
+	dev-libs/libfmt:=
+	dev-libs/pugixml:=
+	>=media-libs/ilmbase-2.2.0-r1:=
+	>=media-libs/libheif-1.7.0:=
+	media-libs/libpng:0=
+	>=media-libs/libwebp-0.2.1:=
+	media-libs/opencolorio:=
+	>=media-libs/openexr-2.2.0-r2:=
+	media-libs/tiff:0=
+	sci-libs/dcmtk
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	ffmpeg? ( media-video/ffmpeg:= )
+	field3d? ( media-libs/Field3D:= )
+	gif? ( media-libs/giflib:0= )
+	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+	opencv? ( media-libs/opencv:= )
+	opengl? (
+		media-libs/glew:=
+		virtual/glu
+		virtual/opengl
+	)
+	openvdb? (
+		dev-cpp/tbb:=
+		media-gfx/openvdb:=
+	)
+	ptex? ( media-libs/ptex:= )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-libs/boost:=[python,${PYTHON_USEDEP}]
+			dev-python/numpy:=[${PYTHON_USEDEP}]
+			dev-python/pybind11:=[${PYTHON_USEDEP}]
+		')
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	raw? ( media-libs/libraw:= )
+	truetype? ( media-libs/freetype:2= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES.md CREDITS.md README.md )
+
+PATCHES=( "${FILESDIR}"/${P}-pugixml.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory src/fonts
+}
+
+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=(
+		-DVERBOSE=ON
+		-DOIIO_BUILD_TESTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_EXTERNAL_PUGIXML=ON
+		-DUSE_JPEGTURBO=ON
+		-DUSE_NUKE=OFF # not in Gentoo
+		-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_OPENVDB=$(usex openvdb)
+		-DUSE_PTEX=$(usex ptex)
+		-DUSE_PYTHON=$(usex python)
+		-DUSE_QT=$(usex qt5)
+		-DUSE_LIBRAW=$(usex raw)
+		-DUSE_FREETYPE=$(usex truetype)
+		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+	)
+
+	cmake_src_configure
+}