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 <random...@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 <random...@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 -}
