diff options
Diffstat (limited to 'media-video')
-rw-r--r-- | media-video/Manifest.gz | bin | 23236 -> 23229 bytes | |||
-rw-r--r-- | media-video/mpv/Manifest | 4 | ||||
-rw-r--r-- | media-video/mpv/mpv-0.40.0-r1.ebuild (renamed from media-video/mpv/mpv-0.40.0.ebuild) | 23 | ||||
-rw-r--r-- | media-video/mpv/mpv-9999.ebuild | 23 |
4 files changed, 32 insertions, 18 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 88267acf6d2e..c936afb5419f 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index af3755695619..4a816c8fd56e 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,6 +1,6 @@ DIST mpv-0.39.0.tar.gz 3494313 BLAKE2B 9f96ba225eb0587d50f8c439359b18f752b98024ab6b40f987be4d57b0ce4b595243f49177ffc48840b351ce19fddc84788b5784b508eb685e58fdfb8e1e0520 SHA512 9cf1d7487b1e9e36d2b731bf951c4d3b9deba95109af408ccfc71b88e85f6de2558e7b4950781667bb4d40e0352742e3ed278559ff34d07905dd459969cbf503 DIST mpv-0.40.0.tar.gz 3561474 BLAKE2B 618cffca1ec30da0a49b91e168dd1d041e5646f7930fa65ced1f58aabed2e663f6a161c0c71b2f1769fa43a0873d91ef8219f11c5458e8ecb67b4466581c4f90 SHA512 24ccbff7fa34f85c033dc9ed94a364c6226e1081a47086365fc98e332af2004517dede371a005f1d51c2a3306b7dc915df9de4188cea140b1fd988058bbd6e8c EBUILD mpv-0.39.0-r1.ebuild 6978 BLAKE2B 5fe607c89e16f6e9c1414107a42bc2e76e6f7eae56b0c0923077ca770e9548f92dfd786d9c29027238ab0d1ed6b86085f2f6ad6e5663a4d037b452acf2d1e064 SHA512 fdf47bdf2ef0442eb1c71feb36cd6ecac6727202fe462a2f4ed67704eb1c4229fa0932da699ccef3a7c72d91d1d7bbc574912505677c44ad92c10523b354b2e1 -EBUILD mpv-0.40.0.ebuild 6076 BLAKE2B e706a980a6a004d6c642baf4ba7e12a8b174a19af91d24c5b31d730a3923849b0280d052b6306803e0ac2f53f765a3dde419f315b4ee0fe2340773aa4a14134e SHA512 15c133ac7088bae48660a4caa9361af8d8a8e3d6dcd42e1e6e2d4beb9968cdf24015a8b8b93d2c91436eb1f1156cccff6a19afc7c8afd072eba6d4f55e3e999d -EBUILD mpv-9999.ebuild 6116 BLAKE2B e73e9986bc2c2a9f1c49f4c01b6405cc6ba723c6ba1b6a723089f3a5f7d6a4b7588fabaac9494708c5febd4e226ae6eb848a21eb116a00ff1be7ce81ac27ab0a SHA512 a15896aa3adc27bae7afee0e013f032bf71b1556ab530cd901118c0f95c958996526435ca1941616b591601750bdd807c50df653b23bbd4dd73394636a4abd96 +EBUILD mpv-0.40.0-r1.ebuild 6396 BLAKE2B e564a6f7cc6387e3d17ded50f41095fc03ec3f29f0aff26f48a88d81526c65b45b216ccbd30bb9fb2ac95d9d7edb12d894906902b73da85a6b84623d2b612f6b SHA512 ea681453402cd0b6be505d3bba1a3375696c8e0b5cf59613e892837c73dd3f01dfd00a84caee07050b4cd84d2fe8a1126e143860ee72b5a572b1752d993edf51 +EBUILD mpv-9999.ebuild 6436 BLAKE2B e0bddad8d3b94d971a536a8335a53b2defafd31c356f6c2f0f86f74d896e5a2f22776674e50da38e4131841c0054eb744502b49bff4047dac4823a6cbdfe83c2 SHA512 4a684af70bacf19a440b4e6140f2bc59790ac7ba635db4acff9f0b7f6518c7e7adcc7b682caf669372e0e61b81afeeb1fef9fe41777d4016eabe981393617cfa MISC metadata.xml 2053 BLAKE2B dc35c3bcdb29eb08725a4f908575ecc2afed2d772988ff12ad052c39e9b195a68611e8037b82ee5ceefc33c40d8df666e03aa59d836eeb7c6472bd988f49b4ee SHA512 4e7cd2da4df81f9ecafddfe93788cabbc4f0de0ff9b976af2ab3fb0f63b2d7daee6d8c5607685240f41be37a158b9fa0acd030d8c62da835891d19af3870668c diff --git a/media-video/mpv/mpv-0.40.0.ebuild b/media-video/mpv/mpv-0.40.0-r1.ebuild index b17efcfce030..409716b6966f 100644 --- a/media-video/mpv/mpv-0.40.0.ebuild +++ b/media-video/mpv/mpv-0.40.0-r1.ebuild @@ -23,17 +23,16 @@ 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 + +lua nvenc openal 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 ) ) + nvenc? ( || ( egl vulkan ) ) test? ( cli ) tools? ( cli ) uchardet? ( iconv ) @@ -46,7 +45,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" media-libs/libass:=[fontconfig] - >=media-libs/libplacebo-7.349.0:=[opengl?,vulkan?] + >=media-libs/libplacebo-7.349.0:=[vulkan?] >=media-video/ffmpeg-6.1:=[encode(+),soc(-)?,threads(+),vaapi?,vdpau?] X? ( x11-libs/libX11 @@ -85,7 +84,6 @@ COMMON_DEPEND=" 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:= ) @@ -123,6 +121,15 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner ) " +pkg_pretend() { + if has_version "${CATEGORY}/${PN}[X,opengl]" && use !egl; then #953107 + ewarn "${PN}'s 'opengl' USE was removed in favour of the 'egl' USE as it was" + ewarn "only for the deprecated 'gl-x11' mpv option when 'egl-x11/wayland'" + ewarn "should be used if --gpu-api=opengl. It is recommended to enable 'egl'" + ewarn "unless using vulkan (default since ${PN}-0.40) or something else." + fi +} + pkg_setup() { use lua && lua-single_pkg_setup python-single-r1_pkg_setup @@ -189,7 +196,7 @@ src_configure() { $(meson_feature wayland) $(meson_feature xv) - -Dgl=$(use egl || use libmpv || use opengl && + -Dgl=$(use aqua || use egl || use libmpv && echo enabled || echo disabled) $(meson_feature egl) $(meson_feature libmpv plain-gl) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index aaf45c44fd62..e79b68414d16 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -23,17 +23,16 @@ 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 + +lua nvenc openal 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 ) ) + nvenc? ( || ( egl vulkan ) ) test? ( cli ) tools? ( cli ) uchardet? ( iconv ) @@ -46,7 +45,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" media-libs/libass:=[fontconfig] - >=media-libs/libplacebo-7.349.0:=[opengl?,vulkan?] + >=media-libs/libplacebo-7.349.0:=[vulkan?] >=media-video/ffmpeg-6.1:=[encode(+),soc(-)?,threads(+),vaapi?,vdpau?] X? ( x11-libs/libX11 @@ -85,7 +84,6 @@ COMMON_DEPEND=" 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:= ) @@ -126,6 +124,15 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner ) " +pkg_pretend() { + if has_version "${CATEGORY}/${PN}[X,opengl]" && use !egl; then #953107 + ewarn "${PN}'s 'opengl' USE was removed in favour of the 'egl' USE as it was" + ewarn "only for the deprecated 'gl-x11' mpv option when 'egl-x11/wayland'" + ewarn "should be used if --gpu-api=opengl. It is recommended to enable 'egl'" + ewarn "unless using vulkan (default since ${PN}-0.40) or something else." + fi +} + pkg_setup() { use lua && lua-single_pkg_setup python-single-r1_pkg_setup @@ -192,7 +199,7 @@ src_configure() { $(meson_feature wayland) $(meson_feature xv) - -Dgl=$(use egl || use libmpv || use opengl && + -Dgl=$(use aqua || use egl || use libmpv && echo enabled || echo disabled) $(meson_feature egl) $(meson_feature libmpv plain-gl) |