diff options
Diffstat (limited to 'media-video/mpv')
-rw-r--r-- | media-video/mpv/Manifest | 10 | ||||
-rw-r--r-- | media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch | 28 | ||||
-rw-r--r-- | media-video/mpv/files/mpv-0.29.1-egl-bound.patch | 27 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.30.0.ebuild | 16 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.31.0.ebuild (renamed from media-video/mpv/mpv-0.29.1-r1.ebuild) | 77 | ||||
-rw-r--r-- | media-video/mpv/mpv-9999.ebuild | 16 |
6 files changed, 56 insertions, 118 deletions
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 45d50957e2ef..7219c935198f 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,9 +1,7 @@ -AUX mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch 1463 BLAKE2B 94343df8eb4b64462fdf5003bf3cfd028b44e1d5dbf43e2879dc371b0eb71e2569925d7d8b5a988ab38b22ed7ec9375b73d73b9ce7396793d3d96665a4469711 SHA512 7d82e578f9e8bd486f309abd3131cbd98e8f48ce7cc696105f860db032741621498a937b8bf887ee9fee0a4f36d5b476e1722a5c639a0d2842bf82712cd8de86 -AUX mpv-0.29.1-egl-bound.patch 1060 BLAKE2B 3e2c59c4e4c2929cce59735e37059fb3d6b42396287241bc0875fe14dbf2b415571c58af89e8328cb99ab5294e7ca0010ddc18581e36c999aef9f858dd05f0df SHA512 259c9711e33821103ed12c1e07c695d2b93e1d730499abf78352be395e72d870d3ce526504559cd3b69d5854e74acd995cf5a481383fa36e20927bf7a99c6213 -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 -EBUILD mpv-0.29.1-r1.ebuild 10367 BLAKE2B f470542d7c202e72438e0394b76e40c1bafc20865cd3c5196afad26940619d35b8d121c997dfba8fa9a442b583b7e7a56f791df6b50232dc203019ad47e09864 SHA512 92c16e81be4a2376d16134edac4ed4a7cf98b7fa88f5122f776e7e225e80ed27ccac4bc8bc32330db25ad970584906c716770f13c324d7826dc1b6b02962b38d -EBUILD mpv-0.30.0.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a -EBUILD mpv-9999.ebuild 10046 BLAKE2B fe702a15cd11614126975d098a40b44759c38406e2603fffa382b1386c1b73250a46cdc2ffb8b8539bf70d68b744f9d4f6f2538080066ab91ec3c9e69b03a058 SHA512 d2395470a84c639a2102924e2169dddc72f799837282ae5e43675ca5164363cb7ecfe07c1bd764d679f67c536a2ed9e474bf227298e4d054228a0ebeaf960c7a +EBUILD mpv-0.30.0.ebuild 10024 BLAKE2B b6e0daffd7daa55250357159a4c8b01784a5c467abc5f5314d1e57a645b27a858099a33cb2b36985b2b12064148741b7387e03448eb4405d7a8b855bbe976890 SHA512 6a9a424fb35590a338d5717a361d8e44c9674b240a209816bdc741ff88b2864fc6d7bab83680023f8ba18d553ab3e9182cb98a63910065cef13f1f20c723d99b +EBUILD mpv-0.31.0.ebuild 10034 BLAKE2B 7677e8389016a0c2b781ac71a543bfcde5108854b2a105db6904d65f0f573499ff57e24876527cd74a88f317629850b2e0e82d061df83be782107acf8f3ad1b1 SHA512 a8c59c76cc5c3862ec4be9a35e3a4a7fc736b483972ef596a24b86762e8a2a3dd9cc4a5494c6b3954a4e3411504976fc3a6983338d89e1c0f3c6de0c5db3f4c4 +EBUILD mpv-9999.ebuild 10034 BLAKE2B 7677e8389016a0c2b781ac71a543bfcde5108854b2a105db6904d65f0f573499ff57e24876527cd74a88f317629850b2e0e82d061df83be782107acf8f3ad1b1 SHA512 a8c59c76cc5c3862ec4be9a35e3a4a7fc736b483972ef596a24b86762e8a2a3dd9cc4a5494c6b3954a4e3411504976fc3a6983338d89e1c0f3c6de0c5db3f4c4 MISC metadata.xml 2325 BLAKE2B ea9ce00b54f9aabf4f37dcbf20c94f6583e219638f6831e0f8f3292df0768d7e6c597a9072903604f8dbb7f88ef15cad87b2cbe57a41d22554e554cc6e9663b1 SHA512 84802287f2655571923a44c7383bac2f70838890b18222d0b060a371a79dbe5022bb7c186bb1ac6496b930c62dacafbc132178b60b0746bd2cce4eb08a5c6be7 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 1a4975a4e305..000000000000 --- 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 5a9be073fbfa..000000000000 --- 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.30.0.ebuild b/media-video/mpv/mpv-0.30.0.ebuild index d4a50dfa75a3..4e65a16aeb95 100644 --- a/media-video/mpv/mpv-0.30.0.ebuild +++ b/media-video/mpv/mpv-0.30.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) PYTHON_REQ_USE='threads(+)' WAF_PV=2.0.9 @@ -15,7 +15,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" 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" + 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" @@ -97,7 +97,7 @@ COMMON_DEPEND=" vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( - media-libs/libplacebo[vulkan] + media-libs/libplacebo:=[vulkan] media-libs/shaderc ) wayland? ( @@ -123,9 +123,9 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} virtual/pkgconfig - cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) - doc? ( dev-python/docutils - dev-python/rst2pdf ) + dev-python/docutils + cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 ) + doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) " @@ -166,7 +166,7 @@ src_configure() { $(use_enable doc html-build) $(use_enable doc pdf-build) - $(use_enable doc manpage-build) + --enable-manpage-build $(use_enable cplugins) $(use_enable test) diff --git a/media-video/mpv/mpv-0.29.1-r1.ebuild b/media-video/mpv/mpv-0.31.0.ebuild index 2df0619aa036..61db0d2cd470 100644 --- a/media-video/mpv/mpv-0.29.1-r1.ebuild +++ b/media-video/mpv/mpv-0.31.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) PYTHON_REQ_USE='threads(+)' WAF_PV=2.0.9 @@ -11,11 +11,11 @@ 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/" +HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" 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" + 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" @@ -28,19 +28,17 @@ 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 +IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins cuda debug doc drm dvb + dvd +egl gamepad 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 )" + selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib zimg" REQUIRED_USE=" || ( cli libmpv ) aqua? ( opengl ) cuda? ( opengl ) egl? ( || ( gbm X wayland ) ) + gamepad? ( sdl ) gbm? ( drm egl opengl ) lcms? ( opengl ) luajit? ( lua ) @@ -49,17 +47,17 @@ REQUIRED_USE=" 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} " +RESTRICT="!test? ( test )" + COMMON_DEPEND=" >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?] alsa? ( >=media-libs/alsa-lib-1.0.18 ) @@ -72,6 +70,7 @@ COMMON_DEPEND=" >=media-libs/libdvdread-4.1.0:= ) egl? ( media-libs/mesa[egl,gbm(-)?,wayland(-)?] ) + gamepad? ( media-libs/libsdl2 ) iconv? ( virtual/libiconv uchardet? ( app-i18n/uchardet ) @@ -95,12 +94,11 @@ COMMON_DEPEND=" 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/libplacebo:=[vulkan] media-libs/shaderc - media-libs/vulkan-loader[X?,wayland?] ) wayland? ( >=dev-libs/wayland-1.6.0 @@ -120,17 +118,16 @@ COMMON_DEPEND=" xv? ( x11-libs/libXv ) ) zlib? ( sys-libs/zlib ) + zimg? ( >=media-libs/zimg-2.9.2 ) " DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} - dev-python/docutils virtual/pkgconfig - cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) + dev-python/docutils + cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 ) 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] ) @@ -138,15 +135,10 @@ RDEPEND="${COMMON_DEPEND} 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 + default } src_configure() { @@ -158,10 +150,6 @@ src_configure() { 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}" @@ -174,15 +162,14 @@ src_configure() { --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 debug debug-build) + $(use_enable doc html-build) $(use_enable doc pdf-build) + --enable-manpage-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) @@ -192,14 +179,12 @@ src_configure() { $(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 @@ -241,32 +226,42 @@ src_configure() { $(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) + $(use_enable gamepad sdl2-gamepad) # 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. + $(use_enable zimg) ) if use vaapi && use X; then mywafargs+=( - $(use_enable opengl vaapi-glx) $(use_enable egl vaapi-x-egl) ) fi + # Not for us + mywafargs+=( + --disable-android + --disable-egl-android + --disable-uwp + --disable-audiounit + --disable-macos-media-player + --disable-wasapi + --disable-ios-gl + --disable-macos-touchbar + --disable-macos-cocoa-cb + --disable-tvos + --disable-egl-angle-win32 + ) + # Create reproducible non-live builds. [[ ${PV} != *9999* ]] && mywafargs+=(--disable-build-date) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index d4a50dfa75a3..61db0d2cd470 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +PYTHON_COMPAT=( python{3_6,3_7} ) PYTHON_REQ_USE='threads(+)' WAF_PV=2.0.9 @@ -97,7 +97,7 @@ COMMON_DEPEND=" vaapi? ( x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( x11-libs/libvdpau ) vulkan? ( - media-libs/libplacebo[vulkan] + media-libs/libplacebo:=[vulkan] media-libs/shaderc ) wayland? ( @@ -123,9 +123,9 @@ COMMON_DEPEND=" DEPEND="${COMMON_DEPEND} ${PYTHON_DEPS} virtual/pkgconfig - cuda? ( >=media-libs/nv-codec-headers-8.1.24.1 ) - doc? ( dev-python/docutils - dev-python/rst2pdf ) + dev-python/docutils + cuda? ( >=media-libs/nv-codec-headers-8.2.15.7 ) + doc? ( dev-python/rst2pdf ) dvb? ( virtual/linuxtv-dvb-headers ) test? ( >=dev-util/cmocka-1.0.0 ) " @@ -166,7 +166,7 @@ src_configure() { $(use_enable doc html-build) $(use_enable doc pdf-build) - $(use_enable doc manpage-build) + --enable-manpage-build $(use_enable cplugins) $(use_enable test) @@ -253,9 +253,9 @@ src_configure() { --disable-egl-android --disable-uwp --disable-audiounit + --disable-macos-media-player --disable-wasapi --disable-ios-gl - --disable-apple-remote --disable-macos-touchbar --disable-macos-cocoa-cb --disable-tvos |