From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F281415800A for ; Tue, 25 Jul 2023 19:23:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15872E0856; Tue, 25 Jul 2023 19:23:58 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0F71E0856 for ; Tue, 25 Jul 2023 19:23:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2208D340200 for ; Tue, 25 Jul 2023 19:23:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85D59DC0 for ; Tue, 25 Jul 2023 19:23:55 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1690312998.6bbca209faf999825ceb616e6a9c861844aa724a.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/mpv-9999.ebuild X-VCS-Directories: media-video/mpv/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 6bbca209faf999825ceb616e6a9c861844aa724a X-VCS-Branch: master Date: Tue, 25 Jul 2023 19:23:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ce8756b1-2fb5-456f-baad-3738c7cc03f8 X-Archives-Hash: c5b1f0ffb876d853521b3ea515b10ab3 commit: 6bbca209faf999825ceb616e6a9c861844aa724a Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jul 25 17:41:03 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jul 25 19:23:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbca209 media-video/mpv: update live vaapi-egl option just got removed. This along with previous updates now make vaapi options a lot less confusing and can be used with less USE being enabled. `vaapi? ( wayland? ( drm ) )` should also no longer be relevant, it was primarily added to avoid confusion from mpv-0.34->0.35 upgrade given the change in behavior that made it non-obvious that USE=-drm (perhaps disabled long ago) was breaking setups. But 0.34 been gone for a while now. Not that this means that should disable USE=drm unless really not being used. Also adjust gbm handling, technically only uses libgbm with egl-drm. Still does not feel worth having its own USE=gbm like before. Plus some minor style adjustments, used it for a while but having second thoughts about this quoting style. (note that there is good odds there will be 0.36.1 soon) Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-9999.ebuild | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) 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)