From d1edfd3a57afc1db57e14cc58d3f28eea8eefd64 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Nov 2022 15:32:09 +0000 Subject: gentoo auto-resync : 12:11:2022 - 15:32:08 --- media-video/Manifest.gz | Bin 25838 -> 25846 bytes media-video/mpv/Manifest | 9 +- .../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 --------------------- media-video/mpv/mpv-0.35.0.ebuild | 284 ++++++++++++++++++++ media-video/mpv/mpv-9999.ebuild | 9 +- 7 files changed, 290 insertions(+), 314 deletions(-) delete mode 100644 media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch delete mode 100644 media-video/mpv/mpv-0.34.1_p20221105.ebuild create mode 100644 media-video/mpv/mpv-0.35.0.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 7bae42103920..0106e49580a5 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 16c12a84c7bb..4a0e343b201d 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,8 +1,7 @@ -AUX mpv-0.34.1_p20221105-macos-touchbar.patch 364 BLAKE2B fbf48c6bc5c2e1e7bd891c90a50b5c58c05a3db523632ffef73d5f9b8b7482fb3b07642ee74b8e45f02115ec6ab54aaa6fbaff7bdd374a5ed1a000e376e6eb32 SHA512 07786a4fb1c31ea7f7cc88efbb86b682548b3315a89b13fe78234d7857784e2ba18f611eee3a1b22241aebbe422510dd900093211ef6419003b46f22b25edee6 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 EBUILD mpv-0.34.1-r1.ebuild 9733 BLAKE2B 7c2c0935efc35f23a5389f4f9e367e3e0e0dc862b27b27c816edcaf0623c5dc9879ccef5e3519fc35b9be1ae87b3ba80f5e60dd430bbb43df581245e92b3be80 SHA512 64f06b5d6e16d943d4bf614117304839c09cb34cba4ce561b5e68c826e83672a0e9218a486de68fd506ce9c7b2a50e92b0627c66c3ebe048175c214dabd09aba -EBUILD mpv-0.34.1_p20221105.ebuild 7443 BLAKE2B 7da8e2e6283fa555ad2554c4ada42dd8ffa143cf4dc2b64e54dac4bb8f36913691c5951e012d18fddd57d127e78ae983ba22cfa9a33d9daf8e31f7ec67eab70e SHA512 9cd6ade78c5b4232e88339960ae79340c938eb339c4ef5addae369f4e9095ae53ead6c82d05cdf4d5c9d06eb979dd74289d7398d87613668927f460c129c12b8 -EBUILD mpv-9999.ebuild 7389 BLAKE2B 742c5b973fabaca9261248deabcf08de55e67183d5f4758f01ea3f2fc7987a043edb27d04709c0766c059d5a99ca1b387110f67c37191e6d4a9267b8cf7f1721 SHA512 60d1f0bbfe057a4baabd80d4d49e3872e6eaf3b972c2aeb251989c0fa8bd61116e3fd51bf635c69e491eede9a853b0f4a06948e5fbf23c7140a1d26917a477cc -MISC metadata.xml 2790 BLAKE2B e080803b3907aadd28e9d0b54177cf210def169d84242503b6bca102a621d0f75bd19a6e9ee2939aaae070bd9e09b6b33c10bba481d5e8db0927035057c048be SHA512 50ca35e8cb726bd6828801f97d49a3bd748051de8d4d94f8c21b3a63db28877b02de0d4599a92a9228113104314d7a99dc8c1a1c9a4e779a785382d74bf12bac +EBUILD mpv-0.35.0.ebuild 7189 BLAKE2B 645afe7c41d2bfe5d0aadc6e965f7810557b792e9a51c66e612d0f6f708d25e27ff76091aa46b0308f952bd50545c076d36e24cd8d4db19533732266ba58bd75 SHA512 1926c0ea713c133e5578744d34df7418a189d940965fffb38ed7e82e54606e8a8181bff920a36b5c36bcb5a530c9fe493dd4e8bb9fd7f749d816313c8e125908 +EBUILD mpv-9999.ebuild 7189 BLAKE2B 645afe7c41d2bfe5d0aadc6e965f7810557b792e9a51c66e612d0f6f708d25e27ff76091aa46b0308f952bd50545c076d36e24cd8d4db19533732266ba58bd75 SHA512 1926c0ea713c133e5578744d34df7418a189d940965fffb38ed7e82e54606e8a8181bff920a36b5c36bcb5a530c9fe493dd4e8bb9fd7f749d816313c8e125908 +MISC metadata.xml 2653 BLAKE2B f8d61d0e48f97cfdbe568eb8fd11b732b52ce57a9b464ca8a817e524e3ba867a74bdfc08d7013f5f029c8a96852dd7f6f3844302b681c1741546679e41faa6ca SHA512 2c50254388adf1f946ea621ad9341847ee0cb664939b51dfedf33b584b17486f7efee336696db72d874f4f4db1841cb6a4aa51da8dfc15c490511dfb35f9e4c1 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 @@ Enable sound support via media-sound/sndio Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv Enable subtitles charset discovery via app-i18n/uchardet - Use function implementations more amenable to vectorization (gives speedup). Made optional in case of bugs. Enable support for various Vulkan-based video backends Enable libzimg support (for vf_fingerprint) 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 -} diff --git a/media-video/mpv/mpv-0.35.0.ebuild b/media-video/mpv/mpv-0.35.0.ebuild new file mode 100644 index 000000000000..80c072d09d63 --- /dev/null +++ b/media-video/mpv/mpv-0.35.0.ebuild @@ -0,0 +1,284 @@ +# 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 + 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" +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 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 )" + +pkg_setup() { + use lua && lua-single_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + default + + 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 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 +} diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 44b6c139ad77..80c072d09d63 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -11,9 +11,7 @@ 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}" + 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" fi @@ -27,7 +25,7 @@ IUSE=" 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" + vaapi vdpau vulkan wayland +xv zimg zlib" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( cli libmpv ) @@ -133,8 +131,6 @@ pkg_setup() { src_prepare() { default - [[ ${PV} == 9999 ]] || sed -i "s/UNKNOWN/${HASH_MPV::11}/" VERSION || die - sed -i "s/'rst2html/&.py/" meson.build || die } @@ -188,7 +184,6 @@ src_configure() { -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) -- cgit v1.2.3