Diff openimageio-2.4.6.0-r1 with a openimageio-2.4.12.0

/usr/portage/media-libs/openimageio/openimageio-2.4.12.0.ebuild 2023-10-09 14:52:31.708368406 +0300
6 6
FONT_PN=OpenImageIO
7 7
PYTHON_COMPAT=( python3_{9..11} )
8 8

  
9
TEST_OIIO_IMAGE_COMMIT="245e50edede2792205080eadc1dedce33ff5c1e4"
10
TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
9
TEST_OIIO_IMAGE_COMMIT="aae37a54e31c0e719edcec852994d052ecf6541e"
10
TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00"
11 11
inherit cmake font python-single-r1
12 12

  
13 13
DESCRIPTION="A library for reading and writing images"
14 14
HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
15 15
SRC_URI="https://github.com/OpenImageIO/oiio/archive/v${PV}.tar.gz -> ${P}.tar.gz"
16 16
SRC_URI+=" test? (
17
		https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
18
		https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
19
	)"
17
	https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
18
	https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
19
)"
20 20
S="${WORKDIR}/oiio-${PV}"
21 21

  
22 22
LICENSE="BSD"
23 23
SLOT="0/$(ver_cut 1-2)"
24
KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
24
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
25 25

  
26 26
X86_CPU_FEATURES=(
27 27
	aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
......
29 29
)
30 30
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
31 31

  
32
IUSE="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
33
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
32
IUSE="dicom doc ffmpeg gif jpeg2k opencv openvdb ptex python qt5 qt6 raw test +tools +truetype ${CPU_FEATURES[@]%:*}"
33
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) qt5? ( tools ) qt6? ( tools )"
34 34

  
35 35
# Not quite working yet
36 36
RESTRICT="!test? ( test )" # test"
......
64 64
	gif? ( media-libs/giflib:0= )
65 65
	jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
66 66
	opencv? ( media-libs/opencv:= )
67
	opengl? (
68
		media-libs/glew:=
69
		virtual/glu
70
		virtual/opengl
71
	)
72 67
	openvdb? (
73 68
		dev-cpp/tbb:=
74 69
		media-gfx/openvdb:=
......
83 78
		')
84 79
	)
85 80
	qt5? (
81
		media-libs/libglvnd
86 82
		dev-qt/qtcore:5
87 83
		dev-qt/qtgui:5
84
		dev-qt/qtopengl:5
88 85
		dev-qt/qtwidgets:5
89
		opengl? ( dev-qt/qtopengl:5 )
86
	)
87
	qt6? (
88
		media-libs/libglvnd
89
		dev-qt/qtbase:6[gui,widgets,opengl]
90 90
	)
91 91
	raw? ( media-libs/libraw:= )
92 92
	truetype? ( media-libs/freetype:2= )
......
95 95

  
96 96
DOCS=( CHANGES.md CREDITS.md README.md )
97 97

  
98
pkg_pretend() {
99
	use qt5 && use qt6 && einfo "The \"qt5\" USE flag has no effect when the \"qt6\" USE flag is also enabled."
100
}
101

  
98 102
pkg_setup() {
99 103
	use python && python-single-r1_pkg_setup
100 104
}
......
123 127

  
124 128
	local mycmakeargs=(
125 129
		-DVERBOSE=ON
130
		-DOIIO_BUILD_TOOLS=$(usex tools)
126 131
		-DBUILD_TESTING=$(usex test)
127 132
		-DOIIO_BUILD_TESTS=$(usex test)
128 133
		-DOIIO_DOWNLOAD_MISSING_TESTDATA=OFF
......
139 144
		-DUSE_GIF=$(usex gif)
140 145
		-DUSE_OPENJPEG=$(usex jpeg2k)
141 146
		-DUSE_OPENCV=$(usex opencv)
142
		-DUSE_OPENGL=$(usex opengl)
143 147
		-DUSE_OPENVDB=$(usex openvdb)
144 148
		-DUSE_PTEX=$(usex ptex)
145 149
		-DUSE_PYTHON=$(usex python)
146
		-DUSE_QT=$(usex qt5)
147 150
		-DUSE_LIBRAW=$(usex raw)
148 151
		-DUSE_FREETYPE=$(usex truetype)
149 152
		-DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
150 153
	)
151 154

  
155
	if use qt5 || use qt6; then
156
		mycmakeargs+=( -DENABLE_IV=ON -DUSE_OPENGL=ON -DUSE_QT=ON )
157
		if use qt6; then
158
			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt5=ON )
159
		else
160
			mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
161
		fi
162
	else
163
		mycmakeargs+=( -DENABLE_IV=OFF -DUSE_QT=OFF )
164
	fi
165

  
152 166
	if use python; then
153 167
		mycmakeargs+=(
154 168
			-DPYTHON_VERSION=${EPYTHON#python}
Thank you!