Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/0.27.0/
Date: Wed, 14 Feb 2018 19:55:41
Message-Id: 1518638101.3d5afe3355122f1975cfc4f4f338b926a3476e86.mgorny@gentoo
1 commit: 3d5afe3355122f1975cfc4f4f338b926a3476e86
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Tue Feb 13 20:45:44 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 14 19:55:01 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d5afe33
7
8 media-video/mpv: remove vulnerable versions
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 media-video/mpv/Manifest | 3 -
13 .../0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch | 50 ---
14 .../mpv-0.27.0-fix-wrong-colors-with-hwdec.patch | 44 ---
15 ...pv-0.27.0-remove-duplicate-android-option.patch | 27 --
16 .../files/0.27.0/mpv-0.27.0-support-libva2.patch | 86 -----
17 media-video/mpv/mpv-0.26.0.ebuild | 374 ---------------------
18 media-video/mpv/mpv-0.27.0-r1.ebuild | 371 --------------------
19 media-video/mpv/mpv-0.28.0.ebuild | 361 --------------------
20 8 files changed, 1316 deletions(-)
21
22 diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
23 index 7d531db6ac5..f86d59269f7 100644
24 --- a/media-video/mpv/Manifest
25 +++ b/media-video/mpv/Manifest
26 @@ -1,9 +1,6 @@
27 DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b655e254d64e63714281119d62e6963f07f8d384eccb3f8ea6ccb2a9b63a60e19bb7ff1fd4b8e4ccccdc9b1fd8e58a7c628 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2
28 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf
29 -DIST mpv-0.26.0.tar.gz 2916212 BLAKE2B b6402868face65c1179351697eff02116765eecdd105eef621faa73dc77f376aa060476bc80b92eba4839c46836c13bce0e56c6dccf0fe1aa49b1cfa463ec43e SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7
30 -DIST mpv-0.27.0.tar.gz 2956816 BLAKE2B 2af0fc7edbecb552fd7df93dcd9124fd4e30a2c29aa53d2139f2817356a6c4eb82eed74a8fdf0493ebb0315cb2806d76a8b2d8c24706975acf4d4704fd291dac SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4
31 DIST mpv-0.27.1-patches-r0.tar.xz 6580 BLAKE2B fdf5f580fbda9ec6856354d43fd80a177464af27ea6f65ab31c610996fced64670f178956b4030c9c34d0707f8fa4544c829e4401679d2e2d6e730b19ebfe6d8 SHA512 8f25c51f0a3c6b5304090144b8343afba4d872216f8fa13890240a51ac464bd2c486b017390d4d3398d7082ffdf3e617659861f15505bd2db72b6f5ab4500bcb
32 DIST mpv-0.27.1.tar.gz 2957202 BLAKE2B 79dd06ba9399368f24c2c0a065218432110829af08d97cfdf753966ec7ca75e5af8f04da381f83251cb57bdce9b30c0d2d8c6fc772f73b5a0ed43139ce66a316 SHA512 3b8e12edb20b6ffdbbb02aba9cc64ad25e4fb583efc72248549641a46cc840827c1b6b017e7efc323d8a8299b7b094a676525bd978b8c3c9ecccca32fe39149a
33 -DIST mpv-0.28.0.tar.gz 2982165 BLAKE2B 50f095d499df9685dec958287c159fc88be3b5db1465264404ba7c74184569ba47c147cb6491342ba8762199290f408737d03403e454a180bd0ed8b7191d14cc SHA512 33e889f9ca2dd16ad055ccd9fc5549fcead3fd15dcbc52c6b5f3ef608cf87b3d9952e9236e3dec8e7f32240b68d0b0cff1499f511d39c8f3a0501334f5c57a70
34 DIST mpv-0.28.1.tar.gz 2982546 BLAKE2B ae078e3393b1113a8211699da1fea867324c50d3696ab82446996f04b2571b29791811b3d3dc082761ca36d63c9b1aa844d7cd56b740e73821b3e7ca35d39512 SHA512 7593e5dbb5963bf39f57f8a08f1b5142474897172a2c6cafcbfd3a83a2f0cfb9a3e5d62eea6625f01aae8ccc236b738511846cd5a5016b93d2510f12f0be7624
35 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
36
37 diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch
38 deleted file mode 100644
39 index e83be2250e7..00000000000
40 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-hwdec-autoprobing.patch
41 +++ /dev/null
42 @@ -1,50 +0,0 @@
43 -commit b881881dbd38a1720a9f8401fd1baafdd0dfccc0
44 -Author: wm4 <wm4@nowhere>
45 -Date: Tue Sep 19 18:33:37 2017 +0200
46 -
47 -Revert "vd_lavc: change auto-probe order to prefer cuda over vdpau-copy"
48 -
49 -This reverts commit 96462040ec79b353457b64949f96fad30bd6e988.
50 -
51 -I guess the autoprobing is still too primitive to handle this well. What
52 -it really should be trying is initializing the wrapper decoder, and if
53 -that doesn't work, try another method. This is complicated by hwaccels
54 -initializing in a delayed way, so there is no easy solution yet.
55 -
56 -Probably fixes #4865.
57 -
58 -diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
59 -index 476beeb9e..e08246a29 100644
60 ---- a/video/decode/vd_lavc.c
61 -+++ b/video/decode/vd_lavc.c
62 -@@ -261,11 +261,16 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
63 - #endif
64 - #if HAVE_VDPAU_HWACCEL
65 - &mp_vd_lavc_vdpau,
66 -+ &mp_vd_lavc_vdpau_copy,
67 - #endif
68 - #if HAVE_VIDEOTOOLBOX_HWACCEL
69 - &mp_vd_lavc_videotoolbox,
70 - &mp_vd_lavc_videotoolbox_copy,
71 - #endif
72 -+#if HAVE_VAAPI_HWACCEL
73 -+ &mp_vd_lavc_vaapi,
74 -+ &mp_vd_lavc_vaapi_copy,
75 -+#endif
76 - #if HAVE_D3D_HWACCEL
77 - &mp_vd_lavc_d3d11va,
78 -
79 -@@ -285,13 +290,6 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = {
80 - &mp_vd_lavc_cuda_old,
81 - #endif
82 - &mp_vd_lavc_cuda_copy,
83 --#endif
84 --#if HAVE_VDPAU_HWACCEL
85 -- &mp_vd_lavc_vdpau_copy,
86 --#endif
87 --#if HAVE_VAAPI_HWACCEL
88 -- &mp_vd_lavc_vaapi,
89 -- &mp_vd_lavc_vaapi_copy,
90 - #endif
91 - &mp_vd_lavc_crystalhd,
92 - NULL
93
94 diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch
95 deleted file mode 100644
96 index f7d3129d855..00000000000
97 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-fix-wrong-colors-with-hwdec.patch
98 +++ /dev/null
99 @@ -1,44 +0,0 @@
100 -commit 810990a7465f31ee5ff5e29ebea1fb783e5ed502
101 -Author: wm4 <wm4@nowhere>
102 -Date: Tue Sep 19 18:59:01 2017 +0200
103 -
104 -mp_image: always copy color attributes on hw download
105 -
106 -It was noticed that -copy hwdec modes typically dropped the
107 -chroma_location field. This happened because the attributes on hw
108 -download are copied with mp_image_copy_attributes(), which tries to copy
109 -these parameters only if src and dst were both YUV (in an attempt to
110 -copy parameters only if it makes sense).
111 -
112 -But hardware formats did not have the YUV flag set (anymore?), and code
113 -shouldn't attempt to check the flag in this way anyway. Drop the check,
114 -and always copy the whole color metadata struct. There is a call to
115 -mp_image_params_guess_csp() below, which tries to unset nonsense
116 -metadata if it was copied from a YUV format to RGB. This function would
117 -also do the right thing for hw formats (although for the cited bug only
118 -the software case matters).
119 -
120 -Fixes #4804.
121 -
122 -diff --git a/video/mp_image.c b/video/mp_image.c
123 -index 7180e2be5..5aa564775 100644
124 ---- a/video/mp_image.c
125 -+++ b/video/mp_image.c
126 -@@ -525,15 +525,8 @@ void mp_image_copy_attributes(struct mp_image *dst, struct mp_image *src)
127 - dst->params.p_w = src->params.p_w;
128 - dst->params.p_h = src->params.p_h;
129 - }
130 -- dst->params.color.primaries = src->params.color.primaries;
131 -- dst->params.color.gamma = src->params.color.gamma;
132 -- dst->params.color.sig_peak = src->params.color.sig_peak;
133 -- dst->params.color.light = src->params.color.light;
134 -- if ((dst->fmt.flags & MP_IMGFLAG_YUV) == (src->fmt.flags & MP_IMGFLAG_YUV)) {
135 -- dst->params.color.space = src->params.color.space;
136 -- dst->params.color.levels = src->params.color.levels;
137 -- dst->params.chroma_location = src->params.chroma_location;
138 -- }
139 -+ dst->params.color = src->params.color;
140 -+ dst->params.chroma_location = src->params.chroma_location;
141 - dst->params.spherical = src->params.spherical;
142 - mp_image_params_guess_csp(&dst->params); // ensure colorspace consistency
143 - if ((dst->fmt.flags & MP_IMGFLAG_PAL) && (src->fmt.flags & MP_IMGFLAG_PAL)) {
144
145 diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch
146 deleted file mode 100644
147 index 3f2a5d1f56a..00000000000
148 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-remove-duplicate-android-option.patch
149 +++ /dev/null
150 @@ -1,27 +0,0 @@
151 -commit 8810c1fc050347e1bef0d3eb89edd30c8e840648
152 -Author: Ilya Tumaykin <itumaykin@×××××.com>
153 -Date: Sun Sep 17 21:54:37 2017 +0300
154 -
155 -build: remove duplicate android option after 72a8120da
156 -
157 -The first one (line 140) comes from 69650851f8 and is the correct one.
158 -The second one (line 731) comes from 72a8120daa and slipped in with the
159 -revert commit.
160 -
161 -Remove the second one.
162 -
163 -diff --git a/wscript b/wscript
164 -index 9d885884d..9fe5b0bc8 100644
165 ---- a/wscript
166 -+++ b/wscript
167 -@@ -727,10 +727,6 @@ video_output_features = [
168 - 'desc': 'Direct3D support',
169 - 'deps': [ 'win32-desktop' ],
170 - 'func': check_cc(header_name='d3d9.h'),
171 -- }, {
172 -- 'name': '--android',
173 -- 'desc': 'Android support',
174 -- 'func': check_statement('android/api-level.h', '(void)__ANDROID__'), # arbitrary android-specific header
175 - }, {
176 - # We need MMAL/bcm_host/dispmanx APIs. Also, most RPI distros require
177 - # every project to hardcode the paths to the include directories. Also,
178
179 diff --git a/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch
180 deleted file mode 100644
181 index 8ae7f537682..00000000000
182 --- a/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch
183 +++ /dev/null
184 @@ -1,86 +0,0 @@
185 -commit 2ecf240b1cd20875991a5b18efafbe799864ff7f
186 -Author: Mark Thompson <sw@×××××.net>
187 -Date: Mon Oct 9 20:10:26 2017 +0100
188 -
189 -vaapi: Use libva2 message callbacks
190 -
191 -They are no longer global, so they work vaguely sensibly.
192 -
193 -diff --git a/video/vaapi.c b/video/vaapi.c
194 -index 6bedbbaa18..3b1cb9cc41 100644
195 ---- a/video/vaapi.c
196 -+++ b/video/vaapi.c
197 -@@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp)
198 - return 0;
199 - }
200 -
201 --// VA message callbacks are global and do not have a context parameter, so it's
202 --// impossible to know from which VADisplay they originate. Try to route them
203 --// to existing mpv/libmpv instances within this process.
204 -+#if VA_CHECK_VERSION(1, 0, 0)
205 -+static void va_message_callback(void *context, const char *msg, int mp_level)
206 -+{
207 -+ struct mp_vaapi_ctx *res = context;
208 -+ mp_msg(res->log, mp_level, "libva: %s", msg);
209 -+}
210 -+
211 -+static void va_error_callback(void *context, const char *msg)
212 -+{
213 -+ va_message_callback(context, msg, MSGL_ERR);
214 -+}
215 -+
216 -+static void va_info_callback(void *context, const char *msg)
217 -+{
218 -+ va_message_callback(context, msg, MSGL_V);
219 -+}
220 -+#else
221 -+// Pre-libva2 VA message callbacks are global and do not have a context
222 -+// parameter, so it's impossible to know from which VADisplay they
223 -+// originate. Try to route them to existing mpv/libmpv instances within
224 -+// this process.
225 - static pthread_mutex_t va_log_mutex = PTHREAD_MUTEX_INITIALIZER;
226 - static struct mp_vaapi_ctx **va_mpv_clients;
227 - static int num_va_mpv_clients;
228 -@@ -77,6 +95,7 @@ static void va_info_callback(const char *msg)
229 - {
230 - va_message_callback(msg, MSGL_V);
231 - }
232 -+#endif
233 -
234 - static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx)
235 - {
236 -@@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
237 - },
238 - };
239 -
240 -+#if VA_CHECK_VERSION(1, 0, 0)
241 -+ vaSetErrorCallback(display, va_error_callback, res);
242 -+ vaSetInfoCallback(display, va_info_callback, res);
243 -+#else
244 - pthread_mutex_lock(&va_log_mutex);
245 - MP_TARRAY_APPEND(NULL, va_mpv_clients, num_va_mpv_clients, res);
246 - pthread_mutex_unlock(&va_log_mutex);
247 -@@ -117,6 +140,7 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog,
248 - #ifdef VA_FOURCC_I010
249 - vaSetErrorCallback(va_error_callback);
250 - vaSetInfoCallback(va_info_callback);
251 -+#endif
252 - #endif
253 -
254 - int major, minor;
255 -@@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
256 - if (ctx->destroy_native_ctx)
257 - ctx->destroy_native_ctx(ctx->native_ctx);
258 -
259 -+#if !VA_CHECK_VERSION(1, 0, 0)
260 - pthread_mutex_lock(&va_log_mutex);
261 - for (int n = 0; n < num_va_mpv_clients; n++) {
262 - if (va_mpv_clients[n] == ctx) {
263 -@@ -164,6 +189,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx)
264 - if (num_va_mpv_clients == 0)
265 - TA_FREEP(&va_mpv_clients); // avoid triggering leak detectors
266 - pthread_mutex_unlock(&va_log_mutex);
267 -+#endif
268 -
269 - talloc_free(ctx);
270 - }
271
272 diff --git a/media-video/mpv/mpv-0.26.0.ebuild b/media-video/mpv/mpv-0.26.0.ebuild
273 deleted file mode 100644
274 index c3ff2f124af..00000000000
275 --- a/media-video/mpv/mpv-0.26.0.ebuild
276 +++ /dev/null
277 @@ -1,374 +0,0 @@
278 -# Copyright 1999-2018 Gentoo Foundation
279 -# Distributed under the terms of the GNU General Public License v2
280 -
281 -EAPI=6
282 -
283 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
284 -PYTHON_REQ_USE='threads(+)'
285 -
286 -WAF_PV=1.9.8
287 -
288 -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
289 -
290 -DESCRIPTION="Media player based on MPlayer and mplayer2"
291 -HOMEPAGE="https://mpv.io/"
292 -
293 -if [[ ${PV} != *9999* ]]; then
294 - SRC_URI="https://github.com/mpv-player/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
295 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
296 - DOCS=( RELEASE_NOTES )
297 -else
298 - EGIT_REPO_URI="https://github.com/mpv-player/${PN}.git"
299 - inherit git-r3
300 -fi
301 -SRC_URI+=" https://waf.io/waf-${WAF_PV}"
302 -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
303 -
304 -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
305 -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
306 -SLOT="0"
307 -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
308 - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
309 - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
310 - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
311 - zsh-completion"
312 -
313 -REQUIRED_USE="
314 - || ( cli libmpv )
315 - aqua? ( opengl )
316 - cuda? ( !libav opengl )
317 - egl? ( || ( gbm X wayland ) )
318 - gbm? ( drm egl opengl )
319 - lcms? ( opengl )
320 - luajit? ( lua )
321 - opengl? ( || ( aqua egl X raspberry-pi !cli ) )
322 - raspberry-pi? ( opengl )
323 - test? ( opengl )
324 - tools? ( cli )
325 - uchardet? ( iconv )
326 - v4l? ( || ( alsa oss ) )
327 - vaapi? ( || ( gbm X wayland ) )
328 - vdpau? ( X )
329 - wayland? ( egl )
330 - X? ( egl? ( opengl ) )
331 - xv? ( X )
332 - zsh-completion? ( cli )
333 - ${PYTHON_REQUIRED_USE}
334 -"
335 -
336 -COMMON_DEPEND="
337 - !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
338 - libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
339 - alsa? ( >=media-libs/alsa-lib-1.0.18 )
340 - archive? ( >=app-arch/libarchive-3.0.0:= )
341 - bluray? ( >=media-libs/libbluray-0.3.0:= )
342 - cdda? ( dev-libs/libcdio-paranoia )
343 - cuda? ( >=media-video/ffmpeg-3.3:0 )
344 - drm? ( x11-libs/libdrm )
345 - dvd? (
346 - >=media-libs/libdvdnav-4.2.0
347 - >=media-libs/libdvdread-4.1.0
348 - )
349 - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
350 - iconv? (
351 - virtual/libiconv
352 - uchardet? ( app-i18n/uchardet )
353 - )
354 - jack? ( virtual/jack )
355 - javascript? ( >=dev-lang/mujs-1.0.0 )
356 - jpeg? ( virtual/jpeg:0 )
357 - lcms? ( >=media-libs/lcms-2.6:2 )
358 - libass? (
359 - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
360 - virtual/ttf-fonts
361 - )
362 - libcaca? ( >=media-libs/libcaca-0.99_beta18 )
363 - lua? (
364 - !luajit? ( <dev-lang/lua-5.3:= )
365 - luajit? ( dev-lang/luajit:2 )
366 - )
367 - openal? ( >=media-libs/openal-1.13 )
368 - pulseaudio? ( media-sound/pulseaudio )
369 - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
370 - rubberband? ( >=media-libs/rubberband-1.8.0 )
371 - samba? ( net-fs/samba )
372 - sdl? ( media-libs/libsdl2[sound,threads,video] )
373 - v4l? ( media-libs/libv4l )
374 - vaapi? (
375 - !libav? ( >=media-video/ffmpeg-3.3:0 )
376 - libav? ( >=media-video/libav-13:0 )
377 - x11-libs/libva[drm?,X?,wayland?]
378 - )
379 - vdpau? (
380 - !libav? ( >=media-video/ffmpeg-3.3:0 )
381 - libav? ( >=media-video/libav-13:0 )
382 - x11-libs/libvdpau
383 - )
384 - wayland? (
385 - >=dev-libs/wayland-1.6.0
386 - >=x11-libs/libxkbcommon-0.3.0
387 - )
388 - X? (
389 - x11-libs/libX11
390 - x11-libs/libXScrnSaver
391 - x11-libs/libXext
392 - x11-libs/libXinerama
393 - x11-libs/libXrandr
394 - opengl? (
395 - x11-libs/libXdamage
396 - virtual/opengl
397 - )
398 - xv? ( x11-libs/libXv )
399 - )
400 - zlib? ( sys-libs/zlib )
401 -"
402 -DEPEND="${COMMON_DEPEND}
403 - ${PYTHON_DEPS}
404 - dev-python/docutils
405 - virtual/pkgconfig
406 - doc? ( dev-python/rst2pdf )
407 - dvb? ( virtual/linuxtv-dvb-headers )
408 - test? ( >=dev-util/cmocka-1.0.0 )
409 - v4l? ( virtual/os-headers )
410 - zsh-completion? ( dev-lang/perl )
411 -"
412 -RDEPEND="${COMMON_DEPEND}
413 - cuda? ( x11-drivers/nvidia-drivers[X] )
414 - selinux? ( sec-policy/selinux-mplayer )
415 - tools? ( ${PYTHON_DEPS} )
416 -"
417 -
418 -PATCHES=(
419 - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
420 - "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
421 - "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
422 -)
423 -
424 -pkg_setup() {
425 - [[ ${MERGE_TYPE} != "binary" ]] && python_setup
426 -}
427 -
428 -src_prepare() {
429 - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
430 - chmod +x "${S}"/waf || die
431 - default_src_prepare
432 -}
433 -
434 -src_configure() {
435 - tc-export CC PKG_CONFIG AR
436 -
437 - if tc-is-cross-compiler && use raspberry-pi; then
438 - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
439 - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
440 - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
441 - fi
442 -
443 - local mywafargs=(
444 - --confdir="${EPREFIX}/etc/${PN}"
445 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
446 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
447 -
448 - $(usex cli '' '--disable-cplayer')
449 - $(use_enable libmpv libmpv-shared)
450 -
451 - --disable-libmpv-static
452 - --disable-static-build
453 - # See deep down below for build-date.
454 - --disable-optimize # Don't add '-O2' to CFLAGS.
455 - --disable-debug-build # Don't add '-g' to CFLAGS.
456 - --enable-html-build
457 -
458 - $(use_enable doc pdf-build)
459 - $(use_enable cplugins)
460 - $(use_enable zsh-completion zsh-comp)
461 - $(use_enable test)
462 -
463 - $(use_enable iconv)
464 - $(use_enable samba libsmbclient)
465 - $(use_enable lua)
466 - $(usex luajit '--lua=luajit' '')
467 - $(use_enable javascript)
468 - $(use_enable libass)
469 - $(use_enable libass libass-osd)
470 - $(use_enable zlib)
471 - $(use_enable encode encoding)
472 - $(use_enable bluray libbluray)
473 - $(use_enable dvd dvdread)
474 - $(use_enable dvd dvdnav)
475 - $(use_enable cdda)
476 - $(use_enable uchardet)
477 - $(use_enable rubberband)
478 - $(use_enable lcms lcms2)
479 - --disable-vapoursynth # Only available in overlays.
480 - --disable-vapoursynth-lazy
481 - $(use_enable archive libarchive)
482 -
483 - --enable-libavdevice
484 -
485 - # Audio outputs:
486 - $(use_enable sdl sdl2) # Listed under audio, but also includes video.
487 - --disable-sdl1
488 - $(use_enable oss oss-audio)
489 - --disable-rsound # Only available in overlays.
490 - --disable-sndio # Only available in overlays.
491 - $(use_enable pulseaudio pulse)
492 - $(use_enable jack)
493 - $(use_enable openal)
494 - --disable-opensles
495 - $(use_enable alsa)
496 - $(use_enable coreaudio)
497 -
498 - # Video outputs:
499 - $(use_enable aqua cocoa)
500 - $(use_enable drm)
501 - $(use_enable gbm)
502 - $(use_enable wayland)
503 - $(use_enable X x11)
504 - $(use_enable xv)
505 - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
506 - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
507 - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
508 - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
509 - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
510 - $(use_enable vdpau)
511 - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
512 - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
513 - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
514 - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
515 - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
516 - $(use_enable libcaca caca)
517 - $(use_enable jpeg)
518 - --disable-android
519 - $(use_enable raspberry-pi rpi)
520 - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
521 - --disable-mali-fbdev # Only available in overlays.
522 - $(usex opengl '' '--disable-gl')
523 -
524 - # HWaccels:
525 - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
526 - $(use_enable vaapi vaapi-hwaccel)
527 - $(use_enable vdpau vdpau-hwaccel)
528 - $(use_enable cuda cuda-hwaccel)
529 -
530 - # TV features:
531 - $(use_enable v4l tv)
532 - $(use_enable v4l tv-v4l2)
533 - $(use_enable v4l libv4l2)
534 - $(use_enable v4l audio-input)
535 - $(use_enable dvb dvbin)
536 -
537 - # Miscellaneous features:
538 - --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
539 - )
540 -
541 - if use vaapi && use X; then
542 - mywafargs+=(
543 - $(use_enable opengl vaapi-glx)
544 - $(use_enable egl vaapi-x-egl)
545 - )
546 - fi
547 -
548 - # Create reproducible non-live builds.
549 - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
550 -
551 - waf-utils_src_configure "${mywafargs[@]}"
552 -}
553 -
554 -src_install() {
555 - waf-utils_src_install
556 -
557 - if use lua; then
558 - insinto /usr/share/${PN}
559 - doins -r TOOLS/lua
560 - fi
561 -
562 - if use cli && use luajit; then
563 - pax-mark -m "${ED}"usr/bin/${PN}
564 - fi
565 -
566 - if use tools; then
567 - dobin TOOLS/{mpv_identify.sh,umpv}
568 - newbin TOOLS/idet.sh mpv_idet.sh
569 - python_replicate_script "${ED}"usr/bin/umpv
570 - fi
571 -}
572 -
573 -pkg_preinst() {
574 - gnome2_icon_savelist
575 -}
576 -
577 -pkg_postinst() {
578 - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
579 -
580 - for rv in ${REPLACING_VERSIONS}; do
581 - version_compare ${rv} 0.18.1
582 - [[ $? -eq 1 ]] && softvol_0_18_1=1
583 - version_compare ${rv} 0.21.0
584 - [[ $? -eq 1 ]] && osc_0_21_0=1
585 - version_compare ${rv} 0.24.0
586 - [[ $? -eq 1 ]] && txtsubs_0_24_0=1
587 - version_compare ${rv} 0.25.0
588 - [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
589 - done
590 -
591 - if [[ ${softvol_0_18_1} -eq 1 ]]; then
592 - elog "Since version 0.18.1 the software volume control is always enabled."
593 - elog "This means that volume controls don't change the system volume,"
594 - elog "e.g. per-application volume with PulseAudio."
595 - elog "If you want to restore the previous behaviour, please refer to"
596 - elog
597 - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
598 - elog
599 - fi
600 -
601 - if [[ ${osc_0_21_0} -eq 1 ]]; then
602 - elog "In version 0.21.0 the default OSC layout was changed."
603 - elog "If you want to restore the previous layout, please refer to"
604 - elog
605 - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
606 - elog
607 - fi
608 -
609 - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
610 - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
611 - elog "If you want to restore the previous behaviour, please refer to"
612 - elog
613 - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
614 - elog
615 - fi
616 -
617 - if [[ ${opengl_0_25_0} -eq 1 ]]; then
618 - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
619 - elog "the 'opengl' video output and no longer explicitly requires"
620 - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
621 - fi
622 -
623 - if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
624 - elog "If you want to have command-line completion via bash-completion,"
625 - elog "please install app-shells/mpv-bash-completion."
626 - fi
627 -
628 - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
629 - has_version 'app-shells/mpv-bash-completion'; then
630 - elog "If command-line completion doesn't work after mpv update,"
631 - elog "please rebuild app-shells/mpv-bash-completion."
632 - fi
633 -
634 - gnome2_icon_cache_update
635 - xdg_desktop_database_update
636 -}
637 -
638 -pkg_postrm() {
639 - gnome2_icon_cache_update
640 - xdg_desktop_database_update
641 -}
642 -
643 -src_test() {
644 - cd "${S}"/build/test || die
645 - local test
646 - for test in *; do
647 - if [[ -x ${test} ]]; then
648 - ./"${test}" || die "Test suite failed"
649 - fi
650 - done
651 -}
652
653 diff --git a/media-video/mpv/mpv-0.27.0-r1.ebuild b/media-video/mpv/mpv-0.27.0-r1.ebuild
654 deleted file mode 100644
655 index 558adb5ce72..00000000000
656 --- a/media-video/mpv/mpv-0.27.0-r1.ebuild
657 +++ /dev/null
658 @@ -1,371 +0,0 @@
659 -# Copyright 1999-2018 Gentoo Foundation
660 -# Distributed under the terms of the GNU General Public License v2
661 -
662 -EAPI=6
663 -
664 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
665 -PYTHON_REQ_USE='threads(+)'
666 -
667 -WAF_PV=1.9.8
668 -
669 -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
670 -
671 -DESCRIPTION="Media player based on MPlayer and mplayer2"
672 -HOMEPAGE="https://mpv.io/"
673 -
674 -if [[ ${PV} != *9999* ]]; then
675 - SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
676 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
677 - DOCS=( RELEASE_NOTES )
678 -else
679 - EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
680 - inherit git-r3
681 -fi
682 -SRC_URI+=" https://waf.io/waf-${WAF_PV}"
683 -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
684 -
685 -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
686 -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
687 -SLOT="0"
688 -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
689 - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
690 - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
691 - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
692 - zsh-completion"
693 -
694 -REQUIRED_USE="
695 - || ( cli libmpv )
696 - aqua? ( opengl )
697 - cuda? ( !libav opengl )
698 - egl? ( || ( gbm X wayland ) )
699 - gbm? ( drm egl opengl )
700 - lcms? ( opengl )
701 - luajit? ( lua )
702 - opengl? ( || ( aqua egl X raspberry-pi !cli ) )
703 - raspberry-pi? ( opengl )
704 - test? ( opengl )
705 - tools? ( cli )
706 - uchardet? ( iconv )
707 - v4l? ( || ( alsa oss ) )
708 - vaapi? ( || ( gbm X wayland ) )
709 - vdpau? ( X )
710 - wayland? ( egl )
711 - X? ( egl? ( opengl ) )
712 - xv? ( X )
713 - zsh-completion? ( cli )
714 - ${PYTHON_REQUIRED_USE}
715 -"
716 -
717 -COMMON_DEPEND="
718 - !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
719 - libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
720 - alsa? ( >=media-libs/alsa-lib-1.0.18 )
721 - archive? ( >=app-arch/libarchive-3.0.0:= )
722 - bluray? ( >=media-libs/libbluray-0.3.0:= )
723 - cdda? ( dev-libs/libcdio-paranoia )
724 - cuda? ( >=media-video/ffmpeg-3.3:0 )
725 - drm? ( x11-libs/libdrm )
726 - dvd? (
727 - >=media-libs/libdvdnav-4.2.0
728 - >=media-libs/libdvdread-4.1.0
729 - )
730 - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
731 - iconv? (
732 - virtual/libiconv
733 - uchardet? ( app-i18n/uchardet )
734 - )
735 - jack? ( virtual/jack )
736 - javascript? ( >=dev-lang/mujs-1.0.0 )
737 - jpeg? ( virtual/jpeg:0 )
738 - lcms? ( >=media-libs/lcms-2.6:2 )
739 - libass? (
740 - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
741 - virtual/ttf-fonts
742 - )
743 - libcaca? ( >=media-libs/libcaca-0.99_beta18 )
744 - lua? (
745 - !luajit? ( <dev-lang/lua-5.3:= )
746 - luajit? ( dev-lang/luajit:2 )
747 - )
748 - openal? ( >=media-libs/openal-1.13 )
749 - pulseaudio? ( media-sound/pulseaudio )
750 - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
751 - rubberband? ( >=media-libs/rubberband-1.8.0 )
752 - samba? ( net-fs/samba )
753 - sdl? ( media-libs/libsdl2[sound,threads,video] )
754 - v4l? ( media-libs/libv4l )
755 - vaapi? (
756 - !libav? ( >=media-video/ffmpeg-3.3:0 )
757 - libav? ( >=media-video/libav-13:0 )
758 - x11-libs/libva:=[drm?,X?,wayland?]
759 - )
760 - vdpau? (
761 - !libav? ( >=media-video/ffmpeg-3.3:0 )
762 - libav? ( >=media-video/libav-13:0 )
763 - x11-libs/libvdpau
764 - )
765 - wayland? (
766 - >=dev-libs/wayland-1.6.0
767 - >=x11-libs/libxkbcommon-0.3.0
768 - )
769 - X? (
770 - x11-libs/libX11
771 - x11-libs/libXScrnSaver
772 - x11-libs/libXext
773 - x11-libs/libXinerama
774 - x11-libs/libXrandr
775 - opengl? (
776 - x11-libs/libXdamage
777 - virtual/opengl
778 - )
779 - xv? ( x11-libs/libXv )
780 - )
781 - zlib? ( sys-libs/zlib )
782 -"
783 -DEPEND="${COMMON_DEPEND}
784 - ${PYTHON_DEPS}
785 - dev-python/docutils
786 - virtual/pkgconfig
787 - doc? ( dev-python/rst2pdf )
788 - dvb? ( virtual/linuxtv-dvb-headers )
789 - test? ( >=dev-util/cmocka-1.0.0 )
790 - v4l? ( virtual/os-headers )
791 - zsh-completion? ( dev-lang/perl )
792 -"
793 -RDEPEND="${COMMON_DEPEND}
794 - cuda? ( x11-drivers/nvidia-drivers[X] )
795 - selinux? ( sec-policy/selinux-mplayer )
796 - tools? ( ${PYTHON_DEPS} )
797 -"
798 -
799 -PATCHES=(
800 - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
801 - "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
802 - "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
803 -)
804 -
805 -pkg_setup() {
806 - [[ ${MERGE_TYPE} != "binary" ]] && python_setup
807 -}
808 -
809 -src_prepare() {
810 - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
811 - chmod +x "${S}"/waf || die
812 - eapply "${FILESDIR}/${PV}"
813 - default_src_prepare
814 -}
815 -
816 -src_configure() {
817 - tc-export CC PKG_CONFIG AR
818 -
819 - if tc-is-cross-compiler && use raspberry-pi; then
820 - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
821 - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
822 - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
823 - fi
824 -
825 - local mywafargs=(
826 - --confdir="${EPREFIX}/etc/${PN}"
827 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
828 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
829 -
830 - $(usex cli '' '--disable-cplayer')
831 - $(use_enable libmpv libmpv-shared)
832 -
833 - --disable-libmpv-static
834 - --disable-static-build
835 - # See deep down below for build-date.
836 - --disable-optimize # Don't add '-O2' to CFLAGS.
837 - --disable-debug-build # Don't add '-g' to CFLAGS.
838 - --enable-html-build
839 -
840 - $(use_enable doc pdf-build)
841 - $(use_enable cplugins)
842 - $(use_enable zsh-completion zsh-comp)
843 - $(use_enable test)
844 -
845 - --disable-android
846 - $(use_enable iconv)
847 - $(use_enable samba libsmbclient)
848 - $(use_enable lua)
849 - $(usex luajit '--lua=luajit' '')
850 - $(use_enable javascript)
851 - $(use_enable libass)
852 - $(use_enable libass libass-osd)
853 - $(use_enable zlib)
854 - $(use_enable encode encoding)
855 - $(use_enable bluray libbluray)
856 - $(use_enable dvd dvdread)
857 - $(use_enable dvd dvdnav)
858 - $(use_enable cdda)
859 - $(use_enable uchardet)
860 - $(use_enable rubberband)
861 - $(use_enable lcms lcms2)
862 - --disable-vapoursynth # Only available in overlays.
863 - --disable-vapoursynth-lazy
864 - $(use_enable archive libarchive)
865 -
866 - --enable-libavdevice
867 -
868 - # Audio outputs:
869 - $(use_enable sdl sdl2) # Listed under audio, but also includes video.
870 - --disable-sdl1
871 - $(use_enable oss oss-audio)
872 - --disable-rsound # Only available in overlays.
873 - --disable-sndio # Only available in overlays.
874 - $(use_enable pulseaudio pulse)
875 - $(use_enable jack)
876 - $(use_enable openal)
877 - --disable-opensles
878 - $(use_enable alsa)
879 - $(use_enable coreaudio)
880 -
881 - # Video outputs:
882 - $(use_enable aqua cocoa)
883 - $(use_enable drm)
884 - $(use_enable gbm)
885 - $(use_enable wayland)
886 - $(use_enable X x11)
887 - $(use_enable xv)
888 - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
889 - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
890 - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
891 - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
892 - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
893 - $(use_enable vdpau)
894 - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
895 - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
896 - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
897 - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
898 - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
899 - $(use_enable libcaca caca)
900 - $(use_enable jpeg)
901 - $(use_enable raspberry-pi rpi)
902 - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
903 - --disable-mali-fbdev # Only available in overlays.
904 - $(usex opengl '' '--disable-gl')
905 -
906 - # HWaccels:
907 - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
908 - $(use_enable vaapi vaapi-hwaccel)
909 - $(use_enable vdpau vdpau-hwaccel)
910 - $(use_enable cuda cuda-hwaccel)
911 -
912 - # TV features:
913 - $(use_enable v4l tv)
914 - $(use_enable v4l tv-v4l2)
915 - $(use_enable v4l libv4l2)
916 - $(use_enable v4l audio-input)
917 - $(use_enable dvb dvbin)
918 -
919 - # Miscellaneous features:
920 - --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
921 - )
922 -
923 - if use vaapi && use X; then
924 - mywafargs+=(
925 - $(use_enable opengl vaapi-glx)
926 - $(use_enable egl vaapi-x-egl)
927 - )
928 - fi
929 -
930 - # Create reproducible non-live builds.
931 - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
932 -
933 - waf-utils_src_configure "${mywafargs[@]}"
934 -}
935 -
936 -src_install() {
937 - waf-utils_src_install
938 -
939 - if use lua; then
940 - insinto /usr/share/${PN}
941 - doins -r TOOLS/lua
942 - fi
943 -
944 - if use cli && use luajit; then
945 - pax-mark -m "${ED}"usr/bin/${PN}
946 - fi
947 -
948 - if use tools; then
949 - dobin TOOLS/{mpv_identify.sh,umpv}
950 - newbin TOOLS/idet.sh mpv_idet.sh
951 - python_replicate_script "${ED}"usr/bin/umpv
952 - fi
953 -}
954 -
955 -pkg_postinst() {
956 - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
957 -
958 - for rv in ${REPLACING_VERSIONS}; do
959 - version_compare ${rv} 0.18.1
960 - [[ $? -eq 1 ]] && softvol_0_18_1=1
961 - version_compare ${rv} 0.21.0
962 - [[ $? -eq 1 ]] && osc_0_21_0=1
963 - version_compare ${rv} 0.24.0
964 - [[ $? -eq 1 ]] && txtsubs_0_24_0=1
965 - version_compare ${rv} 0.25.0
966 - [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
967 - done
968 -
969 - if [[ ${softvol_0_18_1} -eq 1 ]]; then
970 - elog "Since version 0.18.1 the software volume control is always enabled."
971 - elog "This means that volume controls don't change the system volume,"
972 - elog "e.g. per-application volume with PulseAudio."
973 - elog "If you want to restore the previous behaviour, please refer to"
974 - elog
975 - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
976 - elog
977 - fi
978 -
979 - if [[ ${osc_0_21_0} -eq 1 ]]; then
980 - elog "In version 0.21.0 the default OSC layout was changed."
981 - elog "If you want to restore the previous layout, please refer to"
982 - elog
983 - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
984 - elog
985 - fi
986 -
987 - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
988 - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
989 - elog "If you want to restore the previous behaviour, please refer to"
990 - elog
991 - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
992 - elog
993 - fi
994 -
995 - if [[ ${opengl_0_25_0} -eq 1 ]]; then
996 - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
997 - elog "the 'opengl' video output and no longer explicitly requires"
998 - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
999 - fi
1000 -
1001 - if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
1002 - elog "If you want to have command-line completion via bash-completion,"
1003 - elog "please install app-shells/mpv-bash-completion."
1004 - fi
1005 -
1006 - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
1007 - has_version 'app-shells/mpv-bash-completion'; then
1008 - elog "If command-line completion doesn't work after mpv update,"
1009 - elog "please rebuild app-shells/mpv-bash-completion."
1010 - fi
1011 -
1012 - gnome2_icon_cache_update
1013 - xdg_desktop_database_update
1014 -}
1015 -
1016 -pkg_postrm() {
1017 - gnome2_icon_cache_update
1018 - xdg_desktop_database_update
1019 -}
1020 -
1021 -src_test() {
1022 - cd "${S}"/build/test || die
1023 - local test
1024 - for test in *; do
1025 - if [[ -x ${test} ]]; then
1026 - ./"${test}" || die "Test suite failed"
1027 - fi
1028 - done
1029 -}
1030
1031 diff --git a/media-video/mpv/mpv-0.28.0.ebuild b/media-video/mpv/mpv-0.28.0.ebuild
1032 deleted file mode 100644
1033 index 23b6694770d..00000000000
1034 --- a/media-video/mpv/mpv-0.28.0.ebuild
1035 +++ /dev/null
1036 @@ -1,361 +0,0 @@
1037 -# Copyright 1999-2018 Gentoo Foundation
1038 -# Distributed under the terms of the GNU General Public License v2
1039 -
1040 -EAPI=6
1041 -
1042 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
1043 -PYTHON_REQ_USE='threads(+)'
1044 -
1045 -WAF_PV=1.9.8
1046 -
1047 -inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
1048 -
1049 -DESCRIPTION="Media player based on MPlayer and mplayer2"
1050 -HOMEPAGE="https://mpv.io/"
1051 -
1052 -if [[ ${PV} != *9999* ]]; then
1053 - SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
1054 - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
1055 - DOCS=( RELEASE_NOTES )
1056 -else
1057 - EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
1058 - inherit git-r3
1059 -fi
1060 -SRC_URI+=" https://waf.io/waf-${WAF_PV}"
1061 -DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
1062 -
1063 -# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
1064 -LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
1065 -SLOT="0"
1066 -IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
1067 - dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
1068 - libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
1069 - samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
1070 - zsh-completion"
1071 -
1072 -REQUIRED_USE="
1073 - || ( cli libmpv )
1074 - aqua? ( opengl )
1075 - cuda? ( !libav opengl )
1076 - egl? ( || ( gbm X wayland ) )
1077 - gbm? ( drm egl opengl )
1078 - lcms? ( opengl )
1079 - luajit? ( lua )
1080 - opengl? ( || ( aqua egl X raspberry-pi !cli ) )
1081 - raspberry-pi? ( opengl )
1082 - test? ( opengl )
1083 - tools? ( cli )
1084 - uchardet? ( iconv )
1085 - v4l? ( || ( alsa oss ) )
1086 - vaapi? ( || ( gbm X wayland ) )
1087 - vdpau? ( X )
1088 - wayland? ( egl )
1089 - X? ( egl? ( opengl ) )
1090 - xv? ( X )
1091 - zsh-completion? ( cli )
1092 - ${PYTHON_REQUIRED_USE}
1093 -"
1094 -
1095 -COMMON_DEPEND="
1096 - !libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] )
1097 - libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] )
1098 - alsa? ( >=media-libs/alsa-lib-1.0.18 )
1099 - archive? ( >=app-arch/libarchive-3.0.0:= )
1100 - bluray? ( >=media-libs/libbluray-0.3.0:= )
1101 - cdda? ( dev-libs/libcdio-paranoia )
1102 - drm? ( x11-libs/libdrm )
1103 - dvd? (
1104 - >=media-libs/libdvdnav-4.2.0
1105 - >=media-libs/libdvdread-4.1.0
1106 - )
1107 - egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
1108 - iconv? (
1109 - virtual/libiconv
1110 - uchardet? ( app-i18n/uchardet )
1111 - )
1112 - jack? ( virtual/jack )
1113 - javascript? ( >=dev-lang/mujs-1.0.0 )
1114 - jpeg? ( virtual/jpeg:0 )
1115 - lcms? ( >=media-libs/lcms-2.6:2 )
1116 - libass? (
1117 - >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
1118 - virtual/ttf-fonts
1119 - )
1120 - libcaca? ( >=media-libs/libcaca-0.99_beta18 )
1121 - lua? (
1122 - !luajit? ( <dev-lang/lua-5.3:= )
1123 - luajit? ( dev-lang/luajit:2 )
1124 - )
1125 - openal? ( >=media-libs/openal-1.13 )
1126 - pulseaudio? ( media-sound/pulseaudio )
1127 - raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
1128 - rubberband? ( >=media-libs/rubberband-1.8.0 )
1129 - samba? ( net-fs/samba )
1130 - sdl? ( media-libs/libsdl2[sound,threads,video] )
1131 - v4l? ( media-libs/libv4l )
1132 - vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
1133 - vdpau? ( x11-libs/libvdpau )
1134 - wayland? (
1135 - >=dev-libs/wayland-1.6.0
1136 - >=x11-libs/libxkbcommon-0.3.0
1137 - dev-libs/wayland-protocols
1138 - )
1139 - X? (
1140 - x11-libs/libX11
1141 - x11-libs/libXScrnSaver
1142 - x11-libs/libXext
1143 - x11-libs/libXinerama
1144 - x11-libs/libXrandr
1145 - opengl? (
1146 - x11-libs/libXdamage
1147 - virtual/opengl
1148 - )
1149 - xv? ( x11-libs/libXv )
1150 - )
1151 - zlib? ( sys-libs/zlib )
1152 -"
1153 -DEPEND="${COMMON_DEPEND}
1154 - ${PYTHON_DEPS}
1155 - dev-python/docutils
1156 - virtual/pkgconfig
1157 - doc? ( dev-python/rst2pdf )
1158 - dvb? ( virtual/linuxtv-dvb-headers )
1159 - test? ( >=dev-util/cmocka-1.0.0 )
1160 - v4l? ( virtual/os-headers )
1161 - zsh-completion? ( dev-lang/perl )
1162 -"
1163 -RDEPEND="${COMMON_DEPEND}
1164 - cuda? ( x11-drivers/nvidia-drivers[X] )
1165 - selinux? ( sec-policy/selinux-mplayer )
1166 - tools? ( ${PYTHON_DEPS} )
1167 -"
1168 -
1169 -PATCHES=(
1170 - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
1171 - "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
1172 -)
1173 -
1174 -pkg_setup() {
1175 - [[ ${MERGE_TYPE} != "binary" ]] && python_setup
1176 -}
1177 -
1178 -src_prepare() {
1179 - cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
1180 - chmod +x "${S}"/waf || die
1181 - default_src_prepare
1182 -}
1183 -
1184 -src_configure() {
1185 - tc-export CC PKG_CONFIG AR
1186 -
1187 - if tc-is-cross-compiler && use raspberry-pi; then
1188 - export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
1189 - # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
1190 - die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
1191 - fi
1192 -
1193 - local mywafargs=(
1194 - --confdir="${EPREFIX}/etc/${PN}"
1195 - --docdir="${EPREFIX}/usr/share/doc/${PF}"
1196 - --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
1197 -
1198 - $(usex cli '' '--disable-cplayer')
1199 - $(use_enable libmpv libmpv-shared)
1200 -
1201 - --disable-libmpv-static
1202 - --disable-static-build
1203 - # See deep down below for build-date.
1204 - --disable-optimize # Don't add '-O2' to CFLAGS.
1205 - --disable-debug-build # Don't add '-g' to CFLAGS.
1206 - --enable-html-build
1207 -
1208 - $(use_enable doc pdf-build)
1209 - $(use_enable cplugins)
1210 - $(use_enable zsh-completion zsh-comp)
1211 - $(use_enable test)
1212 -
1213 - --disable-android
1214 - $(use_enable iconv)
1215 - $(use_enable samba libsmbclient)
1216 - $(use_enable lua)
1217 - $(usex luajit '--lua=luajit' '')
1218 - $(use_enable javascript)
1219 - $(use_enable libass)
1220 - $(use_enable libass libass-osd)
1221 - $(use_enable zlib)
1222 - $(use_enable encode encoding)
1223 - $(use_enable bluray libbluray)
1224 - $(use_enable dvd dvdread)
1225 - $(use_enable dvd dvdnav)
1226 - $(use_enable cdda)
1227 - $(use_enable uchardet)
1228 - $(use_enable rubberband)
1229 - $(use_enable lcms lcms2)
1230 - --disable-vapoursynth # Only available in overlays.
1231 - --disable-vapoursynth-lazy
1232 - $(use_enable archive libarchive)
1233 -
1234 - --enable-libavdevice
1235 -
1236 - # Audio outputs:
1237 - $(use_enable sdl sdl2) # Listed under audio, but also includes video.
1238 - --disable-sdl1
1239 - $(use_enable oss oss-audio)
1240 - --disable-rsound # Only available in overlays.
1241 - --disable-sndio # Only available in overlays.
1242 - $(use_enable pulseaudio pulse)
1243 - $(use_enable jack)
1244 - $(use_enable openal)
1245 - --disable-opensles
1246 - $(use_enable alsa)
1247 - $(use_enable coreaudio)
1248 -
1249 - # Video outputs:
1250 - $(use_enable aqua cocoa)
1251 - $(use_enable drm)
1252 - $(use_enable gbm)
1253 - $(use_enable wayland wayland-scanner)
1254 - $(use_enable wayland wayland-protocols)
1255 - $(use_enable wayland)
1256 - $(use_enable X x11)
1257 - $(use_enable xv)
1258 - $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
1259 - $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
1260 - $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
1261 - $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
1262 - $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
1263 - $(use_enable vdpau)
1264 - $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
1265 - $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
1266 - $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
1267 - $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
1268 - $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
1269 - $(use_enable libcaca caca)
1270 - $(use_enable jpeg)
1271 - $(use_enable raspberry-pi rpi)
1272 - $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
1273 - --disable-mali-fbdev # Only available in overlays.
1274 - $(usex opengl '' '--disable-gl')
1275 -
1276 - # HWaccels:
1277 - # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
1278 - $(use_enable cuda cuda-hwaccel)
1279 -
1280 - # TV features:
1281 - $(use_enable v4l tv)
1282 - $(use_enable v4l tv-v4l2)
1283 - $(use_enable v4l libv4l2)
1284 - $(use_enable v4l audio-input)
1285 - $(use_enable dvb dvbin)
1286 -
1287 - # Miscellaneous features:
1288 - --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
1289 - )
1290 -
1291 - if use vaapi && use X; then
1292 - mywafargs+=(
1293 - $(use_enable opengl vaapi-glx)
1294 - $(use_enable egl vaapi-x-egl)
1295 - )
1296 - fi
1297 -
1298 - # Create reproducible non-live builds.
1299 - [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
1300 -
1301 - waf-utils_src_configure "${mywafargs[@]}"
1302 -}
1303 -
1304 -src_install() {
1305 - waf-utils_src_install
1306 -
1307 - if use lua; then
1308 - insinto /usr/share/${PN}
1309 - doins -r TOOLS/lua
1310 - fi
1311 -
1312 - if use cli && use luajit; then
1313 - pax-mark -m "${ED}"usr/bin/${PN}
1314 - fi
1315 -
1316 - if use tools; then
1317 - dobin TOOLS/{mpv_identify.sh,umpv}
1318 - newbin TOOLS/idet.sh mpv_idet.sh
1319 - python_replicate_script "${ED}"usr/bin/umpv
1320 - fi
1321 -}
1322 -
1323 -pkg_postinst() {
1324 - local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
1325 -
1326 - for rv in ${REPLACING_VERSIONS}; do
1327 - version_compare ${rv} 0.18.1
1328 - [[ $? -eq 1 ]] && softvol_0_18_1=1
1329 - version_compare ${rv} 0.21.0
1330 - [[ $? -eq 1 ]] && osc_0_21_0=1
1331 - version_compare ${rv} 0.24.0
1332 - [[ $? -eq 1 ]] && txtsubs_0_24_0=1
1333 - version_compare ${rv} 0.25.0
1334 - [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
1335 - done
1336 -
1337 - if [[ ${softvol_0_18_1} -eq 1 ]]; then
1338 - elog "Since version 0.18.1 the software volume control is always enabled."
1339 - elog "This means that volume controls don't change the system volume,"
1340 - elog "e.g. per-application volume with PulseAudio."
1341 - elog "If you want to restore the previous behaviour, please refer to"
1342 - elog
1343 - elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
1344 - elog
1345 - fi
1346 -
1347 - if [[ ${osc_0_21_0} -eq 1 ]]; then
1348 - elog "In version 0.21.0 the default OSC layout was changed."
1349 - elog "If you want to restore the previous layout, please refer to"
1350 - elog
1351 - elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
1352 - elog
1353 - fi
1354 -
1355 - if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
1356 - elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
1357 - elog "If you want to restore the previous behaviour, please refer to"
1358 - elog
1359 - elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
1360 - elog
1361 - fi
1362 -
1363 - if [[ ${opengl_0_25_0} -eq 1 ]]; then
1364 - elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
1365 - elog "the 'opengl' video output and no longer explicitly requires"
1366 - elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
1367 - fi
1368 -
1369 - if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
1370 - elog "If you want to have command-line completion via bash-completion,"
1371 - elog "please install app-shells/mpv-bash-completion."
1372 - fi
1373 -
1374 - if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
1375 - has_version 'app-shells/mpv-bash-completion'; then
1376 - elog "If command-line completion doesn't work after mpv update,"
1377 - elog "please rebuild app-shells/mpv-bash-completion."
1378 - fi
1379 -
1380 - gnome2_icon_cache_update
1381 - xdg_desktop_database_update
1382 -}
1383 -
1384 -pkg_postrm() {
1385 - gnome2_icon_cache_update
1386 - xdg_desktop_database_update
1387 -}
1388 -
1389 -src_test() {
1390 - cd "${S}"/build/test || die
1391 - local test
1392 - for test in *; do
1393 - if [[ -x ${test} ]]; then
1394 - ./"${test}" || die "Test suite failed"
1395 - fi
1396 - done
1397 -}