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 1073B15808C for ; Thu, 17 Mar 2022 04:28:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6EADE0833; Thu, 17 Mar 2022 04:28:33 +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 98BDAE0827 for ; Thu, 17 Mar 2022 04:28:29 +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 E2C5B3436A0 for ; Thu, 17 Mar 2022 04:28:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 189BF2D7 for ; Thu, 17 Mar 2022 04:28:26 +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: <1647491299.4eee842ef97f79cfb4071633792d9b7fa8909a3a.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/libva/libva-9999.ebuild X-VCS-Directories: x11-libs/libva/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 4eee842ef97f79cfb4071633792d9b7fa8909a3a X-VCS-Branch: master Date: Thu, 17 Mar 2022 04:28:26 +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: 8ac46203-43c1-4cc9-a4a7-190eba2b8f04 X-Archives-Hash: 4758665f9b0210a92e6c0b1c23e33c56 commit: 4eee842ef97f79cfb4071633792d9b7fa8909a3a Author: Matt Turner gentoo org> AuthorDate: Thu Mar 17 02:29:27 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Mar 17 04:28:19 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eee842e x11-libs/libva: Switch to Meson Signed-off-by: Matt Turner gentoo.org> x11-libs/libva/libva-9999.ebuild | 47 ++++++++++++---------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild index e3ae90808c43..2524e763954e 100644 --- a/x11-libs/libva/libva-9999.ebuild +++ b/x11-libs/libva/libva-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit autotools multilib-minimal optfeature +inherit meson-multilib optfeature DESCRIPTION="Video Acceleration (VA) API for Linux" HOMEPAGE="https://01.org/linuxmedia/vaapi" @@ -13,25 +13,21 @@ if [[ ${PV} = *9999 ]] ; then EGIT_BRANCH=master EGIT_REPO_URI="https://github.com/intel/libva" else - SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" - # The upstream provides periodically tarball with pre-built 'configure'. - # To simplify updates, portage use tarballs without pre-build 'configure' - # which are always available. - # SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="MIT" SLOT="0/$(ver_cut 1)" -IUSE="+drm opengl utils wayland X" +IUSE="+drm wayland X" RDEPEND=" >=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}] - opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) wayland? ( >=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,12 +38,6 @@ BDEPEND=" wayland? ( dev-util/wayland-scanner ) virtual/pkgconfig " -PDEPEND="utils? ( media-video/libva-utils )" - -REQUIRED_USE="|| ( drm wayland X ) - opengl? ( X )" - -DOCS=( NEWS ) MULTILIB_WRAPPED_HEADERS=( /usr/include/va/va_backend_glx.h @@ -57,26 +47,17 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/va/va_glx.h ) -src_prepare() { - default - eautoreconf -} - multilib_src_configure() { - local myeconfargs=( - --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" - $(use_enable opengl glx) - $(use_enable X x11) - $(use_enable wayland) - $(use_enable drm) - --enable-va-messaging + local emesonargs=( + -Ddriverdir="${EPREFIX}/usr/$(get_libdir)/va/drivers" + -Ddisable_drm=false + -Dwith_x11=$(usex X) + -Dwith_glx=$(usex X) + -Dwith_wayland=$(usex wayland) + -Denable_docs=false + -Denable_va_messaging=true ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - default - find "${ED}" -type f -name "*.la" -delete || die + meson_src_configure } pkg_postinst() {