Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
Date: Mon, 07 Jan 2019 12:38:32
Message-Id: 1546864695.32852865d59bc3ab579d4664d5c9b5790edfca46.polynomial-c@gentoo
1 commit: 32852865d59bc3ab579d4664d5c9b5790edfca46
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 7 12:35:48 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 7 12:38:15 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32852865
7
8 media-libs/openimageio: Removed old.
9
10 Closes: https://bugs.gentoo.org/668412
11 Package-Manager: Portage-2.3.54, Repoman-2.3.12
12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
13
14 media-libs/openimageio/Manifest | 2 -
15 .../files/openimageio-1.8.7-ffmpeg4.patch | 26 -----
16 media-libs/openimageio/openimageio-1.8.13.ebuild | 114 --------------------
17 media-libs/openimageio/openimageio-1.8.7.ebuild | 116 ---------------------
18 4 files changed, 258 deletions(-)
19
20 diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
21 index 43aff67028b..e1d63745cb3 100644
22 --- a/media-libs/openimageio/Manifest
23 +++ b/media-libs/openimageio/Manifest
24 @@ -1,6 +1,4 @@
25 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6
26 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51
27 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94
28 -DIST openimageio-1.8.13.tar.gz 27829708 BLAKE2B 8c3a6721f7039e22fcea538694c32651e042d926f40494e5b3623c11158da2f49a8e49698920269d0f3076d060c5849c62f2a6bb256d77dcd5565f86e6de04d2 SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e
29 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7
30 -DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963
31
32 diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
33 deleted file mode 100644
34 index 92cad26c933..00000000000
35 --- a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
36 +++ /dev/null
37 @@ -1,26 +0,0 @@
38 -commit 810a0235837d6f31d8b3c05544f99461df71403e
39 -Author: Larry Gritz <lg@××××××××××.com>
40 -Date: Mon Apr 23 15:50:14 2018 -0700
41 -
42 - Changes to allow building against the new ffmpeg 4.0 (#1926)
43 -
44 -diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp
45 -index 4e0cb3b9..548ddba4 100644
46 ---- a/src/ffmpeg.imageio/ffmpeginput.cpp
47 -+++ b/src/ffmpeg.imageio/ffmpeginput.cpp
48 -@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture,
49 - }
50 - #endif
51 -
52 -+
53 -+// Changes for ffmpeg 4.0
54 -+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100))
55 -+
56 -+#if USE_FFMPEG_4_0
57 -+# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY
58 -+#endif
59 -+
60 -+
61 - #include <boost/thread/once.hpp>
62 -
63 - #include <OpenImageIO/imageio.h>
64
65 diff --git a/media-libs/openimageio/openimageio-1.8.13.ebuild b/media-libs/openimageio/openimageio-1.8.13.ebuild
66 deleted file mode 100644
67 index 7e8ccfa6103..00000000000
68 --- a/media-libs/openimageio/openimageio-1.8.13.ebuild
69 +++ /dev/null
70 @@ -1,114 +0,0 @@
71 -# Copyright 1999-2018 Gentoo Foundation
72 -# Distributed under the terms of the GNU General Public License v2
73 -
74 -EAPI=6
75 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
76 -
77 -inherit cmake-utils python-single-r1
78 -
79 -DESCRIPTION="A library for reading and writing images"
80 -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
81 -SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
82 -
83 -LICENSE="BSD"
84 -SLOT="0"
85 -KEYWORDS="~amd64 ~ppc64 ~x86"
86 -
87 -X86_CPU_FEATURES=(
88 - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
89 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
90 -)
91 -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
92 -
93 -IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
94 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
95 -
96 -RESTRICT="test" #431412
97 -
98 -RDEPEND=">=dev-libs/boost-1.62:=
99 - dev-libs/pugixml:=
100 - >=media-libs/ilmbase-2.2.0-r1:=
101 - media-libs/libpng:0=
102 - >=media-libs/libwebp-0.2.1:=
103 - >=media-libs/openexr-2.2.0-r2:=
104 - media-libs/tiff:0=
105 - sys-libs/zlib:=
106 - virtual/jpeg:0
107 - colorio? ( media-libs/opencolorio:= )
108 - ffmpeg? ( media-video/ffmpeg:= )
109 - field3d? ( media-libs/Field3D:= )
110 - gif? ( media-libs/giflib:0= )
111 - jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
112 - opencv? ( media-libs/opencv:= )
113 - opengl? (
114 - virtual/glu
115 - virtual/opengl
116 - media-libs/glew:=
117 - )
118 - ptex? ( media-libs/ptex:= )
119 - python? (
120 - ${PYTHON_DEPS}
121 - dev-libs/boost:=[python,${PYTHON_USEDEP}]
122 - )
123 - qt5? (
124 - dev-qt/qtcore:5
125 - dev-qt/qtgui:5
126 - dev-qt/qtwidgets:5
127 - opengl? ( dev-qt/qtopengl:5 )
128 - )
129 - raw? ( media-libs/libraw:= )
130 - ssl? (
131 - !libressl? ( dev-libs/openssl:0= )
132 - libressl? ( dev-libs/libressl:0= )
133 - )
134 - truetype? ( media-libs/freetype:2= )"
135 -DEPEND="${RDEPEND}
136 - doc? ( app-doc/doxygen[latex] )"
137 -
138 -DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
139 -
140 -pkg_setup() {
141 - use python && python-single-r1_pkg_setup
142 -}
143 -
144 -S="${WORKDIR}/oiio-Release-${PV}"
145 -
146 -src_configure() {
147 - # Build with SIMD support
148 - local cpufeature
149 - local mysimd=()
150 - for cpufeature in "${CPU_FEATURES[@]}"; do
151 - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
152 - done
153 -
154 - # If no CPU SIMDs were used, completely disable them
155 - [[ -z ${mysimd} ]] && mysimd=("0")
156 -
157 - local mycmakeargs=(
158 - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
159 - -DINSTALL_DOCS=$(usex doc)
160 - -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
161 - -DSTOP_ON_WARNING=OFF
162 - -DUSE_CPP14=ON
163 - -DUSE_EXTERNAL_PUGIXML=ON
164 - -DUSE_FFMPEG=$(usex ffmpeg)
165 - -DUSE_FIELD3D=$(usex field3d)
166 - -DUSE_FREETYPE=$(usex truetype)
167 - -DUSE_GIF=$(usex gif)
168 - -DUSE_JPEGTURBO=ON
169 - -DUSE_LIBRAW=$(usex raw)
170 - -DUSE_NUKE=NO # Missing in Gentoo
171 - -DUSE_NUKE=OFF
172 - -DUSE_OCIO=$(usex colorio)
173 - -DUSE_OPENCV=$(usex opencv)
174 - -DUSE_OPENGL=$(usex opengl)
175 - -DUSE_OPENJPEG=$(usex jpeg2k)
176 - -DUSE_OPENSSL=$(usex ssl)
177 - -DUSE_PTEX=$(usex ptex)
178 - -DUSE_PYTHON=$(usex python)
179 - -DUSE_QT=$(usex qt5)
180 - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
181 - )
182 -
183 - cmake-utils_src_configure
184 -}
185
186 diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
187 deleted file mode 100644
188 index 22956201293..00000000000
189 --- a/media-libs/openimageio/openimageio-1.8.7.ebuild
190 +++ /dev/null
191 @@ -1,116 +0,0 @@
192 -# Copyright 1999-2018 Gentoo Foundation
193 -# Distributed under the terms of the GNU General Public License v2
194 -
195 -EAPI=6
196 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
197 -
198 -inherit cmake-utils vcs-snapshot python-single-r1
199 -
200 -DESCRIPTION="A library for reading and writing images"
201 -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
202 -SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
203 -
204 -LICENSE="BSD"
205 -SLOT="0"
206 -KEYWORDS="~amd64 ~ppc64 ~x86"
207 -
208 -X86_CPU_FEATURES=(
209 - sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
210 - avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
211 -)
212 -CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
213 -
214 -IUSE="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
215 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
216 -
217 -RESTRICT="test" #431412
218 -
219 -RDEPEND=">=dev-libs/boost-1.62:=
220 - dev-libs/pugixml:=
221 - >=media-libs/ilmbase-2.2.0-r1:=
222 - media-libs/libpng:0=
223 - >=media-libs/libwebp-0.2.1:=
224 - >=media-libs/openexr-2.2.0-r2:=
225 - media-libs/tiff:0=
226 - sys-libs/zlib:=
227 - virtual/jpeg:0
228 - colorio? ( media-libs/opencolorio:= )
229 - ffmpeg? ( media-video/ffmpeg:= )
230 - field3d? ( media-libs/Field3D:= )
231 - gif? ( media-libs/giflib:0= )
232 - jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
233 - opencv? ( media-libs/opencv:= )
234 - opengl? (
235 - virtual/glu
236 - virtual/opengl
237 - media-libs/glew:=
238 - )
239 - ptex? ( media-libs/ptex:= )
240 - python? (
241 - ${PYTHON_DEPS}
242 - dev-libs/boost:=[python,${PYTHON_USEDEP}]
243 - )
244 - qt5? (
245 - dev-qt/qtcore:5
246 - dev-qt/qtgui:5
247 - dev-qt/qtwidgets:5
248 - opengl? ( dev-qt/qtopengl:5 )
249 - )
250 - raw? ( media-libs/libraw:= )
251 - ssl? (
252 - !libressl? ( dev-libs/openssl:0= )
253 - libressl? ( dev-libs/libressl:0= )
254 - )
255 - truetype? ( media-libs/freetype:2= )"
256 -DEPEND="${RDEPEND}
257 - doc? ( app-doc/doxygen[latex] )"
258 -
259 -PATCHES=(
260 - "${FILESDIR}/${P}-ffmpeg4.patch"
261 -)
262 -
263 -DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
264 -
265 -pkg_setup() {
266 - use python && python-single-r1_pkg_setup
267 -}
268 -
269 -src_configure() {
270 - # Build with SIMD support
271 - local cpufeature
272 - local mysimd=()
273 - for cpufeature in "${CPU_FEATURES[@]}"; do
274 - use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
275 - done
276 -
277 - # If no CPU SIMDs were used, completely disable them
278 - [[ -z ${mysimd} ]] && mysimd=("0")
279 -
280 - local mycmakeargs=(
281 - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
282 - -DINSTALL_DOCS=$(usex doc)
283 - -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
284 - -DSTOP_ON_WARNING=OFF
285 - -DUSE_CPP14=ON
286 - -DUSE_EXTERNAL_PUGIXML=ON
287 - -DUSE_FFMPEG=$(usex ffmpeg)
288 - -DUSE_FIELD3D=$(usex field3d)
289 - -DUSE_FREETYPE=$(usex truetype)
290 - -DUSE_GIF=$(usex gif)
291 - -DUSE_JPEGTURBO=ON
292 - -DUSE_LIBRAW=$(usex raw)
293 - -DUSE_NUKE=NO # Missing in Gentoo
294 - -DUSE_NUKE=OFF
295 - -DUSE_OCIO=$(usex colorio)
296 - -DUSE_OPENCV=$(usex opencv)
297 - -DUSE_OPENGL=$(usex opengl)
298 - -DUSE_OPENJPEG=$(usex jpeg2k)
299 - -DUSE_OPENSSL=$(usex ssl)
300 - -DUSE_PTEX=$(usex ptex)
301 - -DUSE_PYTHON=$(usex python)
302 - -DUSE_QT=$(usex qt5)
303 - -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
304 - )
305 -
306 - cmake-utils_src_configure
307 -}