Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/dcpomatic/, media-video/dcpomatic/files/
Date: Sun, 27 Jan 2019 19:46:49
Message-Id: 1548618354.a444a4d3cc049c4f73e7ec28c2e2dacb0bc7011c.pacho@gentoo
1 commit: a444a4d3cc049c4f73e7ec28c2e2dacb0bc7011c
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 27 19:38:23 2019 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 27 19:45:54 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a444a4d3
7
8 media-video/dcpomatic: Drop old
9
10 Package-Manager: Portage-2.3.58, Repoman-2.3.12
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 media-video/dcpomatic/Manifest | 3 -
14 media-video/dcpomatic/dcpomatic-2.10.2.ebuild | 101 -------------------
15 media-video/dcpomatic/dcpomatic-2.10.5.ebuild | 101 -------------------
16 media-video/dcpomatic/dcpomatic-2.11.7.ebuild | 112 ---------------------
17 .../files/dcpomatic-2.10.2-imagemagick-7.patch | 18 ----
18 5 files changed, 335 deletions(-)
19
20 diff --git a/media-video/dcpomatic/Manifest b/media-video/dcpomatic/Manifest
21 index 9f288e8f1b8..cacc1b4d972 100644
22 --- a/media-video/dcpomatic/Manifest
23 +++ b/media-video/dcpomatic/Manifest
24 @@ -1,4 +1 @@
25 -DIST dcpomatic-2.10.2.tar.bz2 37503820 BLAKE2B b7efaedaf4b43a54e70dc60e836e283e52f327263dff075549b819c1708b7c9680b9f99e8d5eb37155520101de90145b37a487bb3edec80bf85bdbf9e6cfd578 SHA512 dc4fff96db31ee7645cdc9aac59b37a8dc37f2d77287c41bd4da4df074802a518d4b9c0e5143272d50d2dfee03d46b4ac761c0423b51b327185aae0510c0deb5
26 -DIST dcpomatic-2.10.5.tar.bz2 37500917 BLAKE2B d56d52d1ba01a1aae0840df28f0ed92408af98f7a47c1b71495b9220595c394920c49fb4cc65279b117636270a4cfb95b073cfa1684a00534eead9056953cd0e SHA512 0cce80bfb7b6cc830ff9935a16b0610a584628e8f45ad36401c6da6c13963e90a63d0213fff9b8277074b12f522bbe7286caf4cad9beceea77e05977e726ecf4
27 -DIST dcpomatic-2.11.7.tar.bz2 48225986 BLAKE2B 95c1be24e606e545f95a62827e3702893ea155fae5cf8d9947e4674c4779be36b2b295b4a308e8b8f9e3fb589c66d74826f00ed00f9bfd4c1cdceca366c87538 SHA512 06421edc41c32986add3266cf6674eb44f24d4899a391d4ec354840180a83531531bb965cad86b804aa054589a4cb7587988b334882610b5fc699ae6ca0484c3
28 DIST dcpomatic-2.12.4.tar.bz2 177868575 BLAKE2B 5ace00aad6bfd44790841da380b45aa28577b058e11d2f7b6ef9d8611cf4c370054735ded599da210764fa1eed45d49bc1fb111862167998f2479251dc8cd308 SHA512 e7d16c603c7c1ae8ee489279b28a22ced74794c7974a67fb2f8ff1403f3f6041223b3c89eaf4f1ad1a56fb41dc0090c9176ded36e8fa2a8dbedba49a57d2ba82
29
30 diff --git a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild b/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
31 deleted file mode 100644
32 index beaa2a87164..00000000000
33 --- a/media-video/dcpomatic/dcpomatic-2.10.2.ebuild
34 +++ /dev/null
35 @@ -1,101 +0,0 @@
36 -# Copyright 1999-2018 Gentoo Foundation
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=6
40 -
41 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 python3_5 )
42 -PYTHON_REQ_USE="threads(+)"
43 -inherit python-any-r1 waf-utils wxwidgets
44 -
45 -DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
46 -HOMEPAGE="https://dcpomatic.com/"
47 -SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
48 -
49 -LICENSE="GPL-2"
50 -SLOT="0"
51 -KEYWORDS="~amd64"
52 -IUSE="+gtk"
53 -
54 -RDEPEND="dev-cpp/cairomm
55 - dev-cpp/glibmm:2
56 - dev-cpp/libxmlpp:2.6
57 - dev-cpp/pangomm:1.4
58 - dev-libs/boost
59 - dev-libs/glib:2
60 - dev-libs/icu
61 - dev-libs/libcxml
62 - dev-libs/libzip
63 - dev-libs/openssl:0
64 - || ( media-gfx/graphicsmagick media-gfx/imagemagick )
65 - media-libs/fontconfig:1.0
66 - >=media-libs/libdcp-1.4.1:1.0
67 - media-libs/libsamplerate
68 - media-libs/libsndfile
69 - >=media-libs/libsub-1.2.1:1.0
70 - >=media-video/ffmpeg-3:=
71 - net-libs/libssh
72 - net-misc/curl
73 - gtk? ( x11-libs/gtk+:2
74 - x11-libs/wxGTK:3.0 )"
75 -DEPEND="${RDEPEND}
76 - ${PYTHON_DEPS}
77 - dev-util/waf
78 - virtual/pkgconfig"
79 -
80 -PATCHES=(
81 - "${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
82 - "${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
83 - "${FILESDIR}"/${PN}-2.8.0-desktop.patch
84 - "${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
85 - )
86 -
87 -src_prepare() {
88 - rm -v waf
89 - export WAF_BINARY=${EROOT}usr/bin/waf
90 - if [ -z "${PYTHONPATH}" ] ; then
91 - export PYTHONPATH="${S}"
92 - else
93 - export PYTHONPATH="${S}:${PYTHONPATH}"
94 - fi
95 -
96 - ewarn "Some tests failing due missing files/certs are disabled."
97 - sed \
98 - -e '/4k_test.cc/d' \
99 - -e '/audio_analysis_test.cc/d' \
100 - -e '/audio_decoder_test.cc/d' \
101 - -e '/audio_processor_test.cc/d' \
102 - -e '/black_fill_test.cc/d' \
103 - -e '/client_server_test.cc/d' \
104 - -e '/dcp_subtitle_test.cc/d' \
105 - -e '/ffmpeg_decoder_sequential_test.cc/d' \
106 - -e '/file_naming_test.cc/d' \
107 - -e '/import_dcp_test.cc/d' \
108 - -e '/interrupt_encoder_test.cc/d' \
109 - -e '/j2k_bandwidth_test.cc/d' \
110 - -e '/recover_test.cc/d' \
111 - -e '/reels_test.cc/d' \
112 - -e '/render_subtitles_test.cc/d' \
113 - -e '/repeat_frame_test.cc/d' \
114 - -e '/scaling_test.cc/d' \
115 - -e '/skip_frame_test.cc/d' \
116 - -e '/srt_subtitle_test.cc/d' \
117 - -e '/ssa_subtitle_test.cc/d' \
118 - -e '/vf_test.cc/d' \
119 - -e '/video_mxf_content_test.cc/d' \
120 - -e '/film_metadata_test.cc/d' \
121 - -i test/wscript || die
122 -
123 - if has_version ">media-gfx/imagemagick-7" ; then
124 - epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
125 - fi
126 -
127 - default
128 -}
129 -
130 -src_configure() {
131 - waf-utils_src_configure $(usex gtk "" "--disable-gui")
132 -}
133 -
134 -src_test() {
135 - ./run/tests || die
136 -}
137
138 diff --git a/media-video/dcpomatic/dcpomatic-2.10.5.ebuild b/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
139 deleted file mode 100644
140 index d10c7ec57ae..00000000000
141 --- a/media-video/dcpomatic/dcpomatic-2.10.5.ebuild
142 +++ /dev/null
143 @@ -1,101 +0,0 @@
144 -# Copyright 1999-2018 Gentoo Foundation
145 -# Distributed under the terms of the GNU General Public License v2
146 -
147 -EAPI=6
148 -
149 -PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
150 -PYTHON_REQ_USE="threads(+)"
151 -inherit python-any-r1 waf-utils wxwidgets
152 -
153 -DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
154 -HOMEPAGE="https://dcpomatic.com/"
155 -SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
156 -
157 -LICENSE="GPL-2"
158 -SLOT="0"
159 -KEYWORDS="~amd64"
160 -IUSE="+gtk"
161 -
162 -RDEPEND="dev-cpp/cairomm
163 - dev-cpp/glibmm:2
164 - dev-cpp/libxmlpp:2.6
165 - dev-cpp/pangomm:1.4
166 - dev-libs/boost
167 - dev-libs/glib:2
168 - dev-libs/icu
169 - dev-libs/libcxml
170 - dev-libs/libzip
171 - dev-libs/openssl:0
172 - || ( media-gfx/graphicsmagick media-gfx/imagemagick )
173 - media-libs/fontconfig:1.0
174 - >=media-libs/libdcp-1.4.1:1.0
175 - media-libs/libsamplerate
176 - media-libs/libsndfile
177 - >=media-libs/libsub-1.2.1:1.0
178 - >=media-video/ffmpeg-3:=
179 - net-libs/libssh
180 - net-misc/curl
181 - gtk? ( x11-libs/gtk+:2
182 - x11-libs/wxGTK:3.0 )"
183 -DEPEND="${RDEPEND}
184 - ${PYTHON_DEPS}
185 - dev-util/waf
186 - virtual/pkgconfig"
187 -
188 -PATCHES=(
189 - "${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
190 - "${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
191 - "${FILESDIR}"/${PN}-2.8.0-desktop.patch
192 - "${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
193 - )
194 -
195 -src_prepare() {
196 - rm -v waf
197 - export WAF_BINARY=${EROOT}usr/bin/waf
198 - if [ -z "${PYTHONPATH}" ] ; then
199 - export PYTHONPATH="${S}"
200 - else
201 - export PYTHONPATH="${S}:${PYTHONPATH}"
202 - fi
203 -
204 - ewarn "Some tests failing due missing files/certs are disabled."
205 - sed \
206 - -e '/4k_test.cc/d' \
207 - -e '/audio_analysis_test.cc/d' \
208 - -e '/audio_decoder_test.cc/d' \
209 - -e '/audio_processor_test.cc/d' \
210 - -e '/black_fill_test.cc/d' \
211 - -e '/client_server_test.cc/d' \
212 - -e '/dcp_subtitle_test.cc/d' \
213 - -e '/ffmpeg_decoder_sequential_test.cc/d' \
214 - -e '/file_naming_test.cc/d' \
215 - -e '/import_dcp_test.cc/d' \
216 - -e '/interrupt_encoder_test.cc/d' \
217 - -e '/j2k_bandwidth_test.cc/d' \
218 - -e '/recover_test.cc/d' \
219 - -e '/reels_test.cc/d' \
220 - -e '/render_subtitles_test.cc/d' \
221 - -e '/repeat_frame_test.cc/d' \
222 - -e '/scaling_test.cc/d' \
223 - -e '/skip_frame_test.cc/d' \
224 - -e '/srt_subtitle_test.cc/d' \
225 - -e '/ssa_subtitle_test.cc/d' \
226 - -e '/vf_test.cc/d' \
227 - -e '/video_mxf_content_test.cc/d' \
228 - -e '/film_metadata_test.cc/d' \
229 - -i test/wscript || die
230 -
231 - if has_version ">media-gfx/imagemagick-7" ; then
232 - epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
233 - fi
234 -
235 - default
236 -}
237 -
238 -src_configure() {
239 - waf-utils_src_configure $(usex gtk "" "--disable-gui")
240 -}
241 -
242 -src_test() {
243 - ./run/tests || die
244 -}
245
246 diff --git a/media-video/dcpomatic/dcpomatic-2.11.7.ebuild b/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
247 deleted file mode 100644
248 index d3619999bcf..00000000000
249 --- a/media-video/dcpomatic/dcpomatic-2.11.7.ebuild
250 +++ /dev/null
251 @@ -1,112 +0,0 @@
252 -# Copyright 1999-2018 Gentoo Foundation
253 -# Distributed under the terms of the GNU General Public License v2
254 -
255 -EAPI=6
256 -
257 -PYTHON_COMPAT=( python2_7 python3_{3,4,5,6} )
258 -PYTHON_REQ_USE="threads(+)"
259 -inherit python-any-r1 waf-utils wxwidgets
260 -
261 -DESCRIPTION="create Digital Cinema Packages (DCPs) from videos, images and sound files"
262 -HOMEPAGE="https://dcpomatic.com/"
263 -SRC_URI="http://${PN}.com/downloads/${PV}/${P}.tar.bz2"
264 -
265 -LICENSE="GPL-2"
266 -SLOT="0"
267 -KEYWORDS=""
268 -IUSE="+alsa +gtk jack pulseaudio"
269 -
270 -REQUIRED_USE="^^ ( alsa jack pulseaudio )"
271 -
272 -RDEPEND="dev-cpp/cairomm
273 - dev-cpp/glibmm:2
274 - dev-cpp/libxmlpp:2.6
275 - dev-cpp/pangomm:1.4
276 - dev-libs/boost
277 - dev-libs/glib:2
278 - dev-libs/icu
279 - dev-libs/libcxml
280 - dev-libs/libzip
281 - dev-libs/openssl:0
282 - || ( media-gfx/graphicsmagick media-gfx/imagemagick )
283 - media-libs/fontconfig:1.0
284 - >media-libs/libdcp-1.4.4:1.0
285 - media-libs/libsamplerate
286 - media-libs/libsndfile
287 - >=media-libs/libsub-1.2.1:1.0
288 - media-libs/rtaudio[alsa?,jack?,pulseaudio?]
289 - >=media-video/ffmpeg-3:=
290 - net-libs/libssh
291 - net-misc/curl
292 - gtk? ( x11-libs/gtk+:2
293 - x11-libs/wxGTK:3.0 )"
294 -DEPEND="${RDEPEND}
295 - ${PYTHON_DEPS}
296 - dev-util/waf
297 - virtual/pkgconfig"
298 -
299 -PATCHES=(
300 - "${FILESDIR}"/${PN}-2.8.0-wxGTK3.patch
301 - "${FILESDIR}"/${PN}-2.8.0-no-ldconfig.patch
302 - "${FILESDIR}"/${PN}-2.8.0-desktop.patch
303 - "${FILESDIR}"/${PN}-2.10.2-respect-cxxflags.patch
304 - )
305 -
306 -src_prepare() {
307 - rm -v waf
308 - export WAF_BINARY=${EROOT}usr/bin/waf
309 - if [ -z "${PYTHONPATH}" ] ; then
310 - export PYTHONPATH="${S}"
311 - else
312 - export PYTHONPATH="${S}:${PYTHONPATH}"
313 - fi
314 -
315 - ewarn "Some tests failing due missing files/certs are disabled."
316 - sed \
317 - -e '/4k_test.cc/d' \
318 - -e '/audio_analysis_test.cc/d' \
319 - -e '/audio_decoder_test.cc/d' \
320 - -e '/audio_processor_test.cc/d' \
321 - -e '/black_fill_test.cc/d' \
322 - -e '/client_server_test.cc/d' \
323 - -e '/dcp_subtitle_test.cc/d' \
324 - -e '/ffmpeg_decoder_sequential_test.cc/d' \
325 - -e '/file_naming_test.cc/d' \
326 - -e '/import_dcp_test.cc/d' \
327 - -e '/interrupt_encoder_test.cc/d' \
328 - -e '/j2k_bandwidth_test.cc/d' \
329 - -e '/recover_test.cc/d' \
330 - -e '/reels_test.cc/d' \
331 - -e '/render_subtitles_test.cc/d' \
332 - -e '/repeat_frame_test.cc/d' \
333 - -e '/scaling_test.cc/d' \
334 - -e '/skip_frame_test.cc/d' \
335 - -e '/srt_subtitle_test.cc/d' \
336 - -e '/ssa_subtitle_test.cc/d' \
337 - -e '/vf_test.cc/d' \
338 - -e '/video_mxf_content_test.cc/d' \
339 - -e '/film_metadata_test.cc/d' \
340 - -i test/wscript || die
341 -
342 - if has_version ">media-gfx/imagemagick-7" ; then
343 - epatch "${FILESDIR}"/${PN}-2.10.2-imagemagick-7.patch
344 - fi
345 -
346 - if use alsa ; then
347 - sed -e "s|RtAudio::LINUX_PULSE|RtAudio::LINUX_ALSA|"\
348 - -i src/wx/wx_util.h || die
349 - elif use jack ; then
350 - sed -e "s|RtAudio::LINUX_PULSE|RtAudio::UNIX_JACK|"\
351 - -i src/wx/wx_util.h || die
352 - fi
353 -
354 - default
355 -}
356 -
357 -src_configure() {
358 - waf-utils_src_configure $(usex gtk "" "--disable-gui")
359 -}
360 -
361 -src_test() {
362 - ./run/tests || die
363 -}
364
365 diff --git a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch b/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
366 deleted file mode 100644
367 index 2e4e9e8838e..00000000000
368 --- a/media-video/dcpomatic/files/dcpomatic-2.10.2-imagemagick-7.patch
369 +++ /dev/null
370 @@ -1,18 +0,0 @@
371 ---- dcpomatic-2.10.2/src/lib/environment_info.cc
372 -+++ dcpomatic-2.10.2/src/lib/environment_info.cc
373 -@@ -25,12 +25,13 @@
374 - #include <dcp/version.h>
375 - #include <libssh/libssh.h>
376 - #ifdef DCPOMATIC_IMAGE_MAGICK
377 --#include <magick/MagickCore.h>
378 -+#include <MagickCore/MagickCore.h>
379 -+#include <MagickCore/version.h>
380 - #else
381 - #include <magick/common.h>
382 - #include <magick/magick_config.h>
383 --#endif
384 - #include <magick/version.h>
385 -+#endif
386 - extern "C" {
387 - #include <libavcodec/avcodec.h>
388 - #include <libavformat/avformat.h>