gentoo resync : 14.12.2020

3 files changed, 176 insertions, 2 deletions

diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 8dedb352c584..2d492880078e 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,5 +1,7 @@
 AUX openimageio-1.8.17-boostpython.patch 1177 BLAKE2B 80946ef94801bf1a37cfd2930ae33bd3d331dafd458a3665e4ce28f4379143175edc6b1e096f44b51ef4a53551a5f5de52bfeb59aff990b45ad198d7b75b6e14 SHA512 4aae9f6078ff5877ca44e74c7047f0bfe279b7de6bd0c8b8dbf9f3d98b6bfde671e22e91cc66995527eb853e13917e3bb79be88987abe20570439ce57dda96c6
 AUX openimageio-2.2.6.1-pugixml.patch 919 BLAKE2B 3f10cf27a3a521fed3b95183119da62333f3103998ad463c58b9e654ce23faedb0551a34d564899882d586411035bb0531c844425fa639f6def8bba9c10afe6a SHA512 fc834e27b2b166367d9aa2b4016bac70de1561ff6babfd543a6bd503785bd84a251b76a95bf15dbc76367e9482dc4589f208f57a537c2dc430c7e0999cd98bcf
 DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
-EBUILD openimageio-2.2.8.0.ebuild 3333 BLAKE2B 89179cf97ee4ecea05dcd854485c4eebd47c1b4efe42f8296d5d7afc9960ce6acc720affffb80a498df8ba20a63ba76b3963e89a34cff151191c72dd3214f6d3 SHA512 eed484e60fa85a4ecf7f4553f25459f24909e46f60fd97e21bbbedfbeec50bcd3787716ed05e05f5de9663b22b13376a2d08bf11b0c5bf57db35c7db49efb332
+DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
+EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 0d6b91115cefd79251cf73688fa76f0498074c5588604eaa02473730ea63bf69e54e498368847d7ef4cee2fc4325fc96ecdc0735a50de752e3ed48dd2a97022c SHA512 19406ec491d915c8f1385681ac1f06fe38dea58f075ef3de06f5e6ee0f3a65ecc834db3bfb2e8fe43db1d79df7fe14c185f28f4722d320876c6d6c1412e2a6b7
+EBUILD openimageio-2.2.9.0-r1.ebuild 3681 BLAKE2B fb434110b41fb72cef3ca045de9f2ca901f22c5360443de23096e2bdb6bbebf4a5ab992ebaa94f880405927a5cec73077c88f46c3bcdbea08e7a25fab6350c96 SHA512 d640bc9d6480a417c4c0192d2ffa745b306d3099488bc74522485ad09acc4fa2a5aabbc7d22a0feac3c8717ccafbb39cc60625a8d5f9f38153a3bd41c4653760
 MISC metadata.xml 922 BLAKE2B 4b63768455a06ac25a2845a1c4510ca33bd0eef4b2d4ddbb002fa2fc3c28fef6e1179d930281b8e3db91945e07e5df1b58677263cc500afa424778386ff5d095 SHA512 0ea0311d739c06c7d82b9e97deabcf9fd6330beebde039a9afbfeb742a7ff189bc498a7c77086bbc8c7be849037512bf98694537a8af98232b2eb3ee3a24ce9e
diff --git a/media-libs/openimageio/openimageio-2.2.8.0.ebuild b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
index 934cf38bd1c8..78fe460252e6 100644
--- a/media-libs/openimageio/openimageio-2.2.8.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=7
 
+FONT_PN=OpenImageIO
 PYTHON_COMPAT=( python3_{6..9} )
-inherit cmake python-single-r1
+inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
@@ -112,6 +113,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DVERBOSE=ON
 		-DOIIO_BUILD_TESTS=OFF
+		-DINSTALL_FONTS=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DINSTALL_DOCS=$(usex doc)
 		-DSTOP_ON_WARNING=OFF
@@ -136,3 +138,18 @@ src_configure() {
 
 	cmake_src_configure
 }
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
new file mode 100644
index 000000000000..cdd096fdaca6
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake font 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/2.2"
+KEYWORDS="~amd64 ~ppc64 ~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="dicom 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=
+	sys-libs/zlib:=
+	virtual/jpeg:0
+	dicom? ( sci-libs/dcmtk )
+	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 )
+
+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
+		-DINSTALL_FONTS=OFF
+		-DBUILD_DOCS=$(usex doc)
+		-DINSTALL_DOCS=$(usex doc)
+		-DSTOP_ON_WARNING=OFF
+		-DUSE_DCMTK=$(usex dicom)
+		-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
+}
+
+src_install() {
+	cmake_src_install
+	# can't use font_src_install
+	# it does directory hierarchy recreation
+	FONT_S=(
+		"${S}/src/fonts/Droid_Sans"
+		"${S}/src/fonts/Droid_Sans_Mono"
+		"${S}/src/fonts/Droid_Serif"
+	)
+	insinto ${FONTDIR}
+	for dir in "${FONT_S[@]}"; do
+		doins "${dir}"/*.ttf
+	done
+}