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-video/mpv/
Date: Thu, 20 Jul 2017 13:24:54
Message-Id: 1500557086.26c9818a33d1fdacf1b820742bc9b2cbed0947e3.polynomial-c@gentoo
1 commit: 26c9818a33d1fdacf1b820742bc9b2cbed0947e3
2 Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 18 21:01:47 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 20 13:24:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c9818a
7
8 media-video/mpv: verbump to 0.26.0
9
10 Closes: https://github.com/gentoo/gentoo/pull/5128
11 Package-Manager: Portage-2.3.6, Repoman-2.3.2
12
13 media-video/mpv/Manifest | 1 +
14 media-video/mpv/mpv-0.26.0.ebuild | 373 ++++++++++++++++++++++++++++++++++++++
15 2 files changed, 374 insertions(+)
16
17 diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
18 index c7c6f01a90e..55ba0d3a8af 100644
19 --- a/media-video/mpv/Manifest
20 +++ b/media-video/mpv/Manifest
21 @@ -1,5 +1,6 @@
22 DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af
23 DIST mpv-0.25.0-patches-r2.tar.xz 11036 SHA256 34440d419e95983f50dc97c323737c19891234478566bdf613ec9db81fb0e0e7 SHA512 fc8d2a23dff27131d2c18d3f91861ec6e6d5240e6531d1a04c06ebef8d5467250c4f131d9faee802842e1ea485dbf350b43a3eebcc13c230cd45ff875fc855e2 WHIRLPOOL 9e1540e8e4b2a2a8e70861dd9eb7f32281549b9c418ea716da697e5de39118b0806998f40958e84d868e00854a4bead929ef9958de0becc120fa5f525b34ccab
24 DIST mpv-0.25.0.tar.gz 2874584 SHA256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf WHIRLPOOL 4c5225040ed8793de5daa00a4bb5cf2754fb877c73055dbe4bed92d9fa1bb3f5e67d341c698658e9f10e183084bbe691c8bbb90960e16358b9ffdaa58b11bf2b
25 +DIST mpv-0.26.0.tar.gz 2916212 SHA256 daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46 SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7 WHIRLPOOL b3648d3f67565c54923fda0c1989dfa94b02b844152a558d531d936c94563ab32654cc59576c39fef8614901fe51afafd2029f9465ec1a15696a093d1bdb563f
26 DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
27 DIST waf-1.9.8 100685 SHA256 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 WHIRLPOOL 447b6936b8bd5904d85001a96bdcfd0d517f92ff0a859f8a63efd032a418c1b335578266d0f7ce0c5f71ffc7b81643d18e21c14981502153e2d586a9ce152c3a
28
29 diff --git a/media-video/mpv/mpv-0.26.0.ebuild b/media-video/mpv/mpv-0.26.0.ebuild
30 new file mode 100644
31 index 00000000000..1ba306adcda
32 --- /dev/null
33 +++ b/media-video/mpv/mpv-0.26.0.ebuild
34 @@ -0,0 +1,373 @@
35 +# Copyright 1999-2017 Gentoo Foundation
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=6
39 +
40 +PYTHON_COMPAT=( python{2_7,3_4,3_5} )
41 +PYTHON_REQ_USE='threads(+)'
42 +
43 +WAF_PV=1.9.8
44 +
45 +inherit gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
46 +
47 +DESCRIPTION="Media player based on MPlayer and mplayer2"
48 +HOMEPAGE="https://mpv.io/"
49 +
50 +if [[ ${PV} != *9999* ]]; then
51 + SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
52 + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
53 + DOCS=( RELEASE_NOTES )
54 +else
55 + EGIT_REPO_URI=( {https,git}://github.com/mpv-player/mpv.git )
56 + inherit git-r3
57 +fi
58 +SRC_URI+=" https://waf.io/waf-${WAF_PV}"
59 +DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
60 +
61 +# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
62 +LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
63 +SLOT="0"
64 +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
65 + dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
66 + libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
67 + samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
68 + zsh-completion"
69 +
70 +REQUIRED_USE="
71 + || ( cli libmpv )
72 + aqua? ( opengl )
73 + cuda? ( !libav opengl )
74 + egl? ( || ( gbm X wayland ) )
75 + gbm? ( drm egl opengl )
76 + lcms? ( opengl )
77 + luajit? ( lua )
78 + opengl? ( || ( aqua egl X raspberry-pi !cli ) )
79 + raspberry-pi? ( opengl )
80 + test? ( opengl )
81 + tools? ( cli )
82 + uchardet? ( iconv )
83 + v4l? ( || ( alsa oss ) )
84 + vaapi? ( || ( gbm X wayland ) )
85 + vdpau? ( X )
86 + wayland? ( egl )
87 + X? ( egl? ( opengl ) )
88 + xv? ( X )
89 + zsh-completion? ( cli )
90 + ${PYTHON_REQUIRED_USE}
91 +"
92 +
93 +COMMON_DEPEND="
94 + !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
95 + libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
96 + alsa? ( >=media-libs/alsa-lib-1.0.18 )
97 + archive? ( >=app-arch/libarchive-3.0.0:= )
98 + bluray? ( >=media-libs/libbluray-0.3.0:= )
99 + cdda? ( dev-libs/libcdio-paranoia )
100 + cuda? ( >=media-video/ffmpeg-3.3:0 )
101 + drm? ( x11-libs/libdrm )
102 + dvd? (
103 + >=media-libs/libdvdnav-4.2.0
104 + >=media-libs/libdvdread-4.1.0
105 + )
106 + egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
107 + iconv? (
108 + virtual/libiconv
109 + uchardet? ( app-i18n/uchardet )
110 + )
111 + jack? ( virtual/jack )
112 + javascript? ( >=dev-lang/mujs-1.0.0 )
113 + jpeg? ( virtual/jpeg:0 )
114 + lcms? ( >=media-libs/lcms-2.6:2 )
115 + libass? (
116 + >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
117 + virtual/ttf-fonts
118 + )
119 + libcaca? ( >=media-libs/libcaca-0.99_beta18 )
120 + lua? (
121 + !luajit? ( <dev-lang/lua-5.3:= )
122 + luajit? ( dev-lang/luajit:2 )
123 + )
124 + openal? ( >=media-libs/openal-1.13 )
125 + pulseaudio? ( media-sound/pulseaudio )
126 + raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
127 + rubberband? ( >=media-libs/rubberband-1.8.0 )
128 + samba? ( net-fs/samba )
129 + sdl? ( media-libs/libsdl2[sound,threads,video] )
130 + v4l? ( media-libs/libv4l )
131 + vaapi? (
132 + !libav? ( >=media-video/ffmpeg-3.3:0 )
133 + libav? ( >=media-video/libav-13:0 )
134 + x11-libs/libva[drm?,X?,wayland?]
135 + )
136 + vdpau? (
137 + !libav? ( >=media-video/ffmpeg-3.3:0 )
138 + libav? ( >=media-video/libav-13:0 )
139 + x11-libs/libvdpau
140 + )
141 + wayland? (
142 + >=dev-libs/wayland-1.6.0
143 + >=x11-libs/libxkbcommon-0.3.0
144 + )
145 + X? (
146 + x11-libs/libX11
147 + x11-libs/libXScrnSaver
148 + x11-libs/libXext
149 + x11-libs/libXinerama
150 + x11-libs/libXrandr
151 + opengl? (
152 + x11-libs/libXdamage
153 + virtual/opengl
154 + )
155 + xv? ( x11-libs/libXv )
156 + )
157 + zlib? ( sys-libs/zlib )
158 +"
159 +DEPEND="${COMMON_DEPEND}
160 + ${PYTHON_DEPS}
161 + dev-python/docutils
162 + virtual/pkgconfig
163 + doc? ( dev-python/rst2pdf )
164 + dvb? ( virtual/linuxtv-dvb-headers )
165 + test? ( >=dev-util/cmocka-1.0.0 )
166 + v4l? ( virtual/os-headers )
167 + zsh-completion? ( dev-lang/perl )
168 +"
169 +RDEPEND="${COMMON_DEPEND}
170 + cuda? ( x11-drivers/nvidia-drivers[X] )
171 + selinux? ( sec-policy/selinux-mplayer )
172 + tools? ( ${PYTHON_DEPS} )
173 +"
174 +
175 +PATCHES=(
176 + "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
177 + "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
178 +)
179 +
180 +pkg_setup() {
181 + [[ ${MERGE_TYPE} != "binary" ]] && python_setup
182 +}
183 +
184 +src_prepare() {
185 + cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
186 + chmod +x "${S}"/waf || die
187 + default_src_prepare
188 +}
189 +
190 +src_configure() {
191 + tc-export CC PKG_CONFIG AR
192 +
193 + if tc-is-cross-compiler && use raspberry-pi; then
194 + export EXTRA_PKG_CONFIG_LIBDIR="${SYSROOT%/}${EPREFIX}/opt/vc/lib/pkgconfig"
195 + # Drop next line when Gentoo bug 607344 is fixed or if you fixed it locally.
196 + die "${PN} can't be cross built with raspberry-pi USE enabled. See Gentoo bug 607344."
197 + fi
198 +
199 + local mywafargs=(
200 + --confdir="${EPREFIX}/etc/${PN}"
201 + --docdir="${EPREFIX}/usr/share/doc/${PF}"
202 + --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
203 +
204 + $(usex cli '' '--disable-cplayer')
205 + $(use_enable libmpv libmpv-shared)
206 +
207 + --disable-libmpv-static
208 + --disable-static-build
209 + # See deep down below for build-date.
210 + --disable-optimize # Don't add '-O2' to CFLAGS.
211 + --disable-debug-build # Don't add '-g' to CFLAGS.
212 + --enable-html-build
213 +
214 + $(use_enable doc pdf-build)
215 + $(use_enable cplugins)
216 + $(use_enable zsh-completion zsh-comp)
217 + $(use_enable test)
218 +
219 + $(use_enable iconv)
220 + $(use_enable samba libsmbclient)
221 + $(use_enable lua)
222 + $(usex luajit '--lua=luajit' '')
223 + $(use_enable javascript)
224 + $(use_enable libass)
225 + $(use_enable libass libass-osd)
226 + $(use_enable zlib)
227 + $(use_enable encode encoding)
228 + $(use_enable bluray libbluray)
229 + $(use_enable dvd dvdread)
230 + $(use_enable dvd dvdnav)
231 + $(use_enable cdda)
232 + $(use_enable uchardet)
233 + $(use_enable rubberband)
234 + $(use_enable lcms lcms2)
235 + --disable-vapoursynth # Only available in overlays.
236 + --disable-vapoursynth-lazy
237 + $(use_enable archive libarchive)
238 +
239 + --enable-libavdevice
240 +
241 + # Audio outputs:
242 + $(use_enable sdl sdl2) # Listed under audio, but also includes video.
243 + --disable-sdl1
244 + $(use_enable oss oss-audio)
245 + --disable-rsound # Only available in overlays.
246 + --disable-sndio # Only available in overlays.
247 + $(use_enable pulseaudio pulse)
248 + $(use_enable jack)
249 + $(use_enable openal)
250 + --disable-opensles
251 + $(use_enable alsa)
252 + $(use_enable coreaudio)
253 +
254 + # Video outputs:
255 + $(use_enable aqua cocoa)
256 + $(use_enable drm)
257 + $(use_enable gbm)
258 + $(use_enable wayland)
259 + $(use_enable X x11)
260 + $(use_enable xv)
261 + $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
262 + $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
263 + $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
264 + $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
265 + $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
266 + $(use_enable vdpau)
267 + $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
268 + $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
269 + $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
270 + $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
271 + $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
272 + $(use_enable libcaca caca)
273 + $(use_enable jpeg)
274 + --disable-android
275 + $(use_enable raspberry-pi rpi)
276 + $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
277 + --disable-mali-fbdev # Only available in overlays.
278 + $(usex opengl '' '--disable-gl')
279 +
280 + # HWaccels:
281 + # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
282 + $(use_enable vaapi vaapi-hwaccel)
283 + $(use_enable vdpau vdpau-hwaccel)
284 + $(use_enable cuda cuda-hwaccel)
285 +
286 + # TV features:
287 + $(use_enable v4l tv)
288 + $(use_enable v4l tv-v4l2)
289 + $(use_enable v4l libv4l2)
290 + $(use_enable v4l audio-input)
291 + $(use_enable dvb dvbin)
292 +
293 + # Miscellaneous features:
294 + --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
295 + )
296 +
297 + if use vaapi && use X; then
298 + mywafargs+=(
299 + $(use_enable opengl vaapi-glx)
300 + $(use_enable egl vaapi-x-egl)
301 + )
302 + fi
303 +
304 + # Create reproducible non-live builds.
305 + [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
306 +
307 + waf-utils_src_configure "${mywafargs[@]}"
308 +}
309 +
310 +src_install() {
311 + waf-utils_src_install
312 +
313 + if use lua; then
314 + insinto /usr/share/${PN}
315 + doins -r TOOLS/lua
316 + fi
317 +
318 + if use cli && use luajit; then
319 + pax-mark -m "${ED}"usr/bin/${PN}
320 + fi
321 +
322 + if use tools; then
323 + dobin TOOLS/{mpv_identify.sh,umpv}
324 + newbin TOOLS/idet.sh mpv_idet.sh
325 + python_replicate_script "${ED}"usr/bin/umpv
326 + fi
327 +}
328 +
329 +pkg_preinst() {
330 + gnome2_icon_savelist
331 +}
332 +
333 +pkg_postinst() {
334 + local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
335 +
336 + for rv in ${REPLACING_VERSIONS}; do
337 + version_compare ${rv} 0.18.1
338 + [[ $? -eq 1 ]] && softvol_0_18_1=1
339 + version_compare ${rv} 0.21.0
340 + [[ $? -eq 1 ]] && osc_0_21_0=1
341 + version_compare ${rv} 0.24.0
342 + [[ $? -eq 1 ]] && txtsubs_0_24_0=1
343 + version_compare ${rv} 0.25.0
344 + [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
345 + done
346 +
347 + if [[ ${softvol_0_18_1} -eq 1 ]]; then
348 + elog "Since version 0.18.1 the software volume control is always enabled."
349 + elog "This means that volume controls don't change the system volume,"
350 + elog "e.g. per-application volume with PulseAudio."
351 + elog "If you want to restore the previous behaviour, please refer to"
352 + elog
353 + elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
354 + elog
355 + fi
356 +
357 + if [[ ${osc_0_21_0} -eq 1 ]]; then
358 + elog "In version 0.21.0 the default OSC layout was changed."
359 + elog "If you want to restore the previous layout, please refer to"
360 + elog
361 + elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
362 + elog
363 + fi
364 +
365 + if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
366 + elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
367 + elog "If you want to restore the previous behaviour, please refer to"
368 + elog
369 + elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
370 + elog
371 + fi
372 +
373 + if [[ ${opengl_0_25_0} -eq 1 ]]; then
374 + elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
375 + elog "the 'opengl' video output and no longer explicitly requires"
376 + elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
377 + fi
378 +
379 + if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
380 + elog "If you want to have command-line completion via bash-completion,"
381 + elog "please install app-shells/mpv-bash-completion."
382 + fi
383 +
384 + if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
385 + has_version 'app-shells/mpv-bash-completion'; then
386 + elog "If command-line completion doesn't work after mpv update,"
387 + elog "please rebuild app-shells/mpv-bash-completion."
388 + fi
389 +
390 + gnome2_icon_cache_update
391 + xdg_desktop_database_update
392 +}
393 +
394 +pkg_postrm() {
395 + gnome2_icon_cache_update
396 + xdg_desktop_database_update
397 +}
398 +
399 +src_test() {
400 + cd "${S}"/build/test || die
401 + local test
402 + for test in *; do
403 + if [[ -x ${test} ]]; then
404 + ./"${test}" || die "Test suite failed"
405 + fi
406 + done
407 +}