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 EEBB9158093 for ; Mon, 4 Jul 2022 02:41:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C05FFE0843; Mon, 4 Jul 2022 02:41:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 9BF0AE0827 for ; Mon, 4 Jul 2022 02:41:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 54D33341BD1 for ; Mon, 4 Jul 2022 02:41:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AAB88526 for ; Mon, 4 Jul 2022 02:41:09 +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: <1656902429.b6e3751885a971b0bffa3af6e466b1ae69ae9153.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/libva-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/libva-utils/libva-utils-9999.ebuild X-VCS-Directories: media-video/libva-utils/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: b6e3751885a971b0bffa3af6e466b1ae69ae9153 X-VCS-Branch: master Date: Mon, 4 Jul 2022 02:41:09 +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: a11c9800-e81b-4679-bcf0-34c1ab8fd05f X-Archives-Hash: c7bca929c22dfadaa89e817351525a8a commit: b6e3751885a971b0bffa3af6e466b1ae69ae9153 Author: Matt Turner gentoo org> AuthorDate: Mon Jul 4 02:13:38 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Jul 4 02:40:29 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e37518 media-video/libva-utils: Switch to EAPI=8 * Add missing dep on libdrm * Drop unnecessary sed (now fixed upstream) * Restructure dependencies Signed-off-by: Matt Turner gentoo.org> media-video/libva-utils/libva-utils-9999.ebuild | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/media-video/libva-utils/libva-utils-9999.ebuild b/media-video/libva-utils/libva-utils-9999.ebuild index 4decf846c639..428cc77cbc2d 100644 --- a/media-video/libva-utils/libva-utils-9999.ebuild +++ b/media-video/libva-utils/libva-utils-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit meson @@ -25,29 +25,24 @@ REQUIRED_USE=" || ( examples putsurface test vainfo ) " -BDEPEND="virtual/pkgconfig" - -if [[ ${PV} = *9999 ]] ; then - DEPEND="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]" -else - DEPEND=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]" -fi - -DEPEND+=" +DEPEND=" + x11-libs/libdrm wayland? ( >=dev-libs/wayland-1.0.6 ) X? ( >=x11-libs/libX11-1.6.2 ) " +if [[ ${PV} = *9999 ]] ; then + DEPEND+="~x11-libs/libva-${PV}:=[drm(+),wayland?,X?]" +else + DEPEND+=">=x11-libs/libva-$(ver_cut 1-2).0:=[drm(+),wayland?,X?]" +fi RDEPEND="${DEPEND}" +BDEPEND="virtual/pkgconfig" src_prepare() { default local sed_args=() - # Fix broken dependency check - # https://github.com/intel/libva-utils/pull/260 - sed_args+=(-e "s/dependency('drm'/dependency('libdrm'/") - if ! use examples ; then sed_args+=( -e "/^subdir('decode')$/d"