From 240b57012ace855bbfd9934b07642416ceeeb5b8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Jul 2023 22:29:02 +0100 Subject: gentoo auto-resync : 25:07:2023 - 22:29:01 --- media-video/mpv/Manifest | 2 +- media-video/mpv/mpv-9999.ebuild | 30 ++++++++++++++++-------------- 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'media-video/mpv') diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 1e78321bcf6d..b4e20ed70571 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -6,5 +6,5 @@ DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B 7260c265f02918d4caf72d8d8ecc9d4ab9783d66d EBUILD mpv-0.35.1-r1.ebuild 7610 BLAKE2B 0e2a9d6c0817f92995d53055357a4b1757b126bb7d4c105d3542630df9410475560f98772fbc021855a6e3acd029d7bbaf3cb50fc2734dd9122a05be50aab5fb SHA512 b04ea9db0876192883f62cf0ede1b2df633b7c0691d482248b1e765dd779a50679a9e11785943b218e73bfc66bdb2c3eb952765077f8e7b3de0774b2cab31f8c EBUILD mpv-0.35.1-r2.ebuild 7652 BLAKE2B 7042109178a580d3d88bf7781cc7d1e8c503ba404eaff4512061a1d6526aa4aedb33537e103dedf5d2beec61fd4978b1762dd6de8950b1a31effadd601e5a905 SHA512 594c7b3a433ff96ec7ea84633e5660580fcf5b79d1c3021714d1b79782065e391895762795ccd796c3ad265b4c087ebc75582b07a8a8d6b5b7a66ff3bd9d93bb EBUILD mpv-0.36.0.ebuild 7480 BLAKE2B 9bbbd3eba115594e5cad5da49efab8bf352ed3dc0927ee5c5402ee6041db294894f193bc7fbae2b3aab9676b62429b31b9e295011ff8d0e10ba4c592b50e3da5 SHA512 2f24069a31e3fed2ee4d96e10237a832bf401fe4835680fd5f70a44cdc0e950ed34a956eb3135a32e7907068d1474c2ca5c1e74c755d8cb19074bd5ba3c9bf8e -EBUILD mpv-9999.ebuild 7405 BLAKE2B 924b536727e754a1fbb9ec42c262894790945bf61d1b29f73d5382a00dcf4becfb0516dce0e352b895b7348aca3920916566c64abee97c9f2159793a99d3a869 SHA512 ad68a613ae65daf4735701fb19ca8bb48a1bf87a355c5622916b01e6559ba1990b3290e73a31f6ffd3bd15ed6a27c4bd3561b825a5b0a5d3d8b6b1dd0834d791 +EBUILD mpv-9999.ebuild 7382 BLAKE2B 7df0202158ed38380996a7957ea42e3714f4c0abfb6c4a8df6d0007b3b45713a456da82c7e5d3b9896ed7ff27cec7e88f8c3c2b7892d4da9a759496d8872c86f SHA512 0d0d79eb13f7059b8f23c2e2f038be99554f4bd60d2ee6b6285c6093f27153b13001318395bb8d8c1f750d34e580903e636003785cea1bfb3ef5bca059aa3d34 MISC metadata.xml 2324 BLAKE2B 6fe57270fef9275f47b0d7f282fbf4ff5c4a76c74e43820a8e0a4d56348eb72dc89dfdb06a9ff9a2b6f73d35102f861200d6c8c6f4dc41cfb4e42ff69d70da8a SHA512 0418e3315b4ded29714099d80075f61f6d1b38d9109bbb3bc372abbaceb14f705d5798eac2c14ef0fd0e1c557785291a4acb5e773dffb46f0b7f7962bf38d041 diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index c2718b1e8de1..5984f7637494 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -24,8 +24,9 @@ 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 sixel sndio test tools +uchardet - vaapi vdpau vulkan wayland +xv zimg zlib" + raspberry-pi rubberband sdl selinux sixel sndio test tools + +uchardet vaapi vdpau vulkan wayland +xv zimg zlib +" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} || ( cli libmpv ) @@ -37,13 +38,11 @@ REQUIRED_USE=" test? ( cli ) tools? ( cli ) uchardet? ( iconv ) - vaapi? ( - || ( X egl libplacebo wayland ) - wayland? ( drm ) - ) + vaapi? ( || ( X drm wayland ) ) vdpau? ( X ) vulkan? ( || ( X wayland ) libplacebo ) - xv? ( X )" + xv? ( X ) +" RESTRICT="!test? ( test )" # raspberry-pi: default to -bin given non-bin is known broken (bug #893422) @@ -67,8 +66,8 @@ COMMON_DEPEND=" dev-libs/libcdio:= ) drm? ( - media-libs/mesa[gbm(+)] x11-libs/libdrm + egl? ( media-libs/mesa[gbm(+)] ) ) dvd? ( media-libs/libdvdnav @@ -116,22 +115,26 @@ COMMON_DEPEND=" x11-libs/libxkbcommon ) zimg? ( media-libs/zimg ) - zlib? ( sys-libs/zlib:= )" + zlib? ( sys-libs/zlib:= ) +" RDEPEND=" ${COMMON_DEPEND} selinux? ( sec-policy/selinux-mplayer ) - tools? ( ${PYTHON_DEPS} )" + 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 )" + wayland? ( dev-libs/wayland-protocols ) +" BDEPEND=" ${PYTHON_DEPS} virtual/pkgconfig cli? ( dev-python/docutils ) - wayland? ( dev-util/wayland-scanner )" + wayland? ( dev-util/wayland-scanner ) +" pkg_setup() { use lua && lua-single_pkg_setup @@ -200,7 +203,6 @@ src_configure() { $(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) @@ -214,6 +216,7 @@ src_configure() { 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) @@ -231,7 +234,6 @@ src_configure() { $(meson_feature vaapi) $(mpv_feature_multi vaapi X vaapi-x11) $(mpv_feature_multi vaapi drm vaapi-drm) - $(mpv_feature_multi vaapi egl vaapi-egl) $(mpv_feature_multi vaapi wayland vaapi-wayland) $(meson_feature vdpau) -- cgit v1.2.3