* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2015-12-28 13:27 Ian Delaney
0 siblings, 0 replies; 17+ messages in thread
From: Ian Delaney @ 2015-12-28 13:27 UTC (permalink / raw
To: gentoo-commits
commit: cf902d203d54e298849bcac1b92aafee9b15f658
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Tue Dec 22 20:40:25 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:47:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf902d20
media-video/mpv: version bump to 0.14.0 wrt bug 564656
Gentoo-Bug: 564656
Package-Manager: portage-2.2.24
media-video/mpv/Manifest | 1 +
.../files/mpv-0.14.0-support-GNU-__thread.patch | 37 +++
media-video/mpv/mpv-0.14.0.ebuild | 299 +++++++++++++++++++++
3 files changed, 337 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 89e69f2..8e886d7 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,5 @@
DIST mpv-0.11.0.tar.gz 2689655 SHA256 a2157174e46db46dad5deb1fde94283e72ebe922fd15447cb16a2a243fae5bda SHA512 f85da000770dbca09be2a59c4eda7e6d7142ca17328844d2b08a173f64554159f50ba9b32661ba67924b789e886940cda1add993862f02f295e7753f50388bdb WHIRLPOOL 1184f09435d6f30119143ab98ddd4767e53c701bdc5b850eb62c19607652a7103699a6b54a0d165acb548f4cced4179af6f7decbf64c8289ff56736e26ed7924
+DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
DIST mpv-0.9.2_p20150824.tar.xz 1867384 SHA256 67fa5ce11740b83ceef8bc435d5ef17803f1ec328dd2fee93b67e46ccc195209 SHA512 1ae0fd4faa180472c023c0ba77a28f2d1319f597763d5249259d55a04387b5f6384e2c5a8ff78bb514dfda86c30ceb474c35e54468a29ad3fc6327c4baaf75cc WHIRLPOOL cb61758234f9186880def4dcb7cb7e54d03abd6734484b5691926e2514cae1bebef6f9a53465e2aa2710e4ad5dbe1875369d483489a5cb853c3fa756ff7e968a
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
new file mode 100644
index 0000000..6e17314
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
@@ -0,0 +1,37 @@
+For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631
+
+Upstream commits:
+https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035
+https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e
+
+diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
+index 00cd535..f607c23 100644
+--- a/video/out/opengl/common.c
++++ b/video/out/opengl/common.c
+@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
+ }
+
+ #if HAVE_C11_TLS
+-static _Thread_local MPGLContext *current_context;
++#define MP_TLS _Thread_local
++#elif defined(__GNU__)
++#define MP_TLS __thread
++#endif
++
++#ifdef MP_TLS
++static MP_TLS MPGLContext *current_context;
+
+ static void * GLAPIENTRY get_native_display(const char *name)
+ {
+diff --git a/wscript b/wscript
+index a5e6914..969d9cc 100644
+--- a/wscript
++++ b/wscript
+@@ -718,7 +718,6 @@ video_output_features = [
+ }, {
+ 'name': 'vaapi-egl',
+ 'desc': 'VAAPI EGL',
+- 'deps': [ 'c11-tls' ], # indirectly
+ 'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ],
+ 'func': check_true,
+ }, {
diff --git a/media-video/mpv/mpv-0.14.0.ebuild b/media-video/mpv/mpv-0.14.0.ebuild
new file mode 100644
index 0000000..f6a0485
--- /dev/null
+++ b/media-video/mpv/mpv-0.14.0.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV='1.8.12'
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+ inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md etc/example.conf etc/input.conf )
+
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
+IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
+ +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
+ openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
+ test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
+ xv"
+
+REQUIRED_USE="
+ || ( cli libmpv )
+ egl? ( || ( gbm X wayland ) )
+ enca? ( iconv )
+ gbm? ( drm egl )
+ lcms? ( || ( opengl egl ) )
+ libguess? ( iconv )
+ luajit? ( lua )
+ opengl? ( X )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
+ vaapi? ( || ( X wayland ) )
+ vdpau? ( X )
+ wayland? ( egl )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+"
+
+COMMON_DEPEND="
+ !libav? ( >=media-video/ffmpeg-2.4.0:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+ sys-libs/zlib
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
+ bluray? ( >=media-libs/libbluray-0.3.0 )
+ cdda? ( dev-libs/libcdio-paranoia )
+ drm? ( x11-libs/libdrm )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? (
+ >=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ enca? ( app-i18n/enca )
+ libguess? ( >=app-i18n/libguess-1.0 )
+ uchardet? ( dev-libs/uchardet )
+ )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ libass? (
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+ virtual/ttf-fonts
+ )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+ lua? (
+ !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+ luajit? ( dev-lang/luajit:2 )
+ )
+ openal? ( >=media-libs/openal-1.13 )
+ pulseaudio? ( media-sound/pulseaudio )
+ rubberband? ( >=media-libs/rubberband-1.8.0 )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
+ wayland? (
+ >=dev-libs/wayland-1.6.0
+ >=x11-libs/libxkbcommon-0.3.0
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.2.0
+ opengl? (
+ x11-libs/libXdamage
+ virtual/opengl
+ )
+ vdpau? ( >=x11-libs/libvdpau-0.2 )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.8
+ dev-python/docutils
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ test? ( >=dev-util/cmocka-1.0.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
+ die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+ fi
+
+ if ! use libass; then
+ ewarn "You have disabled the libass support."
+ ewarn "OSD and subtitles won't be available."
+ fi
+
+ if use openal; then
+ ewarn "You have enabled the openal audio output. Be warned that"
+ ewarn "this output is considered experimental by upstream."
+ fi
+
+ if use sdl; then
+ ewarn "You have enabled the sdl video and audio outputs. Note that"
+ ewarn "upstream provides these outputs for compatibility reasons only."
+ ewarn "You probably don't need them under the normal circumstances."
+ fi
+
+ if use libav; then
+ elog "You have enabled media-video/libav instead of media-video/ffmpeg."
+ elog "Upstream recommends media-video/ffmpeg, as some functionality"
+ elog "is not provided by media-video/libav."
+ fi
+
+ einfo "mpv optionally supports many different audio and video formats."
+ einfo "You will need to enable support for the desired formats in your"
+ einfo "libavcodec/libavformat provider:"
+ einfo " media-video/ffmpeg or media-video/libav"
+}
+
+src_prepare() {
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+
+ epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
+ epatch "${FILESDIR}/${P}-support-GNU-__thread.patch"
+ epatch_user
+}
+
+src_configure() {
+ local mywafargs=(
+ --confdir="${EPREFIX}"/etc/${PN}
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ $(usex cli '' '--disable-cplayer')
+ $(use_enable libmpv libmpv-shared)
+
+ --disable-libmpv-static
+ --disable-static-build
+ --disable-build-date # Create reproducible build
+ --disable-optimize # Do not add '-O2' to CFLAGS
+ --disable-debug-build # Do not add '-g' to CFLAGS
+
+ $(use_enable doc pdf-build)
+ $(use_enable vf-dlopen vf-dlopen-filters)
+ $(use_enable cli zsh-comp)
+ $(use_enable test)
+
+ $(use_enable iconv)
+ $(use_enable samba libsmbclient)
+ $(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
+ $(use_enable libass)
+ $(use_enable libass libass-osd)
+ $(use_enable encode encoding)
+ $(use_enable bluray libbluray)
+ $(use_enable dvd dvdread)
+ $(use_enable dvd dvdnav)
+ $(use_enable cdda)
+ $(use_enable enca)
+ $(use_enable libguess)
+ $(use_enable uchardet)
+ $(use_enable rubberband)
+ $(use_enable lcms lcms2)
+ --disable-vapoursynth # Only available in overlays
+ --disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
+ --enable-libavfilter
+ --enable-libavdevice
+
+ # Audio outputs
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video
+ --disable-sdl1
+ $(use_enable oss oss-audio)
+ --disable-rsound # Only available in overlays
+ $(use_enable pulseaudio pulse)
+ $(use_enable jack)
+ $(use_enable openal)
+ $(use_enable alsa)
+ --disable-coreaudio
+ --disable-dsound
+ --disable-wasapi
+
+ # Video outputs
+ --disable-cocoa
+ $(use_enable drm)
+ $(use_enable gbm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ $(use_enable xscreensaver xss)
+ $(use_enable X xext)
+ $(use_enable xv)
+ $(use_enable xinerama)
+ $(use_enable X xrandr)
+ $(use_enable opengl gl-x11)
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(use_enable wayland gl-wayland)
+ $(use_enable vdpau)
+ $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+ $(use_enable vaapi) # See below for vaapi-x-egl
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
+ $(use_enable libcaca caca)
+ $(use_enable jpeg)
+ $(use_enable raspberry-pi rpi)
+
+ # HWaccels
+ $(use_enable vaapi vaapi-hwaccel)
+ # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
+
+ # TV features
+ $(use_enable v4l tv)
+ $(use_enable v4l tv-v4l2)
+ $(use_enable v4l libv4l2)
+ $(use_enable v4l audio-input)
+ $(use_enable dvb dvbin)
+ )
+
+ if use vaapi && use X && use egl; then
+ mywafargs+=(--enable-vaapi-x-egl)
+ else
+ mywafargs+=(--disable-vaapi-x-egl)
+ fi
+
+ waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+ waf-utils_src_install
+
+ if use cli && use luajit; then
+ pax-mark -m "${ED}usr/bin/${PN}"
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+src_test() {
+ cd "${S}"/build/test || die
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-01-18 20:50 Patrice Clement
0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2016-01-18 20:50 UTC (permalink / raw
To: gentoo-commits
commit: fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Jan 18 19:45:47 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 20:48:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9b596c
media-video/mpv: revbump to 0.15.0-r1 to fix null pointer dereference
Upstream issue: https://github.com/mpv-player/mpv/issues/2729
Package-Manager: portage-2.2.26
.../mpv-0.15.0-fix-null-pointer-dereference.patch | 21 +++++++++++++++++++++
.../mpv/{mpv-0.15.0.ebuild => mpv-0.15.0-r1.ebuild} | 2 ++
2 files changed, 23 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch
new file mode 100644
index 0000000..4cc4c87
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch
@@ -0,0 +1,21 @@
+commit 5053f4cc3f48538c3d9a3ba13dc98442f3302052
+Author: wm4 <wm4@nowhere>
+Date: Mon Jan 18 20:10:28 2016 +0100
+
+ command: fix NULL pointer deref in "video-codec" property
+
+ Fixes #2729.
+
+diff --git a/player/command.c b/player/command.c
+index 3c7cfb2..413349d 100644
+--- a/player/command.c
++++ b/player/command.c
+@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void *ctx, struct m_property *prop,
+ {
+ MPContext *mpctx = ctx;
+ struct track *track = mpctx->current_track[0][STREAM_VIDEO];
+- const char *c = track->d_video ? track->d_video->decoder_desc : NULL;
++ const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL;
+ return m_property_strdup_ro(action, arg, c);
+ }
+
diff --git a/media-video/mpv/mpv-0.15.0.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild
similarity index 99%
rename from media-video/mpv/mpv-0.15.0.ebuild
rename to media-video/mpv/mpv-0.15.0-r1.ebuild
index b6a0297..ca974a9 100644
--- a/media-video/mpv/mpv-0.15.0.ebuild
+++ b/media-video/mpv/mpv-0.15.0-r1.ebuild
@@ -161,6 +161,8 @@ pkg_pretend() {
src_prepare() {
cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
chmod +x "${S}"/waf || die
+
+ epatch "${FILESDIR}/${P}-fix-null-pointer-dereference.patch"
epatch_user
}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-03-01 6:22 Ian Delaney
0 siblings, 0 replies; 17+ messages in thread
From: Ian Delaney @ 2016-03-01 6:22 UTC (permalink / raw
To: gentoo-commits
commit: d5c7520d1570c6495046164ed1246c8d56daf789
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Feb 29 14:32:17 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 19:28:44 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c7520d
media-video/mpv: remove old
Package-Manager: portage-2.2.27
media-video/mpv/Manifest | 1 -
.../files/mpv-0.14.0-support-GNU-__thread.patch | 37 ---
.../mpv/files/mpv-fix-include-in-tests.patch | 17 --
media-video/mpv/mpv-0.14.0-r1.ebuild | 304 ---------------------
4 files changed, 359 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index a60de5b..e8307fd 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,3 @@
-DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d
DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
deleted file mode 100644
index 6e17314..0000000
--- a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631
-
-Upstream commits:
-https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035
-https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e
-
-diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c
-index 00cd535..f607c23 100644
---- a/video/out/opengl/common.c
-+++ b/video/out/opengl/common.c
-@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt,
- }
-
- #if HAVE_C11_TLS
--static _Thread_local MPGLContext *current_context;
-+#define MP_TLS _Thread_local
-+#elif defined(__GNU__)
-+#define MP_TLS __thread
-+#endif
-+
-+#ifdef MP_TLS
-+static MP_TLS MPGLContext *current_context;
-
- static void * GLAPIENTRY get_native_display(const char *name)
- {
-diff --git a/wscript b/wscript
-index a5e6914..969d9cc 100644
---- a/wscript
-+++ b/wscript
-@@ -718,7 +718,6 @@ video_output_features = [
- }, {
- 'name': 'vaapi-egl',
- 'desc': 'VAAPI EGL',
-- 'deps': [ 'c11-tls' ], # indirectly
- 'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ],
- 'func': check_true,
- }, {
diff --git a/media-video/mpv/files/mpv-fix-include-in-tests.patch b/media-video/mpv/files/mpv-fix-include-in-tests.patch
deleted file mode 100644
index b020119..0000000
--- a/media-video/mpv/files/mpv-fix-include-in-tests.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 867334395765ae7d2765e0834f9fd3dd5de53cab
-Author: Ilya Tumaykin <itumaykin@gmail.com>
-Date: Tue Dec 22 17:10:12 2015 +0300
-
- tests: fix #include
-
-diff --git a/test/gl_video.c b/test/gl_video.c
-index 253ab35..97fee94 100644
---- a/test/gl_video.c
-+++ b/test/gl_video.c
-@@ -1,5 +1,5 @@
- #include "test_helpers.h"
--#include "video/out/gl_video.h"
-+#include "video/out/opengl/video.h"
-
- static void test_scale_ambient_lux_limits(void **state) {
- float x;
diff --git a/media-video/mpv/mpv-0.14.0-r1.ebuild b/media-video/mpv/mpv-0.14.0-r1.ebuild
deleted file mode 100644
index 40ccf88..0000000
--- a/media-video/mpv/mpv-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV='1.8.12'
-
-inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
- inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md )
-
-# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
-LICENSE="GPL-2+ BSD ISC"
-SLOT="0"
-# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
-IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
- +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
- openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
- test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
- xv zsh-completion"
-
-REQUIRED_USE="
- || ( cli libmpv )
- egl? ( || ( gbm X wayland ) )
- enca? ( iconv )
- gbm? ( drm egl )
- lcms? ( || ( opengl egl ) )
- libguess? ( iconv )
- luajit? ( lua )
- opengl? ( X )
- uchardet? ( iconv )
- v4l? ( || ( alsa oss ) )
- vaapi? ( || ( X wayland ) )
- vdpau? ( X )
- wayland? ( egl )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
- zsh-completion? ( cli )
-"
-
-COMMON_DEPEND="
- !libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
- libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
- sys-libs/zlib
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.0.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0 )
- cdda? ( dev-libs/libcdio-paranoia )
- drm? ( x11-libs/libdrm )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? (
- >=media-libs/libdvdnav-4.2.0
- >=media-libs/libdvdread-4.1.0
- )
- egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
- iconv? (
- virtual/libiconv
- enca? ( app-i18n/enca )
- libguess? ( >=app-i18n/libguess-1.0 )
- uchardet? ( dev-libs/uchardet )
- )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( >=media-libs/lcms-2.6:2 )
- libass? (
- >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
- virtual/ttf-fonts
- )
- libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
- luajit? ( dev-lang/luajit:2 )
- )
- openal? ( >=media-libs/openal-1.13 )
- pulseaudio? ( media-sound/pulseaudio )
- rubberband? ( >=media-libs/rubberband-1.8.0 )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
- v4l? ( media-libs/libv4l )
- vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
- wayland? (
- >=dev-libs/wayland-1.6.0
- >=x11-libs/libxkbcommon-0.3.0
- )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libXrandr-1.2.0
- opengl? (
- x11-libs/libXdamage
- virtual/opengl
- )
- vdpau? ( >=x11-libs/libvdpau-0.2 )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.8
- dev-python/docutils
- virtual/pkgconfig
- doc? ( dev-python/rst2pdf )
- test? ( >=dev-util/cmocka-1.0.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
- die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
- fi
-
- if ! use libass; then
- ewarn "You have disabled the libass support."
- ewarn "OSD and subtitles won't be available."
- fi
-
- if use openal; then
- ewarn "You have enabled the openal audio output. Be warned that"
- ewarn "this output is considered experimental by upstream."
- fi
-
- if use sdl; then
- ewarn "You have enabled the sdl video and audio outputs. Note that"
- ewarn "upstream provides these outputs for compatibility reasons only."
- ewarn "You probably don't need them under the normal circumstances."
- fi
-
- if use libav; then
- elog "You have enabled media-video/libav instead of media-video/ffmpeg."
- elog "Upstream recommends media-video/ffmpeg, as some functionality"
- elog "is not provided by media-video/libav."
- fi
-
- einfo "mpv optionally supports many different audio and video formats."
- einfo "You will need to enable support for the desired formats in your"
- einfo "libavcodec/libavformat provider:"
- einfo " media-video/ffmpeg or media-video/libav"
-}
-
-src_prepare() {
- cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
- chmod +x "${S}"/waf || die
-
- epatch "${FILESDIR}/${PN}-fix-include-in-tests.patch"
- epatch "${FILESDIR}/${P}-support-GNU-__thread.patch"
- epatch_user
-}
-
-src_configure() {
- local mywafargs=(
- --confdir="${EPREFIX}"/etc/${PN}
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
-
- --disable-gpl3 # Unclear license info. See Gentoo bug 571728.
-
- $(usex cli '' '--disable-cplayer')
- $(use_enable libmpv libmpv-shared)
-
- # See deep down below for build-date
- --disable-libmpv-static
- --disable-static-build
- --disable-optimize # Do not add '-O2' to CFLAGS
- --disable-debug-build # Do not add '-g' to CFLAGS
-
- $(use_enable doc pdf-build)
- $(use_enable vf-dlopen vf-dlopen-filters)
- $(use_enable zsh-completion zsh-comp)
- $(use_enable test)
-
- $(use_enable iconv)
- $(use_enable samba libsmbclient)
- $(use_enable lua)
- $(usex luajit '--lua=luajit' '')
- $(use_enable libass)
- $(use_enable libass libass-osd)
- $(use_enable encode encoding)
- $(use_enable bluray libbluray)
- $(use_enable dvd dvdread)
- $(use_enable dvd dvdnav)
- $(use_enable cdda)
- $(use_enable enca)
- $(use_enable libguess)
- $(use_enable uchardet)
- $(use_enable rubberband)
- $(use_enable lcms lcms2)
- --disable-vapoursynth # Only available in overlays
- --disable-vapoursynth-lazy
- $(use_enable archive libarchive)
-
- --enable-libavfilter
- --enable-libavdevice
-
- # Audio outputs
- $(use_enable sdl sdl2) # Listed under audio, but also includes video
- --disable-sdl1
- $(use_enable oss oss-audio)
- --disable-rsound # Only available in overlays
- $(use_enable pulseaudio pulse)
- $(use_enable jack)
- $(use_enable openal)
- $(use_enable alsa)
- --disable-coreaudio
- --disable-dsound
-
- # Video outputs
- --disable-cocoa
- $(use_enable drm)
- $(use_enable gbm)
- $(use_enable wayland)
- $(use_enable X x11)
- $(use_enable xscreensaver xss)
- $(use_enable X xext)
- $(use_enable xv)
- $(use_enable xinerama)
- $(use_enable X xrandr)
- $(use_enable opengl gl-x11)
- $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
- $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
- $(use_enable wayland gl-wayland)
- $(use_enable vdpau)
- $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
- $(use_enable vaapi) # See below for vaapi-x-egl
- $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
- $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
- $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
- $(use_enable libcaca caca)
- $(use_enable jpeg)
- $(use_enable raspberry-pi rpi)
-
- # HWaccels
- $(use_enable vaapi vaapi-hwaccel)
- # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
-
- # TV features
- $(use_enable v4l tv)
- $(use_enable v4l tv-v4l2)
- $(use_enable v4l libv4l2)
- $(use_enable v4l audio-input)
- $(use_enable dvb dvbin)
- )
-
- if use vaapi && use X && use egl; then
- mywafargs+=(--enable-vaapi-x-egl)
- else
- mywafargs+=(--disable-vaapi-x-egl)
- fi
-
- # Create reproducible non-live builds
- [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
- waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
- waf-utils_src_install
-
- if use cli && use luajit; then
- pax-mark -m "${ED}usr/bin/${PN}"
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-src_test() {
- cd "${S}"/build/test || die
- for test in *; do
- if [[ -x ${test} ]]; then
- ./"${test}" || die "Test suite failed"
- fi
- done
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-03-01 6:22 Ian Delaney
0 siblings, 0 replies; 17+ messages in thread
From: Ian Delaney @ 2016-03-01 6:22 UTC (permalink / raw
To: gentoo-commits
commit: b0ec4ce8cebbb5373b02c7ef2d45953596767667
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Feb 29 14:29:43 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 29 19:28:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ec4ce8
media-video/mpv: verbump to 0.16.0
Gentoo-Bug: 575976
Package-Manager: portage-2.2.27
media-video/mpv/Manifest | 1 +
.../mpv-0.16.0-fix-srt-subtitles-on-libav.patch | 29 ++
media-video/mpv/mpv-0.16.0.ebuild | 302 +++++++++++++++++++++
3 files changed, 332 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 58e4f66..a60de5b 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,6 @@
DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942daaaa85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9
DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d
+DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
diff --git a/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch b/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch
new file mode 100644
index 0000000..4344e78
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch
@@ -0,0 +1,29 @@
+commit 041c9f1782cbed4abf7793f4e72b8b29b2fd9b1b
+Author: wm4 <wm4@nowhere>
+Date: Mon Feb 29 18:20:27 2016 +0100
+
+ lavc_conv: fix Libav srt subtitles
+
+ Use the mp_lavc_set_extradata() function instead of setting up the
+ extradata manually. This takes care of the corner case when
+ extradata_len is 0.
+
+ This apparently fixes #2888.
+
+diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c
+index 3dd6097..7303020 100644
+--- a/sub/lavc_conv.c
++++ b/sub/lavc_conv.c
+@@ -79,11 +79,8 @@ struct lavc_conv *lavc_conv_create(struct mp_log *log, const char *codec_name,
+ avctx = avcodec_alloc_context3(codec);
+ if (!avctx)
+ goto error;
+- avctx->extradata_size = extradata_len;
+- avctx->extradata = av_malloc(extradata_len);
+- if (!avctx->extradata)
++ if (mp_lavc_set_extradata(avctx, extradata, extradata_len) < 0)
+ goto error;
+- memcpy(avctx->extradata, extradata, extradata_len);
+ if (strcmp(codec_name, "eia_608") == 0)
+ av_dict_set(&opts, "real_time", "1", 0);
+ if (avcodec_open2(avctx, codec, &opts) < 0)
diff --git a/media-video/mpv/mpv-0.16.0.ebuild b/media-video/mpv/mpv-0.16.0.ebuild
new file mode 100644
index 0000000..1d18f73
--- /dev/null
+++ b/media-video/mpv/mpv-0.16.0.ebuild
@@ -0,0 +1,302 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV='1.8.12'
+
+inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+ inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md )
+
+# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
+ +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
+ openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
+ test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
+ +xv zsh-completion"
+
+REQUIRED_USE="
+ || ( cli libmpv )
+ egl? ( || ( gbm X wayland ) )
+ enca? ( iconv )
+ gbm? ( drm egl )
+ lcms? ( || ( opengl egl ) )
+ libguess? ( iconv )
+ luajit? ( lua )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
+ vaapi? ( || ( gbm X wayland ) )
+ vdpau? ( X )
+ wayland? ( egl )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+ zsh-completion? ( cli )
+"
+
+COMMON_DEPEND="
+ !libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+ sys-libs/zlib
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
+ bluray? ( >=media-libs/libbluray-0.3.0 )
+ cdda? ( dev-libs/libcdio-paranoia )
+ drm? ( x11-libs/libdrm )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? (
+ >=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ enca? ( app-i18n/enca )
+ libguess? ( >=app-i18n/libguess-1.0 )
+ uchardet? ( dev-libs/uchardet )
+ )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ libass? (
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+ virtual/ttf-fonts
+ )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+ lua? (
+ !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
+ luajit? ( dev-lang/luajit:2 )
+ )
+ openal? ( >=media-libs/openal-1.13 )
+ opengl? ( virtual/opengl )
+ pulseaudio? ( media-sound/pulseaudio )
+ rubberband? ( >=media-libs/rubberband-1.8.0 )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
+ wayland? (
+ >=dev-libs/wayland-1.6.0
+ >=x11-libs/libxkbcommon-0.3.0
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.2.0
+ opengl? ( x11-libs/libXdamage )
+ vdpau? ( >=x11-libs/libvdpau-0.2 )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.8
+ dev-python/docutils
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ test? ( >=dev-util/cmocka-1.0.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
+ die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+ fi
+
+ if ! use libass; then
+ ewarn "You have disabled the libass support."
+ ewarn "OSD and subtitles won't be available."
+ fi
+
+ if use openal; then
+ ewarn "You have enabled the openal audio output. Be warned that"
+ ewarn "this output is considered experimental by upstream."
+ fi
+
+ if use sdl; then
+ ewarn "You have enabled the sdl video and audio outputs. Note that"
+ ewarn "upstream provides these outputs for compatibility reasons only."
+ ewarn "You probably don't need them under the normal circumstances."
+ fi
+
+ if use libav; then
+ elog "You have enabled media-video/libav instead of media-video/ffmpeg."
+ elog "Upstream recommends media-video/ffmpeg, as some functionality"
+ elog "is not provided by media-video/libav."
+ fi
+
+ einfo "mpv optionally supports many different audio and video formats."
+ einfo "You will need to enable support for the desired formats in your"
+ einfo "libavcodec/libavformat provider:"
+ einfo " media-video/ffmpeg or media-video/libav"
+}
+
+src_prepare() {
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+
+ epatch "${FILESDIR}/${P}-fix-srt-subtitles-on-libav.patch"
+ epatch_user
+}
+
+src_configure() {
+ local mywafargs=(
+ --confdir="${EPREFIX}"/etc/${PN}
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+
+ --disable-gpl3 # Unclear license info. See Gentoo bug 571728.
+
+ $(usex cli '' '--disable-cplayer')
+ $(use_enable libmpv libmpv-shared)
+
+ # See deep down below for build-date
+ --disable-libmpv-static
+ --disable-static-build
+ --disable-optimize # Do not add '-O2' to CFLAGS
+ --disable-debug-build # Do not add '-g' to CFLAGS
+
+ $(use_enable doc html-build)
+ $(use_enable doc pdf-build)
+ $(use_enable vf-dlopen vf-dlopen-filters)
+ $(use_enable zsh-completion zsh-comp)
+ $(use_enable test)
+
+ $(use_enable iconv)
+ $(use_enable samba libsmbclient)
+ $(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
+ $(use_enable libass)
+ $(use_enable libass libass-osd)
+ $(use_enable encode encoding)
+ $(use_enable bluray libbluray)
+ $(use_enable dvd dvdread)
+ $(use_enable dvd dvdnav)
+ $(use_enable cdda)
+ $(use_enable enca)
+ $(use_enable libguess)
+ $(use_enable uchardet)
+ $(use_enable rubberband)
+ $(use_enable lcms lcms2)
+ --disable-vapoursynth # Only available in overlays
+ --disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
+ --enable-libavdevice
+
+ # Audio outputs
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video
+ --disable-sdl1
+ $(use_enable oss oss-audio)
+ --disable-rsound # Only available in overlays
+ $(use_enable pulseaudio pulse)
+ $(use_enable jack)
+ $(use_enable openal)
+ --disable-opensles
+ $(use_enable alsa)
+ --disable-coreaudio
+
+ # Video outputs
+ --disable-cocoa
+ $(use_enable drm)
+ $(use_enable gbm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ $(use_enable xscreensaver xss)
+ $(use_enable X xext)
+ $(use_enable xv)
+ $(use_enable xinerama)
+ $(use_enable X xrandr)
+ $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(use_enable wayland gl-wayland)
+ $(use_enable vdpau)
+ $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+ $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+ $(use_enable libcaca caca)
+ $(use_enable jpeg)
+ --disable-android
+ $(use_enable raspberry-pi rpi)
+ $(use_enable opengl desktop-gl)
+
+ # HWaccels
+ $(use_enable vaapi vaapi-hwaccel)
+ # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
+
+ # TV features
+ $(use_enable v4l tv)
+ $(use_enable v4l tv-v4l2)
+ $(use_enable v4l libv4l2)
+ $(use_enable v4l audio-input)
+ $(use_enable dvb dvbin)
+ )
+
+ if use vaapi && use X; then
+ mywafargs+=(
+ $(use_enable opengl vaapi-glx)
+ $(use_enable egl vaapi-x-egl)
+ )
+ fi
+
+ # Create reproducible non-live builds
+ [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+ waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+ waf-utils_src_install
+
+ if use cli && use luajit; then
+ pax-mark -m "${ED}usr/bin/${PN}"
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+src_test() {
+ cd "${S}"/build/test || die
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-03-10 21:51 Patrice Clement
0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2016-03-10 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 34da076f6b14edbef02c8fe91e9e19deefb49269
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Thu Mar 10 17:51:05 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Mar 10 21:35:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34da076f
media-video/mpv: remove old
Gentoo-Bug: https://bugs.gentoo.org/576748
Closes: https://github.com/gentoo/gentoo/pull/1026
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
Package-Manager: portage-2.2.27
media-video/mpv/Manifest | 1 -
.../mpv-0.15.0-fix-null-pointer-dereference.patch | 21 --
...pv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch | 23 --
media-video/mpv/mpv-0.15.0-r1.ebuild | 304 ---------------------
media-video/mpv/mpv-0.16.0.ebuild | 302 --------------------
5 files changed, 651 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index e8307fd..57e84db 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,3 @@
-DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d
DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
diff --git a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch
deleted file mode 100644
index 4cc4c87..0000000
--- a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 5053f4cc3f48538c3d9a3ba13dc98442f3302052
-Author: wm4 <wm4@nowhere>
-Date: Mon Jan 18 20:10:28 2016 +0100
-
- command: fix NULL pointer deref in "video-codec" property
-
- Fixes #2729.
-
-diff --git a/player/command.c b/player/command.c
-index 3c7cfb2..413349d 100644
---- a/player/command.c
-+++ b/player/command.c
-@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void *ctx, struct m_property *prop,
- {
- MPContext *mpctx = ctx;
- struct track *track = mpctx->current_track[0][STREAM_VIDEO];
-- const char *c = track->d_video ? track->d_video->decoder_desc : NULL;
-+ const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL;
- return m_property_strdup_ro(action, arg, c);
- }
-
diff --git a/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch b/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch
deleted file mode 100644
index dc55c98..0000000
--- a/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit a8abb53a5d00d023aa6cb753ccaa6810e1640338
-Author: wm4 <wm4@nowhere>
-Date: Wed Jan 20 15:35:15 2016 +0100
-
- vaapi: fix compilation on older FFmpeg/Libav
-
- They don't define FF_PROFILE_VP9_0.
-
- Fixes #2737.
-
-diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c
-index edc95f5..313a901 100644
---- a/video/decode/vaapi.c
-+++ b/video/decode/vaapi.c
-@@ -109,7 +109,7 @@ static const struct va_native_display disp_x11 = {
- #endif
-
- #define HAS_HEVC VA_CHECK_VERSION(0, 38, 0)
--#define HAS_VP9 VA_CHECK_VERSION(0, 38, 1)
-+#define HAS_VP9 (VA_CHECK_VERSION(0, 38, 1) && defined(FF_PROFILE_VP9_0))
-
- #define PE(av_codec_id, ff_profile, vdp_profile) \
- {AV_CODEC_ID_ ## av_codec_id, FF_PROFILE_ ## ff_profile, \
diff --git a/media-video/mpv/mpv-0.15.0-r1.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild
deleted file mode 100644
index d30f5e7..0000000
--- a/media-video/mpv/mpv-0.15.0-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV='1.8.12'
-
-inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
- inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md )
-
-# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
-LICENSE="GPL-2+ BSD ISC"
-SLOT="0"
-# Here 'opengl' stands for GLX, 'egl' stands for any EGL-based output
-IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
- +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
- openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
- test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
- xv zsh-completion"
-
-REQUIRED_USE="
- || ( cli libmpv )
- egl? ( || ( gbm X wayland ) )
- enca? ( iconv )
- gbm? ( drm egl )
- lcms? ( || ( opengl egl ) )
- libguess? ( iconv )
- luajit? ( lua )
- opengl? ( X )
- uchardet? ( iconv )
- v4l? ( || ( alsa oss ) )
- vaapi? ( || ( X wayland ) )
- vdpau? ( X )
- wayland? ( egl )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
- zsh-completion? ( cli )
-"
-
-COMMON_DEPEND="
- !libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
- libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
- sys-libs/zlib
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.0.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0 )
- cdda? ( dev-libs/libcdio-paranoia )
- drm? ( x11-libs/libdrm )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? (
- >=media-libs/libdvdnav-4.2.0
- >=media-libs/libdvdread-4.1.0
- )
- egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
- iconv? (
- virtual/libiconv
- enca? ( app-i18n/enca )
- libguess? ( >=app-i18n/libguess-1.0 )
- uchardet? ( dev-libs/uchardet )
- )
- jack? ( media-sound/jack-audio-connection-kit )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( >=media-libs/lcms-2.6:2 )
- libass? (
- >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
- virtual/ttf-fonts
- )
- libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
- luajit? ( dev-lang/luajit:2 )
- )
- openal? ( >=media-libs/openal-1.13 )
- pulseaudio? ( media-sound/pulseaudio )
- rubberband? ( >=media-libs/rubberband-1.8.0 )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
- v4l? ( media-libs/libv4l )
- vaapi? ( >=x11-libs/libva-1.4.0[X?,wayland?] )
- wayland? (
- >=dev-libs/wayland-1.6.0
- >=x11-libs/libxkbcommon-0.3.0
- )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libXrandr-1.2.0
- opengl? (
- x11-libs/libXdamage
- virtual/opengl
- )
- vdpau? ( >=x11-libs/libvdpau-0.2 )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.8
- dev-python/docutils
- virtual/pkgconfig
- doc? ( dev-python/rst2pdf )
- test? ( >=dev-util/cmocka-1.0.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
- die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
- fi
-
- if ! use libass; then
- ewarn "You have disabled the libass support."
- ewarn "OSD and subtitles won't be available."
- fi
-
- if use openal; then
- ewarn "You have enabled the openal audio output. Be warned that"
- ewarn "this output is considered experimental by upstream."
- fi
-
- if use sdl; then
- ewarn "You have enabled the sdl video and audio outputs. Note that"
- ewarn "upstream provides these outputs for compatibility reasons only."
- ewarn "You probably don't need them under the normal circumstances."
- fi
-
- if use libav; then
- elog "You have enabled media-video/libav instead of media-video/ffmpeg."
- elog "Upstream recommends media-video/ffmpeg, as some functionality"
- elog "is not provided by media-video/libav."
- fi
-
- einfo "mpv optionally supports many different audio and video formats."
- einfo "You will need to enable support for the desired formats in your"
- einfo "libavcodec/libavformat provider:"
- einfo " media-video/ffmpeg or media-video/libav"
-}
-
-src_prepare() {
- cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
- chmod +x "${S}"/waf || die
-
- epatch "${FILESDIR}/${P}-fix-null-pointer-dereference.patch"
- epatch "${FILESDIR}/${P}-fix-vaapi-build-on-older-ffmpeg.patch"
- epatch_user
-}
-
-src_configure() {
- local mywafargs=(
- --confdir="${EPREFIX}"/etc/${PN}
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
-
- --disable-gpl3 # Unclear license info. See Gentoo bug 571728.
-
- $(usex cli '' '--disable-cplayer')
- $(use_enable libmpv libmpv-shared)
-
- # See deep down below for build-date
- --disable-libmpv-static
- --disable-static-build
- --disable-optimize # Do not add '-O2' to CFLAGS
- --disable-debug-build # Do not add '-g' to CFLAGS
-
- $(use_enable doc html-build)
- $(use_enable doc pdf-build)
- $(use_enable vf-dlopen vf-dlopen-filters)
- $(use_enable zsh-completion zsh-comp)
- $(use_enable test)
-
- $(use_enable iconv)
- $(use_enable samba libsmbclient)
- $(use_enable lua)
- $(usex luajit '--lua=luajit' '')
- $(use_enable libass)
- $(use_enable libass libass-osd)
- $(use_enable encode encoding)
- $(use_enable bluray libbluray)
- $(use_enable dvd dvdread)
- $(use_enable dvd dvdnav)
- $(use_enable cdda)
- $(use_enable enca)
- $(use_enable libguess)
- $(use_enable uchardet)
- $(use_enable rubberband)
- $(use_enable lcms lcms2)
- --disable-vapoursynth # Only available in overlays
- --disable-vapoursynth-lazy
- $(use_enable archive libarchive)
-
- --enable-libavfilter
- --enable-libavdevice
-
- # Audio outputs
- $(use_enable sdl sdl2) # Listed under audio, but also includes video
- --disable-sdl1
- $(use_enable oss oss-audio)
- --disable-rsound # Only available in overlays
- $(use_enable pulseaudio pulse)
- $(use_enable jack)
- $(use_enable openal)
- $(use_enable alsa)
- --disable-coreaudio
-
- # Video outputs
- --disable-cocoa
- $(use_enable drm)
- $(use_enable gbm)
- $(use_enable wayland)
- $(use_enable X x11)
- $(use_enable xscreensaver xss)
- $(use_enable X xext)
- $(use_enable xv)
- $(use_enable xinerama)
- $(use_enable X xrandr)
- $(use_enable opengl gl-x11)
- $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
- $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
- $(use_enable wayland gl-wayland)
- $(use_enable vdpau)
- $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
- $(use_enable vaapi) # See below for vaapi-x-egl
- $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
- $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
- $(usex vaapi "$(use_enable opengl vaapi-glx)" '--disable-vaapi-glx')
- $(use_enable libcaca caca)
- $(use_enable jpeg)
- $(use_enable raspberry-pi rpi)
-
- # HWaccels
- $(use_enable vaapi vaapi-hwaccel)
- # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
-
- # TV features
- $(use_enable v4l tv)
- $(use_enable v4l tv-v4l2)
- $(use_enable v4l libv4l2)
- $(use_enable v4l audio-input)
- $(use_enable dvb dvbin)
- )
-
- if use vaapi && use X && use egl; then
- mywafargs+=(--enable-vaapi-x-egl)
- else
- mywafargs+=(--disable-vaapi-x-egl)
- fi
-
- # Create reproducible non-live builds
- [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
- waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
- waf-utils_src_install
-
- if use cli && use luajit; then
- pax-mark -m "${ED}usr/bin/${PN}"
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-src_test() {
- cd "${S}"/build/test || die
- for test in *; do
- if [[ -x ${test} ]]; then
- ./"${test}" || die "Test suite failed"
- fi
- done
-}
diff --git a/media-video/mpv/mpv-0.16.0.ebuild b/media-video/mpv/mpv-0.16.0.ebuild
deleted file mode 100644
index 1d18f73..0000000
--- a/media-video/mpv/mpv-0.16.0.ebuild
+++ /dev/null
@@ -1,302 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV='1.8.12'
-
-inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
- inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md )
-
-# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
-LICENSE="GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
- +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
- openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl selinux
- test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
- +xv zsh-completion"
-
-REQUIRED_USE="
- || ( cli libmpv )
- egl? ( || ( gbm X wayland ) )
- enca? ( iconv )
- gbm? ( drm egl )
- lcms? ( || ( opengl egl ) )
- libguess? ( iconv )
- luajit? ( lua )
- uchardet? ( iconv )
- v4l? ( || ( alsa oss ) )
- vaapi? ( || ( gbm X wayland ) )
- vdpau? ( X )
- wayland? ( egl )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
- zsh-completion? ( cli )
-"
-
-COMMON_DEPEND="
- !libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
- libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
- sys-libs/zlib
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.0.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0 )
- cdda? ( dev-libs/libcdio-paranoia )
- drm? ( x11-libs/libdrm )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? (
- >=media-libs/libdvdnav-4.2.0
- >=media-libs/libdvdread-4.1.0
- )
- egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
- iconv? (
- virtual/libiconv
- enca? ( app-i18n/enca )
- libguess? ( >=app-i18n/libguess-1.0 )
- uchardet? ( dev-libs/uchardet )
- )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( >=media-libs/lcms-2.6:2 )
- libass? (
- >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
- virtual/ttf-fonts
- )
- libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
- luajit? ( dev-lang/luajit:2 )
- )
- openal? ( >=media-libs/openal-1.13 )
- opengl? ( virtual/opengl )
- pulseaudio? ( media-sound/pulseaudio )
- rubberband? ( >=media-libs/rubberband-1.8.0 )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
- v4l? ( media-libs/libv4l )
- vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
- wayland? (
- >=dev-libs/wayland-1.6.0
- >=x11-libs/libxkbcommon-0.3.0
- )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libXrandr-1.2.0
- opengl? ( x11-libs/libXdamage )
- vdpau? ( >=x11-libs/libvdpau-0.2 )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.8
- dev-python/docutils
- virtual/pkgconfig
- doc? ( dev-python/rst2pdf )
- test? ( >=dev-util/cmocka-1.0.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
- die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
- fi
-
- if ! use libass; then
- ewarn "You have disabled the libass support."
- ewarn "OSD and subtitles won't be available."
- fi
-
- if use openal; then
- ewarn "You have enabled the openal audio output. Be warned that"
- ewarn "this output is considered experimental by upstream."
- fi
-
- if use sdl; then
- ewarn "You have enabled the sdl video and audio outputs. Note that"
- ewarn "upstream provides these outputs for compatibility reasons only."
- ewarn "You probably don't need them under the normal circumstances."
- fi
-
- if use libav; then
- elog "You have enabled media-video/libav instead of media-video/ffmpeg."
- elog "Upstream recommends media-video/ffmpeg, as some functionality"
- elog "is not provided by media-video/libav."
- fi
-
- einfo "mpv optionally supports many different audio and video formats."
- einfo "You will need to enable support for the desired formats in your"
- einfo "libavcodec/libavformat provider:"
- einfo " media-video/ffmpeg or media-video/libav"
-}
-
-src_prepare() {
- cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
- chmod +x "${S}"/waf || die
-
- epatch "${FILESDIR}/${P}-fix-srt-subtitles-on-libav.patch"
- epatch_user
-}
-
-src_configure() {
- local mywafargs=(
- --confdir="${EPREFIX}"/etc/${PN}
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
-
- --disable-gpl3 # Unclear license info. See Gentoo bug 571728.
-
- $(usex cli '' '--disable-cplayer')
- $(use_enable libmpv libmpv-shared)
-
- # See deep down below for build-date
- --disable-libmpv-static
- --disable-static-build
- --disable-optimize # Do not add '-O2' to CFLAGS
- --disable-debug-build # Do not add '-g' to CFLAGS
-
- $(use_enable doc html-build)
- $(use_enable doc pdf-build)
- $(use_enable vf-dlopen vf-dlopen-filters)
- $(use_enable zsh-completion zsh-comp)
- $(use_enable test)
-
- $(use_enable iconv)
- $(use_enable samba libsmbclient)
- $(use_enable lua)
- $(usex luajit '--lua=luajit' '')
- $(use_enable libass)
- $(use_enable libass libass-osd)
- $(use_enable encode encoding)
- $(use_enable bluray libbluray)
- $(use_enable dvd dvdread)
- $(use_enable dvd dvdnav)
- $(use_enable cdda)
- $(use_enable enca)
- $(use_enable libguess)
- $(use_enable uchardet)
- $(use_enable rubberband)
- $(use_enable lcms lcms2)
- --disable-vapoursynth # Only available in overlays
- --disable-vapoursynth-lazy
- $(use_enable archive libarchive)
-
- --enable-libavdevice
-
- # Audio outputs
- $(use_enable sdl sdl2) # Listed under audio, but also includes video
- --disable-sdl1
- $(use_enable oss oss-audio)
- --disable-rsound # Only available in overlays
- $(use_enable pulseaudio pulse)
- $(use_enable jack)
- $(use_enable openal)
- --disable-opensles
- $(use_enable alsa)
- --disable-coreaudio
-
- # Video outputs
- --disable-cocoa
- $(use_enable drm)
- $(use_enable gbm)
- $(use_enable wayland)
- $(use_enable X x11)
- $(use_enable xscreensaver xss)
- $(use_enable X xext)
- $(use_enable xv)
- $(use_enable xinerama)
- $(use_enable X xrandr)
- $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
- $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
- $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
- $(use_enable wayland gl-wayland)
- $(use_enable vdpau)
- $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
- $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl
- $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
- $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
- $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
- $(use_enable libcaca caca)
- $(use_enable jpeg)
- --disable-android
- $(use_enable raspberry-pi rpi)
- $(use_enable opengl desktop-gl)
-
- # HWaccels
- $(use_enable vaapi vaapi-hwaccel)
- # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
-
- # TV features
- $(use_enable v4l tv)
- $(use_enable v4l tv-v4l2)
- $(use_enable v4l libv4l2)
- $(use_enable v4l audio-input)
- $(use_enable dvb dvbin)
- )
-
- if use vaapi && use X; then
- mywafargs+=(
- $(use_enable opengl vaapi-glx)
- $(use_enable egl vaapi-x-egl)
- )
- fi
-
- # Create reproducible non-live builds
- [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
- waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
- waf-utils_src_install
-
- if use cli && use luajit; then
- pax-mark -m "${ED}usr/bin/${PN}"
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-src_test() {
- cd "${S}"/build/test || die
- for test in *; do
- if [[ -x ${test} ]]; then
- ./"${test}" || die "Test suite failed"
- fi
- done
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-03-14 18:20 Ian Delaney
0 siblings, 0 replies; 17+ messages in thread
From: Ian Delaney @ 2016-03-14 18:20 UTC (permalink / raw
To: gentoo-commits
commit: c0ecbdc63848f418471175376d55ee041894a019
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Mar 14 16:26:13 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 18:20:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ecbdc6
media-video/mpv: revbump to 0.16.0-r2 to backport another regression fix
Backport one more fix [1] for two regressions reported upstream [2,3].
Hopefully it's the final revbump unless something critical pops up.
[1]: https://github.com/mpv-player/mpv/commit/c13c9945
[2]: https://github.com/mpv-player/mpv/issues/2920
[3]: https://github.com/mpv-player/mpv/issues/2929
Closes: https://github.com/gentoo/gentoo/pull/1046
Package-Manager: portage-2.2.28
...-0.16.0-add-missing-audio-reconfig-events.patch | 33 ++++++++++++++++++++++
.../{mpv-0.16.0-r1.ebuild => mpv-0.16.0-r2.ebuild} | 1 +
2 files changed, 34 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch b/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch
new file mode 100644
index 0000000..b01e126
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch
@@ -0,0 +1,33 @@
+commit c13c9945bf84817ee1dd2d65e58660fb38e23a7f
+Author: wm4 <wm4@nowhere>
+Date: Sun Mar 13 15:52:17 2016 +0100
+
+ player: add missing audio reconfig events
+
+ This also takes care of sending the required property change
+ notifications.
+
+ Fixes #2929 and maybe fixes #2920.
+
+diff --git a/player/audio.c b/player/audio.c
+index f17587a..3a2c60b 100644
+--- a/player/audio.c
++++ b/player/audio.c
+@@ -134,6 +134,8 @@ static int recreate_audio_filters(struct MPContext *mpctx)
+
+ mixer_reinit_audio(mpctx->mixer, mpctx->ao, afs);
+
++ mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL);
++
+ return 0;
+
+ fail:
+@@ -368,6 +370,8 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx)
+
+ update_playback_speed(mpctx);
+
++ mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL);
++
+ return;
+
+ init_error:
diff --git a/media-video/mpv/mpv-0.16.0-r1.ebuild b/media-video/mpv/mpv-0.16.0-r2.ebuild
similarity index 99%
rename from media-video/mpv/mpv-0.16.0-r1.ebuild
rename to media-video/mpv/mpv-0.16.0-r2.ebuild
index ca8e4a1..9afd780 100644
--- a/media-video/mpv/mpv-0.16.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.16.0-r2.ebuild
@@ -127,6 +127,7 @@ PATCHES=(
"${FILESDIR}/${P}-set-correct-seekable-flags.patch"
"${FILESDIR}/${P}-fix-bitrate-calculation.patch"
"${FILESDIR}/${P}-fix-coverart-decoding.patch"
+ "${FILESDIR}/${P}-add-missing-audio-reconfig-events.patch"
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-04-12 18:47 Patrice Clement
0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2016-04-12 18:47 UTC (permalink / raw
To: gentoo-commits
commit: d942872359ff883adac37a80b1d5c8ad8f53347a
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Tue Apr 12 10:10:05 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 18:33:38 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9428723
media-video/mpv: remove old
Closes: https://github.com/gentoo/gentoo/pull/1249
Package-Manager: portage-2.2.28
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
media-video/mpv/Manifest | 1 -
...-0.16.0-add-missing-audio-reconfig-events.patch | 33 ---
...-0.16.0-avoid-NULL-dereference-on-wayland.patch | 23 --
.../files/mpv-0.16.0-fix-bitrate-calculation.patch | 31 ---
.../files/mpv-0.16.0-fix-coverart-decoding.patch | 39 ---
.../mpv-0.16.0-fix-srt-subtitles-on-libav.patch | 29 ---
.../mpv-0.16.0-set-correct-seekable-flags.patch | 36 ---
media-video/mpv/mpv-0.16.0-r2.ebuild | 282 ---------------------
8 files changed, 474 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 2ad0738..a3873c8 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,3 @@
-DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312
DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
diff --git a/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch b/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch
deleted file mode 100644
index b01e126..0000000
--- a/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit c13c9945bf84817ee1dd2d65e58660fb38e23a7f
-Author: wm4 <wm4@nowhere>
-Date: Sun Mar 13 15:52:17 2016 +0100
-
- player: add missing audio reconfig events
-
- This also takes care of sending the required property change
- notifications.
-
- Fixes #2929 and maybe fixes #2920.
-
-diff --git a/player/audio.c b/player/audio.c
-index f17587a..3a2c60b 100644
---- a/player/audio.c
-+++ b/player/audio.c
-@@ -134,6 +134,8 @@ static int recreate_audio_filters(struct MPContext *mpctx)
-
- mixer_reinit_audio(mpctx->mixer, mpctx->ao, afs);
-
-+ mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL);
-+
- return 0;
-
- fail:
-@@ -368,6 +370,8 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx)
-
- update_playback_speed(mpctx);
-
-+ mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL);
-+
- return;
-
- init_error:
diff --git a/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch b/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch
deleted file mode 100644
index 9af5e24..0000000
--- a/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit 5c2026336419805202fbf7a817b2960b0584ce5d
-Author: wm4 <wm4@nowhere>
-Date: Thu Mar 3 15:30:28 2016 +0100
-
- vo_opengl: wayland: don't destroy NULL wl_egl_window
-
- The wayland client API crashes intentionally when trying to free NULL
- objects. (Thanks.)
-
-diff --git a/video/out/opengl/context_wayland.c b/video/out/opengl/context_wayland.c
-index 63a1453..a100073 100644
---- a/video/out/opengl/context_wayland.c
-+++ b/video/out/opengl/context_wayland.c
-@@ -183,7 +183,8 @@ static void waylandgl_uninit(MPGLContext *ctx)
-
- if (wl->egl_context.egl.ctx) {
- eglReleaseThread();
-- wl_egl_window_destroy(wl->egl_context.egl_window);
-+ if (wl->egl_context.egl_window)
-+ wl_egl_window_destroy(wl->egl_context.egl_window);
- eglDestroySurface(wl->egl_context.egl.dpy, wl->egl_context.egl_surface);
- eglMakeCurrent(wl->egl_context.egl.dpy, NULL, NULL, EGL_NO_CONTEXT);
- eglDestroyContext(wl->egl_context.egl.dpy, wl->egl_context.egl.ctx);
diff --git a/media-video/mpv/files/mpv-0.16.0-fix-bitrate-calculation.patch b/media-video/mpv/files/mpv-0.16.0-fix-bitrate-calculation.patch
deleted file mode 100644
index 2515b3a..0000000
--- a/media-video/mpv/files/mpv-0.16.0-fix-bitrate-calculation.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 5c1fe2a4f3e559a0c6a010e48b0c225d01c1cd0a
-Author: wm4 <wm4@nowhere>
-Date: Sat Mar 5 12:48:58 2016 +0100
-
- demux: delay bitrate calculation on packets with unknown timestamps
-
- Commit 503c6f7f essentially removed timestamps from "laces" (Block sub-
- divisions), which means many audio packets will have no timestamp.
- There's no reason why bitrate calculation can't just delayed to a point
- when the next timestamp is known.
-
- Fixes #2903 (no audio bitrate with mkv files).
-
-diff --git a/demux/demux.c b/demux/demux.c
-index bd3211a..a7241d9 100644
---- a/demux/demux.c
-+++ b/demux/demux.c
-@@ -681,11 +681,11 @@ static struct demux_packet *dequeue_packet(struct demux_stream *ds)
- if (ts != MP_NOPTS_VALUE)
- ds->base_ts = ts;
-
-- if (pkt->keyframe) {
-+ if (pkt->keyframe && ts != MP_NOPTS_VALUE) {
- // Update bitrate - only at keyframe points, because we use the
- // (possibly) reordered packet timestamps instead of realtime.
- double d = ts - ds->last_br_ts;
-- if (ts == MP_NOPTS_VALUE || ds->last_br_ts == MP_NOPTS_VALUE || d < 0) {
-+ if (ds->last_br_ts == MP_NOPTS_VALUE || d < 0) {
- ds->bitrate = -1;
- ds->last_br_ts = ts;
- ds->last_br_bytes = 0;
diff --git a/media-video/mpv/files/mpv-0.16.0-fix-coverart-decoding.patch b/media-video/mpv/files/mpv-0.16.0-fix-coverart-decoding.patch
deleted file mode 100644
index 1166b36..0000000
--- a/media-video/mpv/files/mpv-0.16.0-fix-coverart-decoding.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit c53c6bbd387ca582091a8bfca33140d65c200be0
-Author: wm4 <wm4@nowhere>
-Date: Mon Mar 7 15:00:08 2016 +0100
-
- video: fix coverart decoding
-
- Deselecting cover art and then reselecting it did not work. The second
- time the cover art picture is not displayed again. (This seems to break
- every other month...)
-
- The reason is commit 6640b22a. It mutates the input packet. And it is
- correct that we don't own d_video->header->attached_picture at this
- point. Fix it by creating a new packet reference.
-
-diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
-index e8a5774..fc0b090 100644
---- a/video/decode/dec_video.c
-+++ b/video/decode/dec_video.c
-@@ -363,9 +363,10 @@ void video_work(struct dec_video *d_video)
- return;
-
- if (d_video->header->attached_picture) {
-+ struct demux_packet *packet =
-+ demux_copy_packet(d_video->header->attached_picture);
- if (d_video->current_state == DATA_AGAIN && !d_video->cover_art_mpi) {
-- d_video->cover_art_mpi =
-- decode_packet(d_video, d_video->header->attached_picture, 0);
-+ d_video->cover_art_mpi = decode_packet(d_video, packet, 0);
- // Might need flush.
- if (!d_video->cover_art_mpi)
- d_video->cover_art_mpi = decode_packet(d_video, NULL, 0);
-@@ -375,6 +376,7 @@ void video_work(struct dec_video *d_video)
- d_video->current_mpi = mp_image_new_ref(d_video->cover_art_mpi);
- // (DATA_OK is returned the first time, when current_mpi is sill set)
- d_video->current_state = DATA_EOF;
-+ talloc_free(packet);
- return;
- }
-
diff --git a/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch b/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch
deleted file mode 100644
index 4344e78..0000000
--- a/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 041c9f1782cbed4abf7793f4e72b8b29b2fd9b1b
-Author: wm4 <wm4@nowhere>
-Date: Mon Feb 29 18:20:27 2016 +0100
-
- lavc_conv: fix Libav srt subtitles
-
- Use the mp_lavc_set_extradata() function instead of setting up the
- extradata manually. This takes care of the corner case when
- extradata_len is 0.
-
- This apparently fixes #2888.
-
-diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c
-index 3dd6097..7303020 100644
---- a/sub/lavc_conv.c
-+++ b/sub/lavc_conv.c
-@@ -79,11 +79,8 @@ struct lavc_conv *lavc_conv_create(struct mp_log *log, const char *codec_name,
- avctx = avcodec_alloc_context3(codec);
- if (!avctx)
- goto error;
-- avctx->extradata_size = extradata_len;
-- avctx->extradata = av_malloc(extradata_len);
-- if (!avctx->extradata)
-+ if (mp_lavc_set_extradata(avctx, extradata, extradata_len) < 0)
- goto error;
-- memcpy(avctx->extradata, extradata, extradata_len);
- if (strcmp(codec_name, "eia_608") == 0)
- av_dict_set(&opts, "real_time", "1", 0);
- if (avcodec_open2(avctx, codec, &opts) < 0)
diff --git a/media-video/mpv/files/mpv-0.16.0-set-correct-seekable-flags.patch b/media-video/mpv/files/mpv-0.16.0-set-correct-seekable-flags.patch
deleted file mode 100644
index 75ac650..0000000
--- a/media-video/mpv/files/mpv-0.16.0-set-correct-seekable-flags.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit a6f8a6977ec59d314b617780c60e374b585ebaca
-Author: wm4 <wm4@nowhere>
-Date: Thu Mar 3 15:30:55 2016 +0100
-
- demux_timeline: set correct seekable flags
-
- Tricky misleading crap.
-
- Fixes #2898.
-
-diff --git a/demux/demux.h b/demux/demux.h
-index e882e90..2c1e3a2 100644
---- a/demux/demux.h
-+++ b/demux/demux.h
-@@ -174,7 +174,7 @@ typedef struct demuxer {
- int64_t filepos; // input stream current pos.
- char *filename; // same as stream->url
- bool seekable;
-- bool partially_seekable; // implies seekable=true
-+ bool partially_seekable; // true if _maybe_ seekable; implies seekable=true
- double start_time;
- // File format allows PTS resets (even if the current file is without)
- bool ts_resets_possible;
-diff --git a/demux/demux_timeline.c b/demux/demux_timeline.c
-index 0c6c398..92cf1e6 100644
---- a/demux/demux_timeline.c
-+++ b/demux/demux_timeline.c
-@@ -344,7 +344,7 @@ static int d_open(struct demuxer *demuxer, enum demux_check check)
- print_timeline(demuxer);
-
- demuxer->seekable = true;
-- demuxer->partially_seekable = true;
-+ demuxer->partially_seekable = false;
-
- demuxer->filetype = meta->filetype ? meta->filetype : meta->desc->name;
-
diff --git a/media-video/mpv/mpv-0.16.0-r2.ebuild b/media-video/mpv/mpv-0.16.0-r2.ebuild
deleted file mode 100644
index 9afd780..0000000
--- a/media-video/mpv/mpv-0.16.0-r2.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV='1.8.12'
-
-inherit fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
- inherit git-r3
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md )
-
-# See Copyright in source tarball and bug #506946. Waf is BSD, libmpv is ISC.
-LICENSE="GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa archive bluray cdda +cli doc drm dvb +dvd +egl +enca encode gbm
- +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua luajit
- openal +opengl oss pulseaudio raspberry-pi rubberband samba -sdl selinux
- test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama +xscreensaver
- +xv zsh-completion"
-
-REQUIRED_USE="
- || ( cli libmpv )
- egl? ( || ( gbm X wayland ) )
- enca? ( iconv )
- gbm? ( drm egl )
- lcms? ( || ( opengl egl ) )
- libguess? ( iconv )
- luajit? ( lua )
- uchardet? ( iconv )
- v4l? ( || ( alsa oss ) )
- vaapi? ( || ( gbm X wayland ) )
- vdpau? ( X )
- wayland? ( egl )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
- zsh-completion? ( cli )
-"
-
-COMMON_DEPEND="
- !libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
- libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
- sys-libs/zlib
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.0.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0 )
- cdda? ( dev-libs/libcdio-paranoia )
- drm? ( x11-libs/libdrm )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? (
- >=media-libs/libdvdnav-4.2.0
- >=media-libs/libdvdread-4.1.0
- )
- egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
- iconv? (
- virtual/libiconv
- enca? ( app-i18n/enca )
- libguess? ( >=app-i18n/libguess-1.0 )
- uchardet? ( dev-libs/uchardet )
- )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( >=media-libs/lcms-2.6:2 )
- libass? (
- >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
- virtual/ttf-fonts
- )
- libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- lua? (
- !luajit? ( || ( =dev-lang/lua-5.1*:= =dev-lang/lua-5.2*:= ) )
- luajit? ( dev-lang/luajit:2 )
- )
- openal? ( >=media-libs/openal-1.13 )
- opengl? ( virtual/opengl )
- pulseaudio? ( media-sound/pulseaudio )
- rubberband? ( >=media-libs/rubberband-1.8.0 )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
- v4l? ( media-libs/libv4l )
- vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
- wayland? (
- >=dev-libs/wayland-1.6.0
- >=x11-libs/libxkbcommon-0.3.0
- )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- >=x11-libs/libXrandr-1.2.0
- opengl? ( x11-libs/libXdamage )
- vdpau? ( >=x11-libs/libvdpau-0.2 )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- >=dev-lang/perl-5.8
- dev-python/docutils
- virtual/pkgconfig
- doc? ( dev-python/rst2pdf )
- test? ( >=dev-util/cmocka-1.0.0 )
-"
-RDEPEND="${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-srt-subtitles-on-libav.patch"
- "${FILESDIR}/${P}-avoid-NULL-dereference-on-wayland.patch"
- "${FILESDIR}/${P}-set-correct-seekable-flags.patch"
- "${FILESDIR}/${P}-fix-bitrate-calculation.patch"
- "${FILESDIR}/${P}-fix-coverart-decoding.patch"
- "${FILESDIR}/${P}-add-missing-audio-reconfig-events.patch"
-)
-
-pkg_pretend() {
- if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
- die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
- fi
-}
-
-src_prepare() {
- cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
- chmod +x "${S}"/waf || die
- default
-}
-
-src_configure() {
- local mywafargs=(
- --confdir="${EPREFIX}"/etc/${PN}
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
-
- --disable-gpl3 # Unclear license info. See Gentoo bug 571728.
-
- $(usex cli '' '--disable-cplayer')
- $(use_enable libmpv libmpv-shared)
-
- # See deep down below for build-date
- --disable-libmpv-static
- --disable-static-build
- --disable-optimize # Do not add '-O2' to CFLAGS
- --disable-debug-build # Do not add '-g' to CFLAGS
-
- $(use_enable doc html-build)
- $(use_enable doc pdf-build)
- $(use_enable vf-dlopen vf-dlopen-filters)
- $(use_enable zsh-completion zsh-comp)
- $(use_enable test)
-
- $(use_enable iconv)
- $(use_enable samba libsmbclient)
- $(use_enable lua)
- $(usex luajit '--lua=luajit' '')
- $(use_enable libass)
- $(use_enable libass libass-osd)
- $(use_enable encode encoding)
- $(use_enable bluray libbluray)
- $(use_enable dvd dvdread)
- $(use_enable dvd dvdnav)
- $(use_enable cdda)
- $(use_enable enca)
- $(use_enable libguess)
- $(use_enable uchardet)
- $(use_enable rubberband)
- $(use_enable lcms lcms2)
- --disable-vapoursynth # Only available in overlays
- --disable-vapoursynth-lazy
- $(use_enable archive libarchive)
-
- --enable-libavdevice
-
- # Audio outputs
- $(use_enable sdl sdl2) # Listed under audio, but also includes video
- --disable-sdl1
- $(use_enable oss oss-audio)
- --disable-rsound # Only available in overlays
- $(use_enable pulseaudio pulse)
- $(use_enable jack)
- $(use_enable openal)
- --disable-opensles
- $(use_enable alsa)
- --disable-coreaudio
-
- # Video outputs
- --disable-cocoa
- $(use_enable drm)
- $(use_enable gbm)
- $(use_enable wayland)
- $(use_enable X x11)
- $(use_enable xscreensaver xss)
- $(use_enable X xext)
- $(use_enable xv)
- $(use_enable xinerama)
- $(use_enable X xrandr)
- $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
- $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
- $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
- $(use_enable wayland gl-wayland)
- $(use_enable vdpau)
- $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
- $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl
- $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
- $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
- $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
- $(use_enable libcaca caca)
- $(use_enable jpeg)
- --disable-android
- $(use_enable raspberry-pi rpi)
- $(use_enable opengl desktop-gl)
-
- # HWaccels
- $(use_enable vaapi vaapi-hwaccel)
- # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
-
- # TV features
- $(use_enable v4l tv)
- $(use_enable v4l tv-v4l2)
- $(use_enable v4l libv4l2)
- $(use_enable v4l audio-input)
- $(use_enable dvb dvbin)
- )
-
- if use vaapi && use X; then
- mywafargs+=(
- $(use_enable opengl vaapi-glx)
- $(use_enable egl vaapi-x-egl)
- )
- fi
-
- # Create reproducible non-live builds
- [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
- waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
- waf-utils_src_install
-
- if use cli && use luajit; then
- pax-mark -m "${ED}usr/bin/${PN}"
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-src_test() {
- cd "${S}"/build/test || die
- for test in *; do
- if [[ -x ${test} ]]; then
- ./"${test}" || die "Test suite failed"
- fi
- done
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-04-15 8:49 Sergei Trofimovich
0 siblings, 0 replies; 17+ messages in thread
From: Sergei Trofimovich @ 2016-04-15 8:49 UTC (permalink / raw
To: gentoo-commits
commit: e71956edb8c90d8896ac1b77e977d95ed70dea01
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 08:49:39 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 08:49:39 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71956ed
media-video/mpv: fix build failure against glibc-2.23
Added missing <math.h> header for pow() function.
Package-Manager: portage-2.2.28
media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch | 14 ++++++++++++++
media-video/mpv/mpv-0.17.0.ebuild | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch b/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch
new file mode 100644
index 0000000..ecd02aa
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch
@@ -0,0 +1,14 @@
+Fixes build failure on glibc-2.23
+
+../video/out/opengl/lcms.c: In function 'get_vid_profile':
+../video/out/opengl/lcms.c:235:27: error: implicit declaration of function 'pow' [-Werror=implicit-function-declaration]
+ double binv = pow(src_black[i], 1.0/gamma);
+ ^
+diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c
+index 7db8da6..3eb3d53 100644
+--- a/video/out/opengl/lcms.c
++++ b/video/out/opengl/lcms.c
+@@ -17,2 +17,3 @@
+
++#include <math.h> /* pow() */
+ #include <string.h>
diff --git a/media-video/mpv/mpv-0.17.0.ebuild b/media-video/mpv/mpv-0.17.0.ebuild
index 4b22f41..7562eb5 100644
--- a/media-video/mpv/mpv-0.17.0.ebuild
+++ b/media-video/mpv/mpv-0.17.0.ebuild
@@ -126,7 +126,8 @@ RDEPEND="${COMMON_DEPEND}
selinux? ( sec-policy/selinux-mplayer )
"
-PATCHES=( "${FILESDIR}/${P}-fix-seeking-without-first-index-entry.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-seeking-without-first-index-entry.patch"
+ "${FILESDIR}/${P}-glibc-2.23.patch")
pkg_pretend() {
if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2016-08-15 20:54 Patrice Clement
0 siblings, 0 replies; 17+ messages in thread
From: Patrice Clement @ 2016-08-15 20:54 UTC (permalink / raw
To: gentoo-commits
commit: a48d19fdbe33b2ce09da35a1e065517d18d308d7
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 15:33:08 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 20:54:27 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48d19fd
media-video/mpv: verbump to 0.19.0
Also update ffmpeg patch to apply cleanly.
Package-Manager: portage-2.3.0
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
media-video/mpv/Manifest | 1 +
....19.0-make-ffmpeg-version-check-non-fatal.patch | 28 ++
media-video/mpv/mpv-0.19.0.ebuild | 321 +++++++++++++++++++++
3 files changed, 350 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 7ce6708..341ba86 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,6 +2,7 @@ DIST mpv-0.17.0-patches-06.tar.gz 14418 SHA256 a0fcf861ed50686f35556a9334581e1d7
DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61
DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af
DIST mpv-0.18.1.tar.gz 2763392 SHA256 e413d57fec4ad43b9f9b848f38d13fb921313fc9a4a64bf1e906c8d0f7a46329 SHA512 4ed94a5365d432d1fb07c11a8e40ed7564925eacec8b61576690b8f3d8ff82d4e0b2841cc941fb711c659c77ff67bfea86b66bd5f570d3ae953bce715981cd2a WHIRLPOOL 6c46555f31fdc240065e5500b055aa6845e0103b1e48a55a912b3fa3de777f10859d517c00f5f2651ef84b1da98457439335b8dad43b0a142a6b3b678c542b5f
+DIST mpv-0.19.0.tar.gz 2770618 SHA256 3df5811942cd1d71f48eb4720092fdafec11885bf6dd6d1d3e6413f32e5d67e2 SHA512 11a1318e0bcf937635e8f83bba615998c7a89ceb0fb0829cef9f510c215d142b205b5c26c617e95d95dfcfc3fbd212cee58cab2dae0b8b8250a44e998d18380f WHIRLPOOL bb1c016a51bae0a512f3383f252cf661414d6375e31d8a08a3885f2450cd772e38d102f26ffecfc6fec1b469f64b33f027dcc5c0e7ca22f171c074e628310bd3
DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe
DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b
DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e
diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch
new file mode 100644
index 0000000..96a1f56
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch
@@ -0,0 +1,28 @@
+player: make ffmpeg/libav version check non-fatal
+
+We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
+
+diff --git a/player/main.c b/player/main.c
+index 67dde34..ee133a9 100644
+--- a/player/main.c
++++ b/player/main.c
+@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
+ if (!print_libav_versions(mp_null_log, 0)) {
+ // Using mismatched libraries can be legitimate, but even then it's
+ // a bad idea. We don't acknowledge its usefulness and stability.
+- print_libav_versions(mpctx->log, MSGL_FATAL);
+- MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
+- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
+- "This is most likely a broken build and could\nresult in "
+- "misbehavior and crashes.\n\nmpv does not support this "
+- "configuration and will not run - rebuild mpv instead.\n");
+- return -1;
++ print_libav_versions(mpctx->log, MSGL_WARN);
++ MP_WARN(mpctx, "\nmpv was compiled against a different version of "
++ "FFmpeg/Libav than the shared\nlibrary it is linked against. "
++ "This is most likely a broken build and could\nresult in "
++ "misbehavior and crashes.\n\nUpstream does not support this "
++ "configuration.\nPlease rebuild mpv in case of any problems.\n");
+ }
+
+ if (opts->dump_stats && opts->dump_stats[0]) {
diff --git a/media-video/mpv/mpv-0.19.0.ebuild b/media-video/mpv/mpv-0.19.0.ebuild
new file mode 100644
index 0000000..35d45c3
--- /dev/null
+++ b/media-video/mpv/mpv-0.19.0.ebuild
@@ -0,0 +1,321 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.8.12
+
+inherit fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs versionator waf-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
+ EGIT_REPO_URI="git://github.com/mpv-player/mpv.git"
+ inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="GPL-2+ BSD ISC"
+SLOT="0"
+IUSE="aqua +alsa archive bluray cdda +cli coreaudio doc drm dvb dvd +egl +enca
+ encode gbm +iconv jack jpeg lcms +libass libav libcaca libguess libmpv lua
+ luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba -sdl
+ selinux test uchardet v4l vaapi vdpau vf-dlopen wayland +X xinerama
+ +xscreensaver +xv zsh-completion"
+
+REQUIRED_USE="
+ || ( cli libmpv )
+ aqua? ( opengl )
+ egl? ( || ( gbm X wayland ) )
+ enca? ( iconv )
+ gbm? ( drm egl )
+ lcms? ( || ( opengl egl ) )
+ libguess? ( iconv )
+ luajit? ( lua )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
+ vaapi? ( || ( gbm X wayland ) )
+ vdpau? ( X )
+ wayland? ( egl )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+ zsh-completion? ( cli )
+"
+
+COMMON_DEPEND="
+ !libav? ( >=media-video/ffmpeg-2.4:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-11:0=[encode?,threads,vaapi?,vdpau?] )
+ sys-libs/zlib
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
+ bluray? ( >=media-libs/libbluray-0.3.0 )
+ cdda? ( dev-libs/libcdio-paranoia )
+ drm? ( x11-libs/libdrm )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? (
+ >=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ enca? ( app-i18n/enca )
+ libguess? ( >=app-i18n/libguess-1.0 )
+ uchardet? ( dev-libs/uchardet )
+ )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ libass? (
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+ virtual/ttf-fonts
+ )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+ lua? (
+ !luajit? ( <dev-lang/lua-5.3:= )
+ luajit? ( dev-lang/luajit:2 )
+ )
+ openal? ( >=media-libs/openal-1.13 )
+ opengl? ( !aqua? ( virtual/opengl ) )
+ pulseaudio? ( media-sound/pulseaudio )
+ raspberry-pi? (
+ >=media-libs/raspberrypi-userland-0_pre20160305-r1
+ media-libs/mesa[egl,gles2]
+ )
+ rubberband? ( >=media-libs/rubberband-1.8.0 )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl2[sound,threads,video,X?,wayland?] )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( >=x11-libs/libva-1.4.0[drm?,X?,wayland?] )
+ wayland? (
+ >=dev-libs/wayland-1.6.0
+ >=x11-libs/libxkbcommon-0.3.0
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.2.0
+ opengl? ( x11-libs/libXdamage )
+ vdpau? ( >=x11-libs/libvdpau-0.2 )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ >=dev-lang/perl-5.8
+ dev-python/docutils
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ test? ( >=dev-util/cmocka-1.0.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+PATCHES=( "${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch" )
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
+ die "Your compiler lacks C++11 TLS support. Use GCC>=4.8.0 or Clang>=3.3."
+ fi
+}
+
+src_prepare() {
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+ default_src_prepare
+}
+
+src_configure() {
+ local mywafargs=(
+ --confdir="${EPREFIX}/etc/${PN}"
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+ $(usex cli '' '--disable-cplayer')
+ $(use_enable libmpv libmpv-shared)
+
+ # See deep down below for build-date.
+ --disable-libmpv-static
+ --disable-static-build
+ --disable-optimize # Don't add '-O2' to CFLAGS.
+ --disable-debug-build # Don't add '-g' to CFLAGS.
+ --enable-html-build
+
+ $(use_enable doc pdf-build)
+ $(use_enable vf-dlopen vf-dlopen-filters)
+ $(use_enable zsh-completion zsh-comp)
+ $(use_enable test)
+
+ $(use_enable iconv)
+ $(use_enable samba libsmbclient)
+ $(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
+ $(use_enable libass)
+ $(use_enable libass libass-osd)
+ $(use_enable encode encoding)
+ $(use_enable bluray libbluray)
+ $(use_enable dvd dvdread)
+ $(use_enable dvd dvdnav)
+ $(use_enable cdda)
+ $(use_enable enca)
+ $(use_enable libguess)
+ $(use_enable uchardet)
+ $(use_enable rubberband)
+ $(use_enable lcms lcms2)
+ --disable-vapoursynth # Only available in overlays.
+ --disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
+ --enable-libavdevice
+
+ # Audio outputs:
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video.
+ --disable-sdl1
+ $(use_enable oss oss-audio)
+ --disable-rsound # Only available in overlays.
+ $(use_enable pulseaudio pulse)
+ $(use_enable jack)
+ $(use_enable openal)
+ --disable-opensles
+ $(use_enable alsa)
+ $(use_enable coreaudio)
+
+ # Video outputs:
+ $(use_enable aqua cocoa)
+ $(use_enable drm)
+ $(use_enable gbm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ $(use_enable xscreensaver xss)
+ $(use_enable X xext)
+ $(use_enable xv)
+ $(use_enable xinerama)
+ $(use_enable X xrandr)
+ $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+ $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(use_enable wayland gl-wayland)
+ $(use_enable vdpau)
+ $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+ $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+ $(use_enable libcaca caca)
+ $(use_enable jpeg)
+ --disable-android
+ $(use_enable raspberry-pi rpi)
+ $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+
+ # HWaccels:
+ # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+ $(use_enable vaapi vaapi-hwaccel)
+ # Automagic VDPAU HW acceleration. See Gentoo bug 558870.
+
+ # TV features:
+ $(use_enable v4l tv)
+ $(use_enable v4l tv-v4l2)
+ $(use_enable v4l libv4l2)
+ $(use_enable v4l audio-input)
+ $(use_enable dvb dvbin)
+
+ # Miscellaneous features:
+ --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
+ )
+
+ if use vaapi && use X; then
+ mywafargs+=(
+ $(use_enable opengl vaapi-glx)
+ $(use_enable egl vaapi-x-egl)
+ )
+ fi
+
+ if ! use egl && ! use opengl && ! use raspberry-pi; then
+ mywafargs+=(--disable-gl)
+ fi
+
+ # Create reproducible non-live builds.
+ [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+ waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+ waf-utils_src_install
+
+ if use cli && use luajit; then
+ pax-mark -m "${ED}"usr/bin/${PN}
+ fi
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+
+ local softvol_0_18_1=0
+ for rv in ${REPLACING_VERSIONS}; do
+ version_compare ${rv} 0.18.1-r1
+ [[ $? -eq 1 ]] && softvol_0_18_1=1
+ done
+
+ if [[ ${softvol_0_18_1} -eq 1 ]]; then
+ echo
+ elog "Starting from version 0.18.1 the software volume control is"
+ elog "enabled by default, see:"
+ elog "https://github.com/mpv-player/mpv/blob/v0.18.1/DOCS/interface-changes.rst"
+ elog "https://github.com/mpv-player/mpv/issues/3322"
+ elog
+ elog "This means that volume controls don't change the system volume,"
+ elog "e.g. per-application volume with PulseAudio."
+ elog "If you want to restore the old behaviour, please refer to"
+ elog "https://bugs.gentoo.org/show_bug.cgi?id=588492#c7"
+ echo
+ fi
+
+ # bash-completion < 2.3-r1 already installs (mostly broken) mpv completion.
+ if use cli && ! has_version '<app-shells/bash-completion-2.3-r1' && \
+ ! has_version 'app-shells/mpv-bash-completion'; then
+ elog "If you want to have command-line completion via bash-completion,"
+ elog "please install app-shells/mpv-bash-completion."
+ fi
+
+ if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+ has_version 'app-shells/mpv-bash-completion'; then
+ elog "If command-line completion doesn't work after mpv update,"
+ elog "please rebuild app-shells/mpv-bash-completion."
+ fi
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+src_test() {
+ cd "${S}"/build/test || die
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2018-02-14 19:55 Michał Górny
0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2018-02-14 19:55 UTC (permalink / raw
To: gentoo-commits
commit: e834ef497c80f7b45a8b16d49df4c3649f61506c
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Tue Feb 13 20:43:05 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 19:55:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e834ef49
media-video/mpv: verbump to 0.27.1 and 0.28.1 with fix for CVE-2018-6360
Bug: https://bugs.gentoo.org/646886
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-video/mpv/Manifest | 3 +
...mpv-0.27.0-add-missing-link-flags-for-rpi.patch | 25 ++
media-video/mpv/mpv-0.27.1.ebuild | 374 +++++++++++++++++++++
media-video/mpv/mpv-0.28.1.ebuild | 361 ++++++++++++++++++++
4 files changed, 763 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index f68d7e9520b..7d531db6ac5 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -2,5 +2,8 @@ DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b65
DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf
DIST mpv-0.26.0.tar.gz 2916212 BLAKE2B b6402868face65c1179351697eff02116765eecdd105eef621faa73dc77f376aa060476bc80b92eba4839c46836c13bce0e56c6dccf0fe1aa49b1cfa463ec43e SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7
DIST mpv-0.27.0.tar.gz 2956816 BLAKE2B 2af0fc7edbecb552fd7df93dcd9124fd4e30a2c29aa53d2139f2817356a6c4eb82eed74a8fdf0493ebb0315cb2806d76a8b2d8c24706975acf4d4704fd291dac SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4
+DIST mpv-0.27.1-patches-r0.tar.xz 6580 BLAKE2B fdf5f580fbda9ec6856354d43fd80a177464af27ea6f65ab31c610996fced64670f178956b4030c9c34d0707f8fa4544c829e4401679d2e2d6e730b19ebfe6d8 SHA512 8f25c51f0a3c6b5304090144b8343afba4d872216f8fa13890240a51ac464bd2c486b017390d4d3398d7082ffdf3e617659861f15505bd2db72b6f5ab4500bcb
+DIST mpv-0.27.1.tar.gz 2957202 BLAKE2B 79dd06ba9399368f24c2c0a065218432110829af08d97cfdf753966ec7ca75e5af8f04da381f83251cb57bdce9b30c0d2d8c6fc772f73b5a0ed43139ce66a316 SHA512 3b8e12edb20b6ffdbbb02aba9cc64ad25e4fb583efc72248549641a46cc840827c1b6b017e7efc323d8a8299b7b094a676525bd978b8c3c9ecccca32fe39149a
DIST mpv-0.28.0.tar.gz 2982165 BLAKE2B 50f095d499df9685dec958287c159fc88be3b5db1465264404ba7c74184569ba47c147cb6491342ba8762199290f408737d03403e454a180bd0ed8b7191d14cc SHA512 33e889f9ca2dd16ad055ccd9fc5549fcead3fd15dcbc52c6b5f3ef608cf87b3d9952e9236e3dec8e7f32240b68d0b0cff1499f511d39c8f3a0501334f5c57a70
+DIST mpv-0.28.1.tar.gz 2982546 BLAKE2B ae078e3393b1113a8211699da1fea867324c50d3696ab82446996f04b2571b29791811b3d3dc082761ca36d63c9b1aa844d7cd56b740e73821b3e7ca35d39512 SHA512 7593e5dbb5963bf39f57f8a08f1b5142474897172a2c6cafcbfd3a83a2f0cfb9a3e5d62eea6625f01aae8ccc236b738511846cd5a5016b93d2510f12f0be7624
DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2
diff --git a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch
new file mode 100644
index 00000000000..411573a6625
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch
@@ -0,0 +1,25 @@
+commit 48143b0cf52de37f93ae53a95261988d9b5ebff2
+Author: Ilya Tumaykin <itumaykin@gmail.com>
+Date: Thu Jan 26 23:51:29 2017 +0300
+
+build: rpi: add missing linker flags to fix build
+
+See https://www.raspberrypi.org/forums/viewtopic.php?f=67&t=20005&p=194090
+and https://github.com/raspberrypi/firmware/issues/110
+
+Raspberry-pi upstream also adds '-lGLESv2' when EGL is used:
+https://github.com/raspberrypi/userland/blob/master/pkgconfig/egl.pc.in
+
+diff --git a/wscript b/wscript
+index 1880f631e5..741fe1e5a4 100644
+--- a/wscript
++++ b/wscript
+@@ -772,7 +772,7 @@ video_output_features = [
+ lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']),
+ # We still need all OpenGL symbols, because the vo_opengl code is
+ # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core.
+- check_cc(lib="EGL"),
++ check_cc(lib="EGL", linkflags="-lGLESv2"),
+ check_cc(lib="GLESv2"),
+ ),
+ } , {
diff --git a/media-video/mpv/mpv-0.27.1.ebuild b/media-video/mpv/mpv-0.27.1.ebuild
new file mode 100644
index 00000000000..dec8d69628f
--- /dev/null
+++ b/media-video/mpv/mpv-0.27.1.ebuild
@@ -0,0 +1,374 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="
+ https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~kensington/distfiles/${P}-patches-${PR}.tar.xz
+ "
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+ inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+ dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+ libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+ samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+ zsh-completion"
+
+REQUIRED_USE="
+ || ( cli libmpv )
+ aqua? ( opengl )
+ cuda? ( !libav opengl )
+ egl? ( || ( gbm X wayland ) )
+ gbm? ( drm egl opengl )
+ lcms? ( opengl )
+ luajit? ( lua )
+ opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+ raspberry-pi? ( opengl )
+ test? ( opengl )
+ tools? ( cli )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
+ vaapi? ( || ( gbm X wayland ) )
+ vdpau? ( X )
+ wayland? ( egl )
+ X? ( egl? ( opengl ) )
+ xv? ( X )
+ zsh-completion? ( cli )
+ ${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+ !libav? ( >=media-video/ffmpeg-3.2.2:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-12:0=[encode?,threads,vaapi?,vdpau?] )
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
+ bluray? ( >=media-libs/libbluray-0.3.0:= )
+ cdda? ( dev-libs/libcdio-paranoia )
+ cuda? ( >=media-video/ffmpeg-3.3:0 )
+ drm? ( x11-libs/libdrm )
+ dvd? (
+ >=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ uchardet? ( app-i18n/uchardet )
+ )
+ jack? ( virtual/jack )
+ javascript? ( >=dev-lang/mujs-1.0.0 )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ libass? (
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+ virtual/ttf-fonts
+ )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+ lua? (
+ !luajit? ( <dev-lang/lua-5.3:= )
+ luajit? ( dev-lang/luajit:2 )
+ )
+ openal? ( >=media-libs/openal-1.13 )
+ pulseaudio? ( media-sound/pulseaudio )
+ raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+ rubberband? ( >=media-libs/rubberband-1.8.0 )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl2[sound,threads,video] )
+ v4l? ( media-libs/libv4l )
+ vaapi? (
+ !libav? ( >=media-video/ffmpeg-3.3:0 )
+ libav? ( >=media-video/libav-13:0 )
+ x11-libs/libva:=[drm?,X?,wayland?]
+ )
+ vdpau? (
+ !libav? ( >=media-video/ffmpeg-3.3:0 )
+ libav? ( >=media-video/libav-13:0 )
+ x11-libs/libvdpau
+ )
+ wayland? (
+ >=dev-libs/wayland-1.6.0
+ >=x11-libs/libxkbcommon-0.3.0
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ opengl? (
+ x11-libs/libXdamage
+ virtual/opengl
+ )
+ xv? ( x11-libs/libXv )
+ )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-python/docutils
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ test? ( >=dev-util/cmocka-1.0.0 )
+ v4l? ( virtual/os-headers )
+ zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+ cuda? ( x11-drivers/nvidia-drivers[X] )
+ selinux? ( sec-policy/selinux-mplayer )
+ tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+ "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch"
+ "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
+ "${FILESDIR}/${PN}-0.27.0-add-missing-link-flags-for-rpi.patch"
+)
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+ eapply "${WORKDIR}/${PV}"
+ default_src_prepare
+}
+
+src_configure() {
+ tc-export CC PKG_CONFIG AR
+
+ if use raspberry-pi; then
+ append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+ append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+ fi
+
+ local mywafargs=(
+ --confdir="${EPREFIX}/etc/${PN}"
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+ $(usex cli '' '--disable-cplayer')
+ $(use_enable libmpv libmpv-shared)
+
+ --disable-libmpv-static
+ --disable-static-build
+ # See deep down below for build-date.
+ --disable-optimize # Don't add '-O2' to CFLAGS.
+ --disable-debug-build # Don't add '-g' to CFLAGS.
+ --enable-html-build
+
+ $(use_enable doc pdf-build)
+ $(use_enable cplugins)
+ $(use_enable zsh-completion zsh-comp)
+ $(use_enable test)
+
+ --disable-android
+ $(use_enable iconv)
+ $(use_enable samba libsmbclient)
+ $(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
+ $(use_enable javascript)
+ $(use_enable libass)
+ $(use_enable libass libass-osd)
+ $(use_enable zlib)
+ $(use_enable encode encoding)
+ $(use_enable bluray libbluray)
+ $(use_enable dvd dvdread)
+ $(use_enable dvd dvdnav)
+ $(use_enable cdda)
+ $(use_enable uchardet)
+ $(use_enable rubberband)
+ $(use_enable lcms lcms2)
+ --disable-vapoursynth # Only available in overlays.
+ --disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
+ --enable-libavdevice
+
+ # Audio outputs:
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video.
+ --disable-sdl1
+ $(use_enable oss oss-audio)
+ --disable-rsound # Only available in overlays.
+ --disable-sndio # Only available in overlays.
+ $(use_enable pulseaudio pulse)
+ $(use_enable jack)
+ $(use_enable openal)
+ --disable-opensles
+ $(use_enable alsa)
+ $(use_enable coreaudio)
+
+ # Video outputs:
+ $(use_enable aqua cocoa)
+ $(use_enable drm)
+ $(use_enable gbm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ $(use_enable xv)
+ $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+ $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+ $(use_enable vdpau)
+ $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+ $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+ $(use_enable libcaca caca)
+ $(use_enable jpeg)
+ $(use_enable raspberry-pi rpi)
+ $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+ --disable-mali-fbdev # Only available in overlays.
+ $(usex opengl '' '--disable-gl')
+
+ # HWaccels:
+ # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+ $(use_enable vaapi vaapi-hwaccel)
+ $(use_enable vdpau vdpau-hwaccel)
+ $(use_enable cuda cuda-hwaccel)
+
+ # TV features:
+ $(use_enable v4l tv)
+ $(use_enable v4l tv-v4l2)
+ $(use_enable v4l libv4l2)
+ $(use_enable v4l audio-input)
+ $(use_enable dvb dvbin)
+
+ # Miscellaneous features:
+ --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
+ )
+
+ if use vaapi && use X; then
+ mywafargs+=(
+ $(use_enable opengl vaapi-glx)
+ $(use_enable egl vaapi-x-egl)
+ )
+ fi
+
+ # Create reproducible non-live builds.
+ [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+ waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+ waf-utils_src_install
+
+ if use lua; then
+ insinto /usr/share/${PN}
+ doins -r TOOLS/lua
+ fi
+
+ if use cli && use luajit; then
+ pax-mark -m "${ED}"usr/bin/${PN}
+ fi
+
+ if use tools; then
+ dobin TOOLS/{mpv_identify.sh,umpv}
+ newbin TOOLS/idet.sh mpv_idet.sh
+ python_replicate_script "${ED}"usr/bin/umpv
+ fi
+}
+
+pkg_postinst() {
+ local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+ for rv in ${REPLACING_VERSIONS}; do
+ version_compare ${rv} 0.18.1
+ [[ $? -eq 1 ]] && softvol_0_18_1=1
+ version_compare ${rv} 0.21.0
+ [[ $? -eq 1 ]] && osc_0_21_0=1
+ version_compare ${rv} 0.24.0
+ [[ $? -eq 1 ]] && txtsubs_0_24_0=1
+ version_compare ${rv} 0.25.0
+ [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+ done
+
+ if [[ ${softvol_0_18_1} -eq 1 ]]; then
+ elog "Since version 0.18.1 the software volume control is always enabled."
+ elog "This means that volume controls don't change the system volume,"
+ elog "e.g. per-application volume with PulseAudio."
+ elog "If you want to restore the previous behaviour, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+ elog
+ fi
+
+ if [[ ${osc_0_21_0} -eq 1 ]]; then
+ elog "In version 0.21.0 the default OSC layout was changed."
+ elog "If you want to restore the previous layout, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+ elog
+ fi
+
+ if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+ elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+ elog "If you want to restore the previous behaviour, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+ elog
+ fi
+
+ if [[ ${opengl_0_25_0} -eq 1 ]]; then
+ elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+ elog "the 'opengl' video output and no longer explicitly requires"
+ elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+ fi
+
+ if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+ elog "If you want to have command-line completion via bash-completion,"
+ elog "please install app-shells/mpv-bash-completion."
+ fi
+
+ if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+ has_version 'app-shells/mpv-bash-completion'; then
+ elog "If command-line completion doesn't work after mpv update,"
+ elog "please rebuild app-shells/mpv-bash-completion."
+ fi
+
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+src_test() {
+ cd "${S}"/build/test || die
+ local test
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
diff --git a/media-video/mpv/mpv-0.28.1.ebuild b/media-video/mpv/mpv-0.28.1.ebuild
new file mode 100644
index 00000000000..472b73c52c5
--- /dev/null
+++ b/media-video/mpv/mpv-0.28.1.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+WAF_PV=1.9.8
+
+inherit flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs versionator waf-utils xdg-utils
+
+DESCRIPTION="Media player based on MPlayer and mplayer2"
+HOMEPAGE="https://mpv.io/"
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+ DOCS=( RELEASE_NOTES )
+else
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
+ inherit git-r3
+fi
+SRC_URI+=" https://waf.io/waf-${WAF_PV}"
+DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
+
+# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
+SLOT="0"
+IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
+ dvd +egl encode gbm +iconv jack javascript jpeg lcms +libass libav libcaca
+ libmpv +lua luajit openal +opengl oss pulseaudio raspberry-pi rubberband
+ samba sdl selinux test tools +uchardet v4l vaapi vdpau wayland +X +xv zlib
+ zsh-completion"
+
+REQUIRED_USE="
+ || ( cli libmpv )
+ aqua? ( opengl )
+ cuda? ( !libav opengl )
+ egl? ( || ( gbm X wayland ) )
+ gbm? ( drm egl opengl )
+ lcms? ( opengl )
+ luajit? ( lua )
+ opengl? ( || ( aqua egl X raspberry-pi !cli ) )
+ raspberry-pi? ( opengl )
+ test? ( opengl )
+ tools? ( cli )
+ uchardet? ( iconv )
+ v4l? ( || ( alsa oss ) )
+ vaapi? ( || ( gbm X wayland ) )
+ vdpau? ( X )
+ wayland? ( egl )
+ X? ( egl? ( opengl ) )
+ xv? ( X )
+ zsh-completion? ( cli )
+ ${PYTHON_REQUIRED_USE}
+"
+
+COMMON_DEPEND="
+ !libav? ( >=media-video/ffmpeg-9999:0=[encode?,threads,vaapi?,vdpau?] )
+ libav? ( >=media-video/libav-9999:0=[encode?,threads,vaapi?,vdpau?] )
+ alsa? ( >=media-libs/alsa-lib-1.0.18 )
+ archive? ( >=app-arch/libarchive-3.0.0:= )
+ bluray? ( >=media-libs/libbluray-0.3.0:= )
+ cdda? ( dev-libs/libcdio-paranoia )
+ drm? ( x11-libs/libdrm )
+ dvd? (
+ >=media-libs/libdvdnav-4.2.0
+ >=media-libs/libdvdread-4.1.0
+ )
+ egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
+ iconv? (
+ virtual/libiconv
+ uchardet? ( app-i18n/uchardet )
+ )
+ jack? ( virtual/jack )
+ javascript? ( >=dev-lang/mujs-1.0.0 )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( >=media-libs/lcms-2.6:2 )
+ libass? (
+ >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
+ virtual/ttf-fonts
+ )
+ libcaca? ( >=media-libs/libcaca-0.99_beta18 )
+ lua? (
+ !luajit? ( <dev-lang/lua-5.3:= )
+ luajit? ( dev-lang/luajit:2 )
+ )
+ openal? ( >=media-libs/openal-1.13 )
+ pulseaudio? ( media-sound/pulseaudio )
+ raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+ rubberband? ( >=media-libs/rubberband-1.8.0 )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl2[sound,threads,video] )
+ v4l? ( media-libs/libv4l )
+ vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
+ vdpau? ( x11-libs/libvdpau )
+ wayland? (
+ >=dev-libs/wayland-1.6.0
+ >=x11-libs/libxkbcommon-0.3.0
+ dev-libs/wayland-protocols
+ )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ opengl? (
+ x11-libs/libXdamage
+ virtual/opengl
+ )
+ xv? ( x11-libs/libXv )
+ )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-python/docutils
+ virtual/pkgconfig
+ doc? ( dev-python/rst2pdf )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ test? ( >=dev-util/cmocka-1.0.0 )
+ v4l? ( virtual/os-headers )
+ zsh-completion? ( dev-lang/perl )
+"
+RDEPEND="${COMMON_DEPEND}
+ cuda? ( x11-drivers/nvidia-drivers[X] )
+ selinux? ( sec-policy/selinux-mplayer )
+ tools? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+ "${FILESDIR}/${PN}-0.25.0-fix-float-comparisons-in-tests.patch"
+ "${FILESDIR}/${PN}-0.27.0-add-missing-link-flags-for-rpi.patch"
+)
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != "binary" ]] && python_setup
+}
+
+src_prepare() {
+ cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
+ chmod +x "${S}"/waf || die
+ default_src_prepare
+}
+
+src_configure() {
+ tc-export CC PKG_CONFIG AR
+
+ if use raspberry-pi; then
+ append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
+ append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
+ fi
+
+ local mywafargs=(
+ --confdir="${EPREFIX}/etc/${PN}"
+ --docdir="${EPREFIX}/usr/share/doc/${PF}"
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+
+ $(usex cli '' '--disable-cplayer')
+ $(use_enable libmpv libmpv-shared)
+
+ --disable-libmpv-static
+ --disable-static-build
+ # See deep down below for build-date.
+ --disable-optimize # Don't add '-O2' to CFLAGS.
+ --disable-debug-build # Don't add '-g' to CFLAGS.
+ --enable-html-build
+
+ $(use_enable doc pdf-build)
+ $(use_enable cplugins)
+ $(use_enable zsh-completion zsh-comp)
+ $(use_enable test)
+
+ --disable-android
+ $(use_enable iconv)
+ $(use_enable samba libsmbclient)
+ $(use_enable lua)
+ $(usex luajit '--lua=luajit' '')
+ $(use_enable javascript)
+ $(use_enable libass)
+ $(use_enable libass libass-osd)
+ $(use_enable zlib)
+ $(use_enable encode encoding)
+ $(use_enable bluray libbluray)
+ $(use_enable dvd dvdread)
+ $(use_enable dvd dvdnav)
+ $(use_enable cdda)
+ $(use_enable uchardet)
+ $(use_enable rubberband)
+ $(use_enable lcms lcms2)
+ --disable-vapoursynth # Only available in overlays.
+ --disable-vapoursynth-lazy
+ $(use_enable archive libarchive)
+
+ --enable-libavdevice
+
+ # Audio outputs:
+ $(use_enable sdl sdl2) # Listed under audio, but also includes video.
+ --disable-sdl1
+ $(use_enable oss oss-audio)
+ --disable-rsound # Only available in overlays.
+ --disable-sndio # Only available in overlays.
+ $(use_enable pulseaudio pulse)
+ $(use_enable jack)
+ $(use_enable openal)
+ --disable-opensles
+ $(use_enable alsa)
+ $(use_enable coreaudio)
+
+ # Video outputs:
+ $(use_enable aqua cocoa)
+ $(use_enable drm)
+ $(use_enable gbm)
+ $(use_enable wayland wayland-scanner)
+ $(use_enable wayland wayland-protocols)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ $(use_enable xv)
+ $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
+ $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
+ $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
+ $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
+ $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
+ $(use_enable vdpau)
+ $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
+ $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
+ $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
+ $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
+ $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
+ $(use_enable libcaca caca)
+ $(use_enable jpeg)
+ $(use_enable raspberry-pi rpi)
+ $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
+ --disable-mali-fbdev # Only available in overlays.
+ $(usex opengl '' '--disable-gl')
+
+ # HWaccels:
+ # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
+ $(use_enable cuda cuda-hwaccel)
+
+ # TV features:
+ $(use_enable v4l tv)
+ $(use_enable v4l tv-v4l2)
+ $(use_enable v4l libv4l2)
+ $(use_enable v4l audio-input)
+ $(use_enable dvb dvbin)
+
+ # Miscellaneous features:
+ --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
+ )
+
+ if use vaapi && use X; then
+ mywafargs+=(
+ $(use_enable opengl vaapi-glx)
+ $(use_enable egl vaapi-x-egl)
+ )
+ fi
+
+ # Create reproducible non-live builds.
+ [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
+
+ waf-utils_src_configure "${mywafargs[@]}"
+}
+
+src_install() {
+ waf-utils_src_install
+
+ if use lua; then
+ insinto /usr/share/${PN}
+ doins -r TOOLS/lua
+ fi
+
+ if use cli && use luajit; then
+ pax-mark -m "${ED}"usr/bin/${PN}
+ fi
+
+ if use tools; then
+ dobin TOOLS/{mpv_identify.sh,umpv}
+ newbin TOOLS/idet.sh mpv_idet.sh
+ python_replicate_script "${ED}"usr/bin/umpv
+ fi
+}
+
+pkg_postinst() {
+ local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
+
+ for rv in ${REPLACING_VERSIONS}; do
+ version_compare ${rv} 0.18.1
+ [[ $? -eq 1 ]] && softvol_0_18_1=1
+ version_compare ${rv} 0.21.0
+ [[ $? -eq 1 ]] && osc_0_21_0=1
+ version_compare ${rv} 0.24.0
+ [[ $? -eq 1 ]] && txtsubs_0_24_0=1
+ version_compare ${rv} 0.25.0
+ [[ $? -eq 1 ]] && ! use opengl && opengl_0_25_0=1
+ done
+
+ if [[ ${softvol_0_18_1} -eq 1 ]]; then
+ elog "Since version 0.18.1 the software volume control is always enabled."
+ elog "This means that volume controls don't change the system volume,"
+ elog "e.g. per-application volume with PulseAudio."
+ elog "If you want to restore the previous behaviour, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
+ elog
+ fi
+
+ if [[ ${osc_0_21_0} -eq 1 ]]; then
+ elog "In version 0.21.0 the default OSC layout was changed."
+ elog "If you want to restore the previous layout, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
+ elog
+ fi
+
+ if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
+ elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
+ elog "If you want to restore the previous behaviour, please refer to"
+ elog
+ elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
+ elog
+ fi
+
+ if [[ ${opengl_0_25_0} -eq 1 ]]; then
+ elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
+ elog "the 'opengl' video output and no longer explicitly requires"
+ elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
+ fi
+
+ if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
+ elog "If you want to have command-line completion via bash-completion,"
+ elog "please install app-shells/mpv-bash-completion."
+ fi
+
+ if use cli && [[ -n ${REPLACING_VERSIONS} ]] && \
+ has_version 'app-shells/mpv-bash-completion'; then
+ elog "If command-line completion doesn't work after mpv update,"
+ elog "please rebuild app-shells/mpv-bash-completion."
+ fi
+
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+}
+
+src_test() {
+ cd "${S}"/build/test || die
+ local test
+ for test in *; do
+ if [[ -x ${test} ]]; then
+ ./"${test}" || die "Test suite failed"
+ fi
+ done
+}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2018-03-11 13:07 Michael Palimaka
0 siblings, 0 replies; 17+ messages in thread
From: Michael Palimaka @ 2018-03-11 13:07 UTC (permalink / raw
To: gentoo-commits
commit: 49e832ffa5becb353cbdc3f34c2e34fd40e0147a
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Mar 11 12:51:27 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 13:07:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e832ff
media-video/mpv: update ffmpeg patch for 9999
Closes: https://bugs.gentoo.org/649908
Closes: https://github.com/gentoo/gentoo/pull/7421
Package-Manager: Portage-2.3.24, Repoman-2.3.6
...-9999-make-ffmpeg-version-check-non-fatal.patch | 28 ++++++++++++++++++++++
media-video/mpv/mpv-9999.ebuild | 2 +-
2 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
new file mode 100644
index 00000000000..1594617fba9
--- /dev/null
+++ b/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
@@ -0,0 +1,28 @@
+player: make ffmpeg/libav version check non-fatal
+
+We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
+
+diff --git a/player/main.c b/player/main.c
+index 5a3fe4c1b7..8cfbb09c56 100644
+--- a/player/main.c
++++ b/player/main.c
+@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
+ // Distro maintainers who patch this out should be aware that mpv
+ // intentionally ignores ABI in some places where it's not possible to
+ // get by without violating it.
+- print_libav_versions(mpctx->log, MSGL_FATAL);
+- MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
+- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
+- "This is most likely a broken build and could\nresult in "
+- "misbehavior and crashes.\n\nmpv does not support this "
+- "configuration and will not run - rebuild mpv instead.\n");
+- return -1;
++ print_libav_versions(mpctx->log, MSGL_WARN);
++ MP_WARN(mpctx, "\nmpv was compiled against a different version of "
++ "FFmpeg/Libav than the shared\nlibrary it is linked against. "
++ "This could result in misbehavior and crashes.\n\n"
++ "Upstream does not support this configuration.\n"
++ "Please rebuild mpv in case of any problems.\n");
+ }
+
+ if (!mpctx->playlist->first && !opts->player_idle_mode)
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index e273db3d080..302641687d6 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -132,7 +132,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch"
+ "${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2018-07-28 8:53 Michał Górny
0 siblings, 0 replies; 17+ messages in thread
From: Michał Górny @ 2018-07-28 8:53 UTC (permalink / raw
To: gentoo-commits
commit: e31d80a419120a0af70f62b1ee7cbf6b75a38213
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Jul 23 15:46:05 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 28 08:53:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31d80a4
media-video/mpv: rebase latest ffmpeg patch on top of 0.29.0
Package-Manager: Portage-2.3.43, Repoman-2.3.10
...l.patch => mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch} | 6 +++---
media-video/mpv/mpv-9999.ebuild | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
similarity index 88%
rename from media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
rename to media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
index 1594617fba9..1a4975a4e30 100644
--- a/media-video/mpv/files/mpv-9999-make-ffmpeg-version-check-non-fatal.patch
+++ b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
@@ -3,10 +3,10 @@ player: make ffmpeg/libav version check non-fatal
We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
diff --git a/player/main.c b/player/main.c
-index 5a3fe4c1b7..8cfbb09c56 100644
+index f56191a297..4e51aebd66 100644
--- a/player/main.c
+++ b/player/main.c
-@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
+@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
// Distro maintainers who patch this out should be aware that mpv
// intentionally ignores ABI in some places where it's not possible to
// get by without violating it.
@@ -25,4 +25,4 @@ index 5a3fe4c1b7..8cfbb09c56 100644
+ "Please rebuild mpv in case of any problems.\n");
}
- if (!mpctx->playlist->first && !opts->player_idle_mode)
+ if (!mpctx->playlist->first && !opts->player_idle_mode) {
diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild
index eae5391d95d..ba554e7956f 100644
--- a/media-video/mpv/mpv-9999.ebuild
+++ b/media-video/mpv/mpv-9999.ebuild
@@ -137,7 +137,7 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch"
+ "${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2020-01-05 18:54 Mikle Kolyada
0 siblings, 0 replies; 17+ messages in thread
From: Mikle Kolyada @ 2020-01-05 18:54 UTC (permalink / raw
To: gentoo-commits
commit: 872914dde9a6d8e5ecb4d488278e47d4cb804ca0
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 5 18:54:40 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jan 5 18:54:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872914dd
media-video/mpv: Drop old
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-video/mpv/Manifest | 1 -
....29.0-make-ffmpeg-version-check-non-fatal.patch | 28 --
media-video/mpv/files/mpv-0.29.1-egl-bound.patch | 27 --
media-video/mpv/mpv-0.29.1-r1.ebuild | 367 ---------------------
4 files changed, 423 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index c3040fc218d..0d6ec7a8cb6 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,3 @@
-DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5afd59bce4b423c7b4f3739b540f26a4de947cb3cf87a31a7d3ce03a11a6d1247158250afde596f490321a537 SHA512 ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086
DIST mpv-0.30.0.tar.gz 3085141 BLAKE2B 314f6830f91e7dc11d3627688415c7535ef0ae462378d2c29cf036d5b851c55025ea5e9d5b0aa3f07ac6ec8c87350be65c882932bd908eab7c4f40b3840bf1a3 SHA512 2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66
DIST mpv-0.31.0.tar.gz 3142672 BLAKE2B 62a24a2bde2929047e061522147a6e823dfea9b5e7f1f739ad65bc0c82742e98743fb9ff7f0c3f74218cf50a32d0dc37c5e786fdcc951d649499f74efc3a641c SHA512 5199183d35bc2d7fffde1af250edf829fe768cedd7aa00f424d2a11a11d82cdb451c62886159ba3e1efc407b242c25e2485f4ebffd13b1da9c70defbd1f4c309
DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
diff --git a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
deleted file mode 100644
index 1a4975a4e30..00000000000
--- a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-player: make ffmpeg/libav version check non-fatal
-
-We already enforce mpv rebuilds when ffmpeg/libav SONAME changes.
-
-diff --git a/player/main.c b/player/main.c
-index f56191a297..4e51aebd66 100644
---- a/player/main.c
-+++ b/player/main.c
-@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char **options)
- // Distro maintainers who patch this out should be aware that mpv
- // intentionally ignores ABI in some places where it's not possible to
- // get by without violating it.
-- print_libav_versions(mpctx->log, MSGL_FATAL);
-- MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
-- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
-- "This is most likely a broken build and could\nresult in "
-- "misbehavior and crashes.\n\nmpv does not support this "
-- "configuration and will not run - rebuild mpv instead.\n");
-- return -1;
-+ print_libav_versions(mpctx->log, MSGL_WARN);
-+ MP_WARN(mpctx, "\nmpv was compiled against a different version of "
-+ "FFmpeg/Libav than the shared\nlibrary it is linked against. "
-+ "This could result in misbehavior and crashes.\n\n"
-+ "Upstream does not support this configuration.\n"
-+ "Please rebuild mpv in case of any problems.\n");
- }
-
- if (!mpctx->playlist->first && !opts->player_idle_mode) {
diff --git a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch b/media-video/mpv/files/mpv-0.29.1-egl-bound.patch
deleted file mode 100644
index 5a9be073fbf..00000000000
--- a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f726b368da87024a0cfe82627e0730ffe4578716 Mon Sep 17 00:00:00 2001
-From: Marvin Schmidt <marv@exherbo.org>
-Date: Wed, 18 Sep 2019 17:07:29 +0200
-Subject: [PATCH] build: lower version requirement for EGL
-
-`egl.pc` can be provided either by mesa or libglvnd. The latter doesn't
-follow the same version scheme as mesa but instead uses the API version
-that the library exposes, which is 1.5 for EGL[1]
-
-[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba#diff-b58a140c00ea99fb9a708e15afaade62R8
----
- wscript | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wscript b/wscript
-index 3569dbf060..97a4d9196b 100644
---- a/wscript
-+++ b/wscript
-@@ -636,7 +636,7 @@ video_output_features = [
- 'deps': 'wayland',
- 'groups': [ 'gl' ],
- 'func': check_pkg_config('wayland-egl', '>= 9.0.0',
-- 'egl', '>= 9.0.0')
-+ 'egl', '>= 1.5')
- } , {
- 'name': '--gl-win32',
- 'desc': 'OpenGL Win32 Backend',
diff --git a/media-video/mpv/mpv-0.29.1-r1.ebuild b/media-video/mpv/mpv-0.29.1-r1.ebuild
deleted file mode 100644
index 1041124f6c3..00000000000
--- a/media-video/mpv/mpv-0.29.1-r1.ebuild
+++ /dev/null
@@ -1,367 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=2.0.9
-
-inherit eapi7-ver flag-o-matic gnome2-utils pax-utils python-r1 toolchain-funcs waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
- inherit git-r3
- DOCS=(); SRC_URI=""
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV}"
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC samba? ( GPL-3+ )"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda doc drm dvb
- dvd +egl gbm +iconv jack javascript jpeg lcms +libass libcaca libmpv +lua
- luajit openal +opengl oss pulseaudio raspberry-pi rubberband samba sdl
- selinux test tools +uchardet v4l vaapi vdpau vulkan wayland +X +xv zlib
- zsh-completion"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="
- || ( cli libmpv )
- aqua? ( opengl )
- cuda? ( opengl )
- egl? ( || ( gbm X wayland ) )
- gbm? ( drm egl opengl )
- lcms? ( opengl )
- luajit? ( lua )
- opengl? ( || ( aqua egl X raspberry-pi !cli ) )
- raspberry-pi? ( opengl )
- test? ( opengl )
- tools? ( cli )
- uchardet? ( iconv )
- v4l? ( || ( alsa oss ) )
- vaapi? ( || ( gbm X wayland ) )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) )
- wayland? ( egl )
- X? ( egl? ( opengl ) )
- xv? ( X )
- zsh-completion? ( cli )
- ${PYTHON_REQUIRED_USE}
-"
-
-COMMON_DEPEND="
- >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.0.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0:= )
- cdda? ( dev-libs/libcdio-paranoia )
- drm? ( x11-libs/libdrm )
- dvd? (
- >=media-libs/libdvdnav-4.2.0:=
- >=media-libs/libdvdread-4.1.0:=
- )
- egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] )
- iconv? (
- virtual/libiconv
- uchardet? ( app-i18n/uchardet )
- )
- jack? ( virtual/jack )
- javascript? ( >=dev-lang/mujs-1.0.0 )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( >=media-libs/lcms-2.6:2 )
- libass? (
- >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz]
- virtual/ttf-fonts
- )
- libcaca? ( >=media-libs/libcaca-0.99_beta18 )
- lua? (
- !luajit? ( <dev-lang/lua-5.3:= )
- luajit? ( dev-lang/luajit:2 )
- )
- openal? ( >=media-libs/openal-1.13 )
- pulseaudio? ( media-sound/pulseaudio )
- raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
- rubberband? ( >=media-libs/rubberband-1.8.0 )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl2[sound,threads,video] )
- v4l? ( media-libs/libv4l )
- vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] )
- vdpau? ( x11-libs/libvdpau )
- vulkan? (
- media-libs/shaderc
- media-libs/vulkan-loader[X?,wayland?]
- )
- wayland? (
- >=dev-libs/wayland-1.6.0
- >=dev-libs/wayland-protocols-1.14
- >=x11-libs/libxkbcommon-0.3.0
- )
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXrandr
- opengl? (
- x11-libs/libXdamage
- virtual/opengl
- )
- xv? ( x11-libs/libXv )
- )
- zlib? ( sys-libs/zlib )
-"
-DEPEND="${COMMON_DEPEND}
- ${PYTHON_DEPS}
- dev-python/docutils
- virtual/pkgconfig
- cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 )
- doc? ( dev-python/rst2pdf )
- dvb? ( virtual/linuxtv-dvb-headers )
- test? ( >=dev-util/cmocka-1.0.0 )
- v4l? ( virtual/os-headers )
- zsh-completion? ( dev-lang/perl )
-"
-RDEPEND="${COMMON_DEPEND}
- cuda? ( x11-drivers/nvidia-drivers[X] )
- selinux? ( sec-policy/selinux-mplayer )
- tools? ( ${PYTHON_DEPS} )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch"
- "${FILESDIR}/${PN}-0.29.1-egl-bound.patch"
-)
-
-src_prepare() {
- cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
- chmod +x "${S}"/waf || die
- default_src_prepare
-}
-
-src_configure() {
- python_setup
- tc-export CC PKG_CONFIG AR
-
- if use raspberry-pi; then
- append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include"
- append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib"
- fi
-
- # Prevent access violations from zsh completion generation.
- # See Gentoo bug 656086.
- use zsh-completion && addpredict /dev/dri
-
- local mywafargs=(
- --confdir="${EPREFIX}/etc/${PN}"
- --docdir="${EPREFIX}/usr/share/doc/${PF}"
- --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-
- $(usex cli '' '--disable-cplayer')
- $(use_enable libmpv libmpv-shared)
-
- --disable-libmpv-static
- --disable-static-build
- # See deep down below for build-date.
- --disable-optimize # Don't add '-O2' to CFLAGS.
- --disable-debug-build # Don't add '-g' to CFLAGS.
- --enable-html-build
-
- $(use_enable doc pdf-build)
- $(use_enable cplugins)
- $(use_enable zsh-completion zsh-comp)
- $(use_enable test)
-
- --disable-android
- $(use_enable iconv)
- $(use_enable samba libsmbclient)
- $(use_enable lua)
- $(usex luajit '--lua=luajit' '')
- $(use_enable javascript)
- $(use_enable libass)
- $(use_enable libass libass-osd)
- $(use_enable zlib)
- $(use_enable bluray libbluray)
- $(use_enable dvd dvdread)
- $(use_enable dvd dvdnav)
- $(use_enable cdda)
- $(use_enable uchardet)
- $(use_enable rubberband)
- $(use_enable lcms lcms2)
- --disable-vapoursynth # Only available in overlays.
- --disable-vapoursynth-lazy
- $(use_enable archive libarchive)
-
- --enable-libavdevice
-
- # Audio outputs:
- $(use_enable sdl sdl2) # Listed under audio, but also includes video.
- $(use_enable oss oss-audio)
- --disable-rsound # Only available in overlays.
- --disable-sndio # Only available in overlays.
- $(use_enable pulseaudio pulse)
- $(use_enable jack)
- $(use_enable openal)
- --disable-opensles
- $(use_enable alsa)
- $(use_enable coreaudio)
-
- # Video outputs:
- $(use_enable aqua cocoa)
- $(use_enable drm)
- $(use_enable gbm)
- $(use_enable wayland wayland-scanner)
- $(use_enable wayland wayland-protocols)
- $(use_enable wayland)
- $(use_enable X x11)
- $(use_enable xv)
- $(usex opengl "$(use_enable aqua gl-cocoa)" '--disable-gl-cocoa')
- $(usex opengl "$(use_enable X gl-x11)" '--disable-gl-x11')
- $(usex egl "$(use_enable X egl-x11)" '--disable-egl-x11')
- $(usex egl "$(use_enable gbm egl-drm)" '--disable-egl-drm')
- $(usex opengl "$(use_enable wayland gl-wayland)" '--disable-gl-wayland')
- $(use_enable vdpau)
- $(usex vdpau "$(use_enable opengl vdpau-gl-x11)" '--disable-vdpau-gl-x11')
- $(use_enable vaapi) # See below for vaapi-glx, vaapi-x-egl.
- $(usex vaapi "$(use_enable X vaapi-x11)" '--disable-vaapi-x11')
- $(usex vaapi "$(use_enable wayland vaapi-wayland)" '--disable-vaapi-wayland')
- $(usex vaapi "$(use_enable gbm vaapi-drm)" '--disable-vaapi-drm')
- $(use_enable libcaca caca)
- $(use_enable jpeg)
- $(use_enable vulkan shaderc)
- $(use_enable raspberry-pi rpi)
- $(usex libmpv "$(use_enable opengl plain-gl)" '--disable-plain-gl')
- --disable-mali-fbdev # Only available in overlays.
- $(usex opengl '' '--disable-gl')
- $(use_enable vulkan)
-
- # HWaccels:
- # Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
- $(use_enable cuda cuda-hwaccel)
-
- # TV features:
- $(use_enable v4l tv)
- $(use_enable v4l tv-v4l2)
- $(use_enable v4l libv4l2)
- $(use_enable v4l audio-input)
- $(use_enable dvb dvbin)
-
- # Miscellaneous features:
- --disable-apple-remote # Needs testing first. See Gentoo bug 577332.
- )
-
- if use vaapi && use X; then
- mywafargs+=(
- $(use_enable opengl vaapi-glx)
- $(use_enable egl vaapi-x-egl)
- )
- fi
-
- # Create reproducible non-live builds.
- [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date)
-
- waf-utils_src_configure "${mywafargs[@]}"
-}
-
-src_install() {
- waf-utils_src_install
-
- if use lua; then
- insinto /usr/share/${PN}
- doins -r TOOLS/lua
- fi
-
- if use cli && use luajit; then
- pax-mark -m "${ED}"usr/bin/${PN}
- fi
-
- if use tools; then
- dobin TOOLS/{mpv_identify.sh,umpv}
- newbin TOOLS/idet.sh mpv_idet.sh
- python_replicate_script "${ED}"usr/bin/umpv
- fi
-}
-
-pkg_postinst() {
- local rv softvol_0_18_1=0 osc_0_21_0=0 txtsubs_0_24_0=0 opengl_0_25_0=0
-
- for rv in ${REPLACING_VERSIONS}; do
- ver_test ${rv} -lt 0.18.1 && softvol_0_18_1=1
- ver_test ${rv} -lt 0.21.0 && osc_0_21_0=1
- ver_test ${rv} -lt 0.24.0 && txtsubs_0_24_0=1
- ver_test ${rv} -lt 0.25.0 && ! use opengl && opengl_0_25_0=1
- done
-
- if [[ ${softvol_0_18_1} -eq 1 ]]; then
- elog "Since version 0.18.1 the software volume control is always enabled."
- elog "This means that volume controls don't change the system volume,"
- elog "e.g. per-application volume with PulseAudio."
- elog "If you want to restore the previous behaviour, please refer to"
- elog
- elog "https://wiki.gentoo.org/wiki/Mpv#Volume_in_0.18.1"
- elog
- fi
-
- if [[ ${osc_0_21_0} -eq 1 ]]; then
- elog "In version 0.21.0 the default OSC layout was changed."
- elog "If you want to restore the previous layout, please refer to"
- elog
- elog "https://wiki.gentoo.org/wiki/Mpv#OSC_in_0.21.0"
- elog
- fi
-
- if [[ ${txtsubs_0_24_0} -eq 1 ]]; then
- elog "Since version 0.24.0 subtitles with .txt extension aren't autoloaded."
- elog "If you want to restore the previous behaviour, please refer to"
- elog
- elog "https://wiki.gentoo.org/wiki/Mpv#Subtitles_with_.txt_extension_in_0.24.0"
- elog
- fi
-
- if [[ ${opengl_0_25_0} -eq 1 ]]; then
- elog "Since version 0.25.0 the 'opengl' USE flag is mapped to"
- elog "the 'opengl' video output and no longer explicitly requires"
- elog "X11 or Mac OS Aqua. Consider enabling the 'opengl' USE flag."
- fi
-
- if use cli && ! has_version 'app-shells/mpv-bash-completion'; then
- elog "If you want to have command-line completion via bash-completion,"
- elog "please install app-shells/mpv-bash-completion."
- fi
-
- if use cli && [[ -n ${REPLACING_VERSIONS} ]] &&
- has_version 'app-shells/mpv-bash-completion'; then
- elog "If command-line completion doesn't work after mpv update,"
- elog "please rebuild app-shells/mpv-bash-completion."
- fi
-
- elog "If you want URL support, please install net-misc/youtube-dl."
-
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-src_test() {
- cd "${S}"/build/test || die
- local test
- for test in *; do
- if [[ -x ${test} ]]; then
- ./"${test}" || die "Test suite failed"
- fi
- done
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2022-11-12 14:22 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2022-11-12 14:22 UTC (permalink / raw
To: gentoo-commits
commit: 9183fe56197f7df943933c096e17ee1bfc8559ee
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 12 14:15:16 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Nov 12 14:17:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9183fe56
media-video/mpv: drop 0.34.1_p20221105
Almost identical to 0.35.0 beside fixing some loose ends,
so just drop this short lived snapshot.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-video/mpv/Manifest | 1 -
.../mpv-0.34.1_p20221105-macos-touchbar.patch | 8 -
media-video/mpv/metadata.xml | 1 -
media-video/mpv/mpv-0.34.1_p20221105.ebuild | 293 ---------------------
4 files changed, 303 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index d8d53a88258f..15de9c1bc027 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,3 @@
DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
-DIST mpv-0.34.1_p20221105.tar.gz 3366581 BLAKE2B 52bf8f339e6535c17430d4a8f865a4559681200bfff379e98104ad1365addade3899a3339ae480c23f7e8470623374395aa2e948ee3d616fa8ce152821340fd0 SHA512 a246087a5af191459af71c729e5da5f09a7466792774e1114b8775294ed1de6a9d882e0d2076e35f7d09cd2a57780f504fedbbfc572fb533dc1d72f87e59dabc
DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f SHA512 d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
diff --git a/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch b/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
deleted file mode 100644
index bbf931167b2b..000000000000
--- a/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-https://bugs.gentoo.org/880737
---- a/meson.build
-+++ b/meson.build
-@@ -1538,3 +1538,3 @@
- }
--features += {'macos-touchbar': cc.compiles(macos_touchbar['fragment'], name: 'macos-touchbar check')}
-+features += {'macos-touchbar': macos_touchbar['deps'].found() and cc.compiles(macos_touchbar['fragment'], name: 'macos-touchbar check')}
- if features['macos-touchbar']
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 76c201612ef0..94c02f8c4ff7 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -33,7 +33,6 @@
<flag name="sndio">Enable sound support via <pkg>media-sound/sndio</pkg></flag>
<flag name="tools">Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv</flag>
<flag name="uchardet">Enable subtitles charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
- <flag name="vector">Use function implementations more amenable to vectorization (gives speedup). Made optional in case of bugs.</flag>
<flag name="vulkan">Enable support for various Vulkan-based video backends</flag>
<flag name="zimg">Enable libzimg support (for vf_fingerprint)</flag>
</use>
diff --git a/media-video/mpv/mpv-0.34.1_p20221105.ebuild b/media-video/mpv/mpv-0.34.1_p20221105.ebuild
deleted file mode 100644
index a7f3bb4b505f..000000000000
--- a/media-video/mpv/mpv-0.34.1_p20221105.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..11} )
-inherit edo flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-else
- HASH_MPV=c416a38ef227067ef7b81b9650a13157300cdfbe
- SRC_URI="https://github.com/mpv-player/mpv/archive/${HASH_MPV}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${HASH_MPV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/"
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-SLOT="0/2" # soname
-IUSE="
- +X +alsa aqua archive bluray cdda +cli coreaudio debug drm dvb
- dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca libmpv
- +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sndio test tools +uchardet
- vaapi vdpau +vector vulkan wayland +xv zimg zlib"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( cli libmpv )
- egl? ( || ( X drm wayland ) )
- libplacebo? ( || ( egl opengl vulkan ) )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( || ( egl opengl vulkan ) )
- opengl? ( || ( X aqua ) )
- test? ( cli )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? ( || ( X egl libplacebo wayland ) )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) libplacebo )
- xv? ( X )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- media-libs/libass:=[fontconfig]
- media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXpresent
- x11-libs/libXrandr
- xv? ( x11-libs/libXv )
- )
- alsa? ( media-libs/alsa-lib )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray:= )
- cdda? (
- dev-libs/libcdio-paranoia:=
- dev-libs/libcdio:=
- )
- drm? (
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- dvd? (
- media-libs/libdvdnav
- media-libs/libdvdread:=
- )
- egl? ( media-libs/libglvnd )
- gamepad? ( media-libs/libsdl2[joystick] )
- iconv? (
- virtual/libiconv
- uchardet? ( app-i18n/uchardet )
- )
- jack? ( virtual/jack )
- javascript? ( dev-lang/mujs:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- lcms? ( media-libs/lcms:2 )
- libcaca? ( media-libs/libcaca )
- libplacebo? (
- >=media-libs/libplacebo-4.202:=[opengl?,vulkan?]
- egl? ( media-libs/libplacebo[opengl] )
- )
- lua? ( ${LUA_DEPS} )
- openal? ( media-libs/openal )
- opengl? ( media-libs/libglvnd[X?] )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-libs/libpulse )
- raspberry-pi? ( media-libs/raspberrypi-userland )
- rubberband? ( media-libs/rubberband )
- sdl? ( media-libs/libsdl2[sound,threads,video] )
- sndio? ( media-sound/sndio:= )
- vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
- vdpau? ( x11-libs/libvdpau )
- vulkan? (
- media-libs/shaderc
- media-libs/vulkan-loader[X?,wayland?]
- )
- wayland? (
- dev-libs/wayland
- dev-libs/wayland-protocols
- x11-libs/libxkbcommon
- )
- zimg? ( media-libs/zimg )
- zlib? ( sys-libs/zlib:= )"
-RDEPEND="
- ${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-mplayer )
- tools? ( ${PYTHON_DEPS} )"
-DEPEND="
- ${COMMON_DEPEND}
- X? ( x11-base/xorg-proto )
- dvb? ( virtual/linuxtv-dvb-headers )
- nvenc? ( media-libs/nv-codec-headers )
- wayland? ( dev-libs/wayland-protocols )"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- cli? ( dev-python/docutils )
- wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-macos-touchbar.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- [[ ${PV} == 9999 ]] || sed -i "s/UNKNOWN/${HASH_MPV::11}/" VERSION || die
-
- sed -i "s/'rst2html/&.py/" meson.build || die
-}
-
-src_configure() {
- if use !debug; then
- if use test; then
- einfo "Skipping -DNDEBUG due to USE=test"
- else
- append-cppflags -DNDEBUG # treated specially
- fi
- fi
-
- if use raspberry-pi; then
- append-cflags -I"${ESYSROOT}"/opt/vc/include
- append-ldflags -L"${ESYSROOT}"/opt/vc/lib
- fi
-
- mpv_feature_multi() {
- local use set
- for use in ${1} ${2}; do
- use ${use} || set=disabled
- done
- echo -D${3-${2}}=${set-enabled}
- }
-
- local emesonargs=(
- $(meson_use cli cplayer)
- $(meson_use libmpv)
- $(meson_use test tests)
-
- $(meson_feature cli html-build)
- $(meson_feature cli manpage-build)
- -Dpdf-build=disabled
-
- -Dbuild-date=false
-
- # misc options
- $(meson_feature archive libarchive)
- $(meson_feature bluray libbluray)
- $(meson_feature cdda)
- -Dcplugins=enabled
- $(meson_feature dvb dvbin)
- $(meson_feature dvd dvdnav)
- $(meson_feature gamepad sdl2-gamepad)
- $(meson_feature iconv)
- $(meson_feature javascript)
- -Dlibavdevice=enabled
- $(meson_feature lcms lcms2)
- -Dlua=$(usex lua "${ELUA}" disabled)
- $(meson_feature rubberband)
- -Dsdl2=$(use gamepad || use sdl && echo enabled || echo disabled) #857156
- $(meson_feature uchardet)
- -Dvapoursynth=disabled # only available in overlays
- $(meson_feature vector)
- $(meson_feature zimg)
- $(meson_feature zlib)
-
- # audio output
- $(meson_feature alsa)
- $(meson_feature coreaudio)
- $(meson_feature jack)
- $(meson_feature openal)
- $(meson_feature pipewire)
- $(meson_feature pulseaudio pulse)
- $(meson_feature sdl sdl2-audio)
- $(meson_feature sndio)
-
- # video output
- $(meson_feature X x11)
- $(meson_feature aqua cocoa)
- $(meson_feature drm)
- $(meson_feature drm gbm)
- $(meson_feature jpeg)
- $(meson_feature libcaca caca)
- $(meson_feature libplacebo)
- $(meson_feature mmal rpi-mmal)
- $(meson_feature sdl sdl2-video)
- -Dsixel=disabled # TODO? needs keywording/testing
- $(meson_feature wayland)
- $(meson_feature xv)
-
- -Dgl=$(use egl || use libmpv || use opengl || use raspberry-pi &&
- echo enabled || echo disabled)
- $(meson_feature egl)
- $(mpv_feature_multi egl X egl-x11)
- $(mpv_feature_multi egl drm egl-drm)
- $(mpv_feature_multi egl wayland egl-wayland)
- $(meson_feature libmpv plain-gl)
- $(mpv_feature_multi opengl X gl-x11)
- $(mpv_feature_multi opengl aqua gl-cocoa)
- $(meson_feature raspberry-pi rpi)
-
- $(meson_feature vulkan)
- $(meson_feature vulkan shaderc)
-
- # hardware decoding
- $(meson_feature nvenc cuda-hwaccel)
- $(meson_feature nvenc cuda-interop)
-
- $(meson_feature vaapi)
- $(mpv_feature_multi vaapi X vaapi-x11)
- $(mpv_feature_multi 'vaapi X' egl vaapi-x-egl)
- $(mpv_feature_multi 'vaapi egl' drm vaapi-drm)
- $(mpv_feature_multi 'vaapi egl' wayland vaapi-wayland)
-
- $(meson_feature vdpau)
- $(mpv_feature_multi vdpau opengl vdpau-gl-x11)
-
- $(mpv_feature_multi aqua opengl videotoolbox-gl)
- )
-
- meson_src_configure
-}
-
-src_test() {
- # https://github.com/mpv-player/mpv/blob/master/DOCS/man/options.rst#debugging
- edo "${BUILD_DIR}"/mpv --no-config -v --unittest=all-simple
-}
-
-src_install() {
- meson_src_install
-
- if use lua; then
- insinto /usr/share/${PN}
- doins -r TOOLS/lua
-
- if use cli && use lua_single_target_luajit; then
- pax-mark -m "${ED}"/usr/bin/${PN}
- fi
- fi
-
- if use tools; then
- dobin TOOLS/{mpv_identify.sh,umpv}
- newbin TOOLS/idet.sh mpv_idet.sh
- python_fix_shebang "${ED}"/usr/bin/umpv
- fi
-
- if use cli; then
- dodir /usr/share/doc/${PF}/html
- mv "${ED}"/usr/share/doc/{mpv,${PF}/html}/mpv.html || die
- mv "${ED}"/usr/share/doc/{mpv,${PF}/examples} || die
- fi
-
- local GLOBIGNORE=*/*build*:*/*policy*
- dodoc RELEASE_NOTES DOCS/*.{md,rst}
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "URL support" net-misc/yt-dlp
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2023-03-06 20:41 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2023-03-06 20:41 UTC (permalink / raw
To: gentoo-commits
commit: b88415abf5a1a3174a30fb6bdf4cdca8cb8a6ab7
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 6 20:35:40 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 6 20:39:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88415ab
media-video/mpv: backport ytdl hook fix for dash videos
Feels safe enough for straight-to-stable given only touches
the lua script which is already semi-broken.
Closes: https://bugs.gentoo.org/899956
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../files/mpv-0.35.1-yt-dlp-edl-fragments.patch | 55 ++++++++++++++++++++++
.../{mpv-0.35.1.ebuild => mpv-0.35.1-r1.ebuild} | 4 ++
2 files changed, 59 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch b/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
new file mode 100644
index 000000000000..058c608233d4
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/899956
+https://github.com/mpv-player/mpv/pull/11398
+
+From 985655ebfd77ceddc44d76f8cc6dc446002f34ee Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:45:45 +0100
+Subject: [PATCH 1/2] ytdl_hook: init fragment requires other fragments
+
+With dash the first fragment was always considered an init fragment if
+there wasn't a duration. However that only makes sense when there are
+also other fragments, so check if there are other fragments in addition
+to the lack of a duration.
+--- a/player/lua/ytdl_hook.lua
++++ b/player/lua/ytdl_hook.lua
+@@ -297,7 +297,7 @@ local function edl_track_joined(fragments, protocol, is_live, base)
+ local args = ""
+
+ -- assume MP4 DASH initialization segment
+- if not fragments[1].duration then
++ if not fragments[1].duration and #fragments > 1 then
+ msg.debug("Using init segment")
+ args = args .. ",init=" .. edl_escape(join_url(base, fragments[1]))
+ offset = 2
+
+From a5961ad096b1361a12f836c8b170fc748f46962a Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich <christoph.heinrich@student.tugraz.at>
+Date: Fri, 3 Mar 2023 00:50:58 +0100
+Subject: [PATCH 2/2] ytdl_hook: only log error when no fallback url available
+
+An error indicates that something doesn't work, but as long as a
+safe url is available, playback is still expected to work.
+
+Thus reduce logging level of MP4 DASH without fragments message and
+add a new error message for when there is no safe url available either.
+
+Also adds a missing space.
+--- a/player/lua/ytdl_hook.lua
++++ b/player/lua/ytdl_hook.lua
+@@ -309,7 +309,7 @@ local function edl_track_joined(fragments, protocol, is_live, base)
+ -- if not available in all, give up.
+ for i = offset, #fragments do
+ if not fragments[i].duration then
+- msg.error("EDL doesn't support fragments" ..
++ msg.verbose("EDL doesn't support fragments " ..
+ "without duration with MP4 DASH")
+ return nil
+ end
+@@ -423,6 +423,7 @@ local function formats_to_edl(json, formats, use_all_formats)
+ track.protocol, json.is_live,
+ track.fragment_base_url)
+ if not edl_track and not url_is_safe(track.url) then
++ msg.error("No safe URL or supported fragmented stream available")
+ return nil
+ end
+
diff --git a/media-video/mpv/mpv-0.35.1.ebuild b/media-video/mpv/mpv-0.35.1-r1.ebuild
similarity index 99%
rename from media-video/mpv/mpv-0.35.1.ebuild
rename to media-video/mpv/mpv-0.35.1-r1.ebuild
index 5ea6dc240af6..9d2d6ee62ae3 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1-r1.ebuild
@@ -133,6 +133,10 @@ BDEPEND="
cli? ( dev-python/docutils )
wayland? ( dev-util/wayland-scanner )"
+PATCHES=(
+ "${FILESDIR}"/${P}-yt-dlp-edl-fragments.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2023-12-16 21:18 James Le Cuirot
0 siblings, 0 replies; 17+ messages in thread
From: James Le Cuirot @ 2023-12-16 21:18 UTC (permalink / raw
To: gentoo-commits
commit: 90b4f2e08581cfccf88f8f38ccf388002af5982a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 16 21:16:59 2023 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Dec 16 21:17:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b4f2e0
media-video/mpv: Apply upstream patch to fix USE="drm -wayland -X"
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-video/mpv/files/mpv-0.37.0-drm-fix.patch | 41 ++++++++++++++++++++++++++
media-video/mpv/mpv-0.37.0.ebuild | 4 +++
2 files changed, 45 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.37.0-drm-fix.patch b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
new file mode 100644
index 000000000000..7e10c07eebc1
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
@@ -0,0 +1,41 @@
+From e575ec4fc3654387c7358bd3640877ef32628d2c Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Wed, 22 Nov 2023 19:44:13 +0100
+Subject: [PATCH] meson: also expose present_sync for VT-only after
+ a96d04f19d73
+
+$ meson setup --auto-features=disabled -Ddrm=enabled -Degl=enabled -Dgbm=enabled -Degl-drm=enabled /tmp/mpv_build
+$ meson compile -C /tmp/mpv_build
+[...]
+ld: error: undefined symbol: mp_present_initialize
+>>> referenced by drm_common.c
+>>> libmpv.so.2.2.0.p/video_out_drm_common.c.o:(vo_drm_init)
+
+ld: error: undefined symbol: present_sync_update_values
+>>> referenced by drm_common.c
+>>> libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_swap
+>>> referenced by drm_common.c
+>>> libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_get_info
+>>> referenced by vo_drm.c
+>>> libmpv.so.2.2.0.p/video_out_vo_drm.c.o:(get_vsync)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a3c3430dd47b..6fd5afa5122a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1049,7 +1049,7 @@ if features['xv']
+ sources += files('video/out/vo_xv.c')
+ endif
+
+-if features['wayland'] or features['x11']
++if features['wayland'] or features['x11'] or features['drm']
+ sources += ('video/out/present_sync.c')
+ endif
+
diff --git a/media-video/mpv/mpv-0.37.0.ebuild b/media-video/mpv/mpv-0.37.0.ebuild
index 8e95724ccf24..36d77d771326 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -134,6 +134,10 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.37.0-drm-fix.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
python-single-r1_pkg_setup
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
@ 2024-04-27 12:11 Ionen Wolkens
0 siblings, 0 replies; 17+ messages in thread
From: Ionen Wolkens @ 2024-04-27 12:11 UTC (permalink / raw
To: gentoo-commits
commit: 4e091b5132f293fe93791bafd379666f89481191
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 27 11:43:37 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 27 12:10:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e091b51
media-video/mpv: drop 0.37.0-r1
No real need to keep this -r1, will stable 0.38 soon'ish.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch | 45 ----
media-video/mpv/mpv-0.37.0-r1.ebuild | 284 -------------------------
2 files changed, 329 deletions(-)
diff --git a/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch b/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
deleted file mode 100644
index 3ac8d9b7b8dc..000000000000
--- a/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/mpv-player/mpv/pull/13659
-From: Dudemanguy <random342@airmail.cc>
-Date: Thu, 7 Mar 2024 13:42:25 -0600
-Subject: [PATCH 1/2] ad_spdif: handle const buf pointee in avio_alloc_context
-
-ffmpeg recently changed this field to be const which causes our CI to
-fail on newer versions.
-
-See: https://github.com/FFmpeg/FFmpeg/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5
---- a/audio/decode/ad_spdif.c
-+++ b/audio/decode/ad_spdif.c
-@@ -59,7 +59,11 @@ struct spdifContext {
- struct mp_decoder public;
- };
-
-+#if LIBAVCODEC_VERSION_MAJOR < 61
- static int write_packet(void *p, uint8_t *buf, int buf_size)
-+#else
-+static int write_packet(void *p, const uint8_t *buf, int buf_size)
-+#endif
- {
- struct spdifContext *ctx = p;
-
-
-From 7f9eabfb023611565db8b6cce9a3473a6eb6c731 Mon Sep 17 00:00:00 2001
-From: Dudemanguy <random342@airmail.cc>
-Date: Thu, 7 Mar 2024 14:12:15 -0600
-Subject: [PATCH 2/2] filters/f_lavfi: handle removed
- AV_OPT_TYPE_CHANNEL_LAYOUT
-
-See: https://github.com/FFmpeg/FFmpeg/commit/65ddc74988245a01421a63c5cffa4d900c47117c
---- a/filters/f_lavfi.c
-+++ b/filters/f_lavfi.c
-@@ -1034,7 +1034,11 @@ static const char *get_avopt_type_name(enum AVOptionType type)
- case AV_OPT_TYPE_VIDEO_RATE: return "fps";
- case AV_OPT_TYPE_DURATION: return "duration";
- case AV_OPT_TYPE_COLOR: return "color";
-+#if LIBAVUTIL_VERSION_MAJOR < 59
- case AV_OPT_TYPE_CHANNEL_LAYOUT: return "channellayout";
-+#else
-+ case AV_OPT_TYPE_CHLAYOUT: return "channellayout";
-+#endif
- case AV_OPT_TYPE_BOOL: return "bool";
- case AV_OPT_TYPE_CONST: // fallthrough
- default:
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild b/media-video/mpv/mpv-0.37.0-r1.ebuild
deleted file mode 100644
index a0cb7dee8450..000000000000
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git"
-else
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/"
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-SLOT="0/2" # soname
-IUSE="
- +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
- dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
- +lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
- sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
- zimg zlib
-"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( cli libmpv )
- egl? ( || ( X drm wayland ) )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( || ( egl opengl vulkan ) )
- opengl? ( || ( X aqua ) )
- test? ( cli )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? ( || ( X drm wayland ) )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) )
- xv? ( X )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- media-libs/libass:=[fontconfig]
- >=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
- >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXpresent
- x11-libs/libXrandr
- xv? ( x11-libs/libXv )
- )
- alsa? ( media-libs/alsa-lib )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray:= )
- cdda? (
- dev-libs/libcdio-paranoia:=
- dev-libs/libcdio:=
- )
- drm? (
- x11-libs/libdrm
- egl? ( media-libs/mesa[gbm(+)] )
- )
- dvd? (
- media-libs/libdvdnav
- media-libs/libdvdread:=
- )
- egl? (
- media-libs/libglvnd
- media-libs/libplacebo[opengl]
- )
- gamepad? ( media-libs/libsdl2[joystick] )
- iconv? (
- virtual/libiconv
- uchardet? ( app-i18n/uchardet )
- )
- jack? ( virtual/jack )
- javascript? ( dev-lang/mujs:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- lcms? ( media-libs/lcms:2 )
- libcaca? ( media-libs/libcaca )
- lua? ( ${LUA_DEPS} )
- openal? ( media-libs/openal )
- opengl? ( media-libs/libglvnd[X?] )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-libs/libpulse )
- rubberband? ( media-libs/rubberband )
- sdl? ( media-libs/libsdl2[sound,threads,video] )
- sixel? ( media-libs/libsixel )
- sndio? ( media-sound/sndio:= )
- vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
- vdpau? ( x11-libs/libvdpau )
- vulkan? (
- media-libs/shaderc
- media-libs/vulkan-loader[X?,wayland?]
- )
- wayland? (
- dev-libs/wayland
- dev-libs/wayland-protocols
- x11-libs/libxkbcommon
- )
- zimg? ( media-libs/zimg )
- zlib? ( sys-libs/zlib:= )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-mplayer )
- tools? ( ${PYTHON_DEPS} )
-"
-DEPEND="
- ${COMMON_DEPEND}
- X? ( x11-base/xorg-proto )
- dvb? ( sys-kernel/linux-headers )
- nvenc? ( media-libs/nv-codec-headers )
- wayland? ( dev-libs/wayland-protocols )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- cli? ( dev-python/docutils )
- wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.37.0-drm-fix.patch
- "${FILESDIR}"/${PN}-0.37.0-ffmpeg7.patch
-)
-
-pkg_setup() {
- use lua && lua-single_pkg_setup
- python-single-r1_pkg_setup
-}
-
-src_configure() {
- if use !debug; then
- if use test; then
- einfo "Skipping -DNDEBUG due to USE=test"
- else
- append-cppflags -DNDEBUG # treated specially
- fi
- fi
-
- mpv_feature_multi() {
- local use set
- for use in ${1} ${2}; do
- use ${use} || set=disabled
- done
- echo -D${3-${2}}=${set-enabled}
- }
-
- local emesonargs=(
- $(meson_use cli cplayer)
- $(meson_use libmpv)
- $(meson_use test tests)
-
- $(meson_feature cli html-build)
- $(meson_feature cli manpage-build)
- -Dpdf-build=disabled
-
- -Dbuild-date=false
-
- # misc options
- $(meson_feature archive libarchive)
- $(meson_feature bluray libbluray)
- $(meson_feature cdda)
- -Dcplugins=enabled
- $(meson_feature dvb dvbin)
- $(meson_feature dvd dvdnav)
- $(meson_feature gamepad sdl2-gamepad)
- $(meson_feature iconv)
- $(meson_feature javascript)
- -Dlibavdevice=enabled
- $(meson_feature lcms lcms2)
- -Dlua=$(usex lua "${ELUA}" disabled)
- $(meson_feature rubberband)
- -Dsdl2=$(use gamepad || use sdl && echo enabled || echo disabled) #857156
- $(meson_feature uchardet)
- -Dvapoursynth=disabled # only available in overlays
- $(meson_feature zimg)
- $(meson_feature zlib)
-
- # audio output
- $(meson_feature alsa)
- $(meson_feature coreaudio)
- $(meson_feature jack)
- $(meson_feature openal)
- $(meson_feature pipewire)
- $(meson_feature pulseaudio pulse)
- $(meson_feature sdl sdl2-audio)
- $(meson_feature sndio)
-
- # video output
- $(meson_feature X x11)
- $(meson_feature aqua cocoa)
- $(meson_feature drm)
- $(meson_feature jpeg)
- $(meson_feature libcaca caca)
- $(meson_feature sdl sdl2-video)
- $(meson_feature sixel)
- $(meson_feature wayland)
- $(meson_feature xv)
-
- -Dgl=$(use egl || use libmpv || use opengl &&
- echo enabled || echo disabled)
- $(meson_feature egl)
- $(mpv_feature_multi egl X egl-x11)
- $(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
- $(mpv_feature_multi egl drm egl-drm)
- $(mpv_feature_multi egl wayland egl-wayland)
- $(meson_feature libmpv plain-gl)
- $(mpv_feature_multi opengl X gl-x11)
- $(mpv_feature_multi opengl aqua gl-cocoa)
-
- $(meson_feature vulkan)
- $(meson_feature vulkan shaderc)
-
- # hardware decoding
- $(meson_feature nvenc cuda-hwaccel)
- $(meson_feature nvenc cuda-interop)
-
- $(meson_feature vaapi)
- $(mpv_feature_multi vaapi X vaapi-x11)
- $(mpv_feature_multi vaapi drm vaapi-drm)
- $(mpv_feature_multi vaapi wayland vaapi-wayland)
-
- $(meson_feature vdpau)
- $(mpv_feature_multi vdpau opengl vdpau-gl-x11)
-
- $(mpv_feature_multi aqua opengl videotoolbox-gl)
-
- # notable options left to automagic
- #dmabuf-wayland: USE="drm wayland" + plus memfd_create support
- #vulkan-interop: USE="vulkan" + >=ffmpeg-6.1
- # TODO?: perhaps few more similar compound options should be left auto
- )
-
- meson_src_configure
-}
-
-src_test() {
- # ffmpeg tests are picky and easily break without necessarily
- # meaning that there are runtime issues (bug #921091,#924276)
- meson_src_test --no-suite ffmpeg
-}
-
-src_install() {
- meson_src_install
-
- if use lua; then
- insinto /usr/share/${PN}
- doins -r TOOLS/lua
-
- if use cli && use lua_single_target_luajit; then
- pax-mark -m "${ED}"/usr/bin/${PN}
- fi
- fi
-
- if use tools; then
- dobin TOOLS/{mpv_identify.sh,umpv}
- newbin TOOLS/idet.sh mpv_idet.sh
- python_fix_shebang "${ED}"/usr/bin/umpv
- fi
-
- if use cli; then
- dodir /usr/share/doc/${PF}/html
- mv "${ED}"/usr/share/doc/{mpv,${PF}/html}/mpv.html || die
- mv "${ED}"/usr/share/doc/{mpv,${PF}/examples} || die
- fi
-
- local GLOBIGNORE=*/*build*:*/*policy*
- dodoc RELEASE_NOTES DOCS/*.{md,rst}
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- optfeature "URL support with USE=lua" net-misc/yt-dlp
-}
^ permalink raw reply related [flat|nested] 17+ messages in thread
end of thread, other threads:[~2024-04-27 12:11 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-15 8:49 [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2024-04-27 12:11 Ionen Wolkens
2023-12-16 21:18 James Le Cuirot
2023-03-06 20:41 Ionen Wolkens
2022-11-12 14:22 Ionen Wolkens
2020-01-05 18:54 Mikle Kolyada
2018-07-28 8:53 Michał Górny
2018-03-11 13:07 Michael Palimaka
2018-02-14 19:55 Michał Górny
2016-08-15 20:54 Patrice Clement
2016-04-12 18:47 Patrice Clement
2016-03-14 18:20 Ian Delaney
2016-03-10 21:51 Patrice Clement
2016-03-01 6:22 Ian Delaney
2016-03-01 6:22 Ian Delaney
2016-01-18 20:50 Patrice Clement
2015-12-28 13:27 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox