commit: 251affd864fc5ba4a690222a05cf3067992bfee3 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Jun 6 12:39:01 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jun 6 13:18:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251affd8
media-video/mpv: drop 0.37.0 Closes: https://bugs.gentoo.org/893422 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-video/mpv/Manifest | 1 - media-video/mpv/files/mpv-0.37.0-drm-fix.patch | 41 ---- media-video/mpv/metadata.xml | 2 - media-video/mpv/mpv-0.37.0.ebuild | 286 ------------------------- profiles/arch/arm/package.use.mask | 5 - profiles/arch/arm/package.use.stable.mask | 4 - profiles/arch/base/package.use.mask | 7 - 7 files changed, 346 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 0e7c6d471455..bf9c05f949be 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,2 +1 @@ -DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B 31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68 SHA512 a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257 DIST mpv-0.38.0.tar.gz 3419741 BLAKE2B 3ff59d30bc305394f58a1fff4f24540aa3be9412bc3cad27bec0c3478f4b7c13190e26847f38edc52996bb9f9a36dd6832c6fccebd6d873058acf78a320e42e4 SHA512 b5b2af59039ef4711814f94bbdfedb37f8ce914301670e42d4ed05fe1900025a3d3a2f3d5e69628a8aad115a647a27c386718959e2df1a18740468b3a84f8975 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 deleted file mode 100644 index 7e10c07eebc1..000000000000 --- a/media-video/mpv/files/mpv-0.37.0-drm-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e575ec4fc3654387c7358bd3640877ef32628d2c Mon Sep 17 00:00:00 2001 -From: Jan Beich <[email protected]> -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/metadata.xml b/media-video/mpv/metadata.xml index 4fb09acf0a6a..2601ee1c24c1 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -13,11 +13,9 @@ <flag name="gamepad">Enable gamepad input support</flag> <flag name="libmpv">Enable the shared library and headers (used by frontends / plugins)</flag> <flag name="lua">Enable Lua scripting, OSC (On Screen Controller) GUI, and <pkg>net-misc/yt-dlp</pkg> support</flag> - <flag name="mmal">Enable Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi</flag> <flag name="opengl">Enable support for OpenGL-based video backends (Note: deprecated for X11, USE=egl provides the newer support for -gpu-api=opengl)</flag> <flag name="pipewire">Enable sound support via native PipeWire backend</flag> - <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> <flag name="rubberband">Enable high quality pitch correction via <pkg>media-libs/rubberband</pkg></flag> <flag name="sdl">Enable <pkg>media-libs/libsdl2</pkg> based video and audio outputs (Note: these outputs exist for compatibility reasons only, avoid if possible)</flag> diff --git a/media-video/mpv/mpv-0.37.0.ebuild b/media-video/mpv/mpv-0.37.0.ebuild deleted file mode 100644 index f7dd7257fca2..000000000000 --- a/media-video/mpv/mpv-0.37.0.ebuild +++ /dev/null @@ -1,286 +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 mmal nvenc openal opengl pipewire pulseaudio raspberry-pi - rubberband sdl selinux sixel sndio 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 )" - -# raspberry-pi: default to -bin given non-bin is known broken (bug #893422) -COMMON_DEPEND=" - media-libs/libass:=[fontconfig] - >=media-libs/libplacebo-6.338:=[opengl?,vulkan?] - >=media-video/ffmpeg-4.4:=[encode,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 ) - raspberry-pi? ( - || ( - media-libs/raspberrypi-userland-bin - media-libs/raspberrypi-userland - ) - ) - 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 -) - -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 mmal rpi-mmal) - $(meson_feature sdl sdl2-video) - $(meson_feature sixel) - $(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 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 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 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_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 -} diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask index 4bb172204dc1..5cbea4768169 100644 --- a/profiles/arch/arm/package.use.mask +++ b/profiles/arch/arm/package.use.mask @@ -283,10 +283,6 @@ net-libs/gnutls test-full # Moved from use.mask since they are flags local to one package. media-tv/tvheadend hdhomerun -# Patrice Clement <[email protected]> (2017-09-24) -# Unmask Raspberry Pi support on arm. -media-video/mpv -raspberry-pi - # James Le Cuirot <[email protected]> (2017-09-20) # media-sound/mac's executable segfaults when compressing all but the # smallest wav files. @@ -372,7 +368,6 @@ net-print/hplip -scanner kde # MMAL is available on the Raspberry Pi (armv6 & armv7 so far) media-video/ffmpeg -mmal media-video/ffmpeg-chromium -mmal -media-video/mpv -mmal # Alexis Ballier <[email protected]> (2015-04-02) # Needs ilmbase (openexr), which does not build and is masked on arm. diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask index 674e85444f0a..98ed6c81b6ae 100644 --- a/profiles/arch/arm/package.use.stable.mask +++ b/profiles/arch/arm/package.use.stable.mask @@ -171,10 +171,6 @@ dev-db/mariadb jdbc # RPI support on arm dev-libs/libcec -raspberry-pi -# Ilya Tumaykin <[email protected]> (2016-04-13) -# Requires special hardware to test and stabilize properly. -media-video/mpv raspberry-pi - # Brian Evans <[email protected]> (2016-01-08) # net-misc/libteam is not yet stable on arm net-misc/networkmanager teamd diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask index 9298664bc709..ab532b7a07b8 100644 --- a/profiles/arch/base/package.use.mask +++ b/profiles/arch/base/package.use.mask @@ -388,19 +388,12 @@ dev-db/mariadb jdbc # This flag only has meaning on amd64 sys-boot/grub:2 grub_platforms_xen-32 -# Ian Delaney <[email protected]> (2016-04-06) -# on behalf of Ilya Tumaykin <[email protected]> -# Raspberry Pi support is only available on arm. -# Mask raspberry-pi USE globally, unmask on arm. -media-video/mpv raspberry-pi - # Alexis Ballier <[email protected]> (2015-11-14) # MMAL is only available on the Raspberry Pi: # Mask it globally, unmask it on arm. media-video/motion mmal media-video/ffmpeg mmal media-video/ffmpeg-chromium mmal -media-video/mpv mmal # Brian Evans <[email protected]> (2015-09-14) # Mask new USE flags for mariadb which all arches do not yet have dependencies
