commit:     6fe471d6de67f5d543183ef4b6533cca33a61548
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  9 18:30:48 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Mar  9 20:12:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe471d6

media-video/mpv: drop 0.34.1-r1

Been a while and about time to clean this up + old libplacebo
despite bug #885397 that leaves mpv without alpha keywords anymore
(up to alpha@ whether want to leave that way or still rekeyword).

Bug: https://bugs.gentoo.org/885397
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/mpv/Manifest             |   2 -
 media-video/mpv/metadata.xml         |   2 -
 media-video/mpv/mpv-0.34.1-r1.ebuild | 359 -----------------------------------
 3 files changed, 363 deletions(-)

diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 17ec75c9053d..b935d2d6787d 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,2 @@
-DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B 
c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab
 SHA512 
77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
 DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 
9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f
 SHA512 
d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
 DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 
706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de
 SHA512 
42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a
-DIST waf-2.0.22 104880 BLAKE2B 
6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0
 SHA512 
4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292

diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 6813c210d437..f635e0d7c024 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -9,11 +9,9 @@
                <flag name="archive">Enable support for various archive formats 
via <pkg>app-arch/libarchive</pkg></flag>
                <flag name="bluray">Enable playback of Blu-ray 
filesystems</flag>
                <flag name="cli">Enable the command-line player</flag>
-               <flag name="cplugins">Enable C plugins support</flag>
                <flag name="drm">Enable Kernel Mode Setting / Direct Rendering 
Manager based video outputs</flag>
                <flag name="egl">Enable support for various EGL-based video 
outputs / backends</flag>
                <flag name="gamepad">Enable gamepad input support</flag>
-               <flag name="gbm">Enable Graphics Buffer Manager based EGL video 
backend</flag>
                <flag name="libmpv">Enable the shared library and headers (used 
by frontends / plugins)</flag>
                <flag name="libplacebo">Enable support for GPU accelerated 
video rendering with <pkg>media-libs/libplacebo</pkg></flag>
                <flag name="lua">Enable Lua scripting, OSC (On Screen 
Controller) GUI, and <pkg>net-misc/yt-dlp</pkg> support</flag>

diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild 
b/media-video/mpv/mpv-0.34.1-r1.ebuild
deleted file mode 100644
index 529896f60781..000000000000
--- a/media-video/mpv/mpv-0.34.1-r1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=2.0.22
-
-inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils 
python-r1 toolchain-funcs waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-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 ~loong ppc ppc64 ~riscv 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"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
-       dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv 
+lua
-       nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
-       selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib 
zimg"
-
-REQUIRED_USE="
-       || ( cli libmpv )
-       aqua? ( opengl )
-       egl? ( || ( gbm X wayland ) )
-       gamepad? ( sdl )
-       gbm? ( drm egl opengl )
-       lcms? ( opengl )
-       lua? ( ${LUA_REQUIRED_USE} )
-       nvenc? ( opengl )
-       opengl? ( || ( aqua egl X raspberry-pi !cli ) )
-       raspberry-pi? ( opengl )
-       test? ( opengl )
-       tools? ( cli )
-       uchardet? ( iconv )
-       vaapi? ( || ( gbm X wayland ) )
-       vdpau? ( X )
-       vulkan? ( || ( X wayland ) )
-       wayland? ( egl )
-       X? ( egl? ( opengl ) )
-       xv? ( X )
-       ${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 )
-       archive? ( >=app-arch/libarchive-3.4.0:= )
-       bluray? ( >=media-libs/libbluray-0.3.0:= )
-       cdda? ( dev-libs/libcdio-paranoia
-                       dev-libs/libcdio:= )
-       drm? ( x11-libs/libdrm )
-       dvd? (
-               >=media-libs/libdvdnav-4.2.0:=
-               >=media-libs/libdvdread-4.1.0:=
-       )
-       egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
-       gamepad? ( media-libs/libsdl2 )
-       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 )
-       >=media-libs/libass-0.12.1:=[fontconfig,harfbuzz(+)]
-       virtual/ttf-fonts
-       libcaca? ( >=media-libs/libcaca-0.99_beta18 )
-       lua? ( ${LUA_DEPS} )
-       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 )
-       sdl? ( media-libs/libsdl2[sound,threads,video] )
-       vaapi? ( media-libs/libva:=[drm(+)?,X?,wayland?] )
-       vdpau? ( x11-libs/libvdpau )
-       vulkan? (
-               >=media-libs/libplacebo-3.104.0:=[vulkan]
-               <media-libs/libplacebo-5
-               media-libs/shaderc
-       )
-       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 )
-       zimg? ( >=media-libs/zimg-2.9.2 )
-"
-DEPEND="${COMMON_DEPEND}
-       ${PYTHON_DEPS}
-       dvb? ( virtual/linuxtv-dvb-headers )
-       nvenc? ( >=media-libs/nv-codec-headers-8.2.15.7 )
-"
-RDEPEND="${COMMON_DEPEND}
-       nvenc? ( x11-drivers/nvidia-drivers[X] )
-       selinux? ( sec-policy/selinux-mplayer )
-       tools? ( ${PYTHON_DEPS} )
-"
-BDEPEND="dev-python/docutils
-       virtual/pkgconfig
-       test? ( >=dev-util/cmocka-1.0.0 )
-"
-
-pkg_setup() {
-       use lua && lua-single_pkg_setup
-}
-
-src_prepare() {
-       cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die
-       chmod +x "${S}"/waf || die
-       default
-}
-
-src_configure() {
-       python_setup
-       tc-export CC PKG_CONFIG AR
-
-       if use raspberry-pi; then
-               append-cflags -I"${ESYSROOT}/opt/vc/include"
-               append-ldflags -L"${ESYSROOT}/opt/vc/lib"
-       fi
-
-       local mywafargs=(
-               --confdir="${EPREFIX}/etc/${PN}"
-
-               $(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.
-               $(usex debug '' '--disable-debug-build')
-
-               $(use_enable doc html-build)
-               --disable-pdf-build
-               --enable-manpage-build
-               $(use_enable cplugins)
-               $(use_enable test)
-
-               $(use_enable iconv)
-               $(use_enable lua)
-               $(use_enable javascript)
-               $(use_enable zlib)
-               $(use_enable bluray libbluray)
-               $(use_enable dvd dvdnav)
-               $(use_enable cdda)
-               $(use_enable uchardet)
-               $(use_enable rubberband)
-               $(use_enable lcms lcms2)
-               --disable-vapoursynth # Only available in overlays.
-               $(use_enable archive libarchive)
-
-               --enable-libavdevice
-
-               # Audio outputs:
-               $(use_enable sdl sdl2) # Listed under audio, but also includes 
video.
-               $(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 vulkan libplacebo)
-               $(use_enable raspberry-pi rpi)
-               $(usex libmpv "$(use_enable opengl plain-gl)" 
'--disable-plain-gl')
-               $(usex opengl '' '--disable-gl')
-               $(use_enable vulkan)
-               $(use_enable gamepad sdl2-gamepad)
-
-               # HWaccels:
-               # Automagic Video Toolbox HW acceleration. See Gentoo bug 
577332.
-               $(use_enable nvenc cuda-hwaccel)
-               $(use_enable nvenc cuda-interop)
-
-               # TV features:
-               $(use_enable dvb dvbin)
-
-               # Miscellaneous features:
-               $(use_enable zimg)
-       )
-       if use lua; then
-               if use lua_single_target_luajit; then
-                       mywafargs+=( --lua="luajit" )
-               else
-                       # Because it would be too simple to just let the user 
directly
-                       # specify the package name to check, wouldn't it.
-                       mywafargs+=( --lua="$(ver_rs 1 '' $(ver_cut 1-2 
$(lua_get_version)))" )
-               fi
-       fi
-
-       if use vaapi && use X; then
-               mywafargs+=(
-                       $(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
-       )
-
-       mywafargs+=(
-               --bashdir="$(get_bashcompdir)"
-               --zshdir="${EPREFIX}"/usr/share/zsh/site-functions
-)
-
-       # 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 lua_single_target_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
-
-       optfeature "URL support" net-misc/yt-dlp
-
-       xdg_icon_cache_update
-       xdg_desktop_database_update
-}
-
-pkg_postrm() {
-       xdg_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
-}

Reply via email to