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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A854E1592C2 for ; Mon, 17 Apr 2023 01:25:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4863E0A44; Mon, 17 Apr 2023 01:25:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 7120CE0A44 for ; Mon, 17 Apr 2023 01:25:53 +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 980DE340D59 for ; Mon, 17 Apr 2023 01:25:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E922F8DF for ; Mon, 17 Apr 2023 01:25:50 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1681694745.e9eaf08653a2ada19b94c9807a6b85008a125b3c.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libva/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libva/libva-2.18.0-r1.ebuild media-libs/libva/libva-2.18.0.ebuild media-libs/libva/libva-9999.ebuild X-VCS-Directories: media-libs/libva/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e9eaf08653a2ada19b94c9807a6b85008a125b3c X-VCS-Branch: master Date: Mon, 17 Apr 2023 01:25:50 +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: 37f29f7c-1077-41f5-845d-fd1d3efef7b5 X-Archives-Hash: 32e9e07a89223f7d9bb637c855c9a942 commit: e9eaf08653a2ada19b94c9807a6b85008a125b3c Author: Sebastian Parborg gmail com> AuthorDate: Tue Mar 7 16:56:17 2023 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Apr 17 01:25:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9eaf086 media-libs/libva: Fix circular dependency with mesa This removes the GLX backend to drop the "virtual/opengl" dependency. Without removing this, it would pull in mesa which in turn would pull in libva if vaapi support was turned on. Removing the GLX backend doesn't seem to have any practical downsides, even under X11, as the EGL backend seems to be used even if libva were compiled with GLX support. Signed-off-by: Sebastian Parborg gmail.com> Signed-off-by: Matt Turner gentoo.org> media-libs/libva/{libva-2.18.0.ebuild => libva-2.18.0-r1.ebuild} | 8 ++------ media-libs/libva/libva-9999.ebuild | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/media-libs/libva/libva-2.18.0.ebuild b/media-libs/libva/libva-2.18.0-r1.ebuild similarity index 89% rename from media-libs/libva/libva-2.18.0.ebuild rename to media-libs/libva/libva-2.18.0-r1.ebuild index ef0203c92e12..4f264beeabed 100644 --- a/media-libs/libva/libva-2.18.0.ebuild +++ b/media-libs/libva/libva-2.18.0-r1.ebuild @@ -19,8 +19,7 @@ fi LICENSE="MIT" SLOT="0/$(ver_cut 1)" -IUSE="opengl wayland X" -REQUIRED_USE="opengl? ( X )" +IUSE="wayland X" RDEPEND=" >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}] @@ -28,7 +27,6 @@ RDEPEND=" >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) X? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] @@ -42,11 +40,9 @@ BDEPEND=" " MULTILIB_WRAPPED_HEADERS=( - /usr/include/va/va_backend_glx.h /usr/include/va/va_x11.h /usr/include/va/va_dri2.h /usr/include/va/va_dricommon.h - /usr/include/va/va_glx.h ) multilib_src_configure() { @@ -54,7 +50,7 @@ multilib_src_configure() { -Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers" -Ddisable_drm=false -Dwith_x11=$(usex X) - -Dwith_glx=$(usex X) + -Dwith_glx=no -Dwith_wayland=$(usex wayland) -Denable_docs=false ) diff --git a/media-libs/libva/libva-9999.ebuild b/media-libs/libva/libva-9999.ebuild index ef0203c92e12..4f264beeabed 100644 --- a/media-libs/libva/libva-9999.ebuild +++ b/media-libs/libva/libva-9999.ebuild @@ -19,8 +19,7 @@ fi LICENSE="MIT" SLOT="0/$(ver_cut 1)" -IUSE="opengl wayland X" -REQUIRED_USE="opengl? ( X )" +IUSE="wayland X" RDEPEND=" >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}] @@ -28,7 +27,6 @@ RDEPEND=" >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) X? ( - >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] @@ -42,11 +40,9 @@ BDEPEND=" " MULTILIB_WRAPPED_HEADERS=( - /usr/include/va/va_backend_glx.h /usr/include/va/va_x11.h /usr/include/va/va_dri2.h /usr/include/va/va_dricommon.h - /usr/include/va/va_glx.h ) multilib_src_configure() { @@ -54,7 +50,7 @@ multilib_src_configure() { -Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers" -Ddisable_drm=false -Dwith_x11=$(usex X) - -Dwith_glx=$(usex X) + -Dwith_glx=no -Dwith_wayland=$(usex wayland) -Denable_docs=false )