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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CE73B138334 for ; Fri, 5 Jul 2019 08:41:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1DCA0E0893; Fri, 5 Jul 2019 08:41:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 021AFE0893 for ; Fri, 5 Jul 2019 08:41:24 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0E681347109 for ; Fri, 5 Jul 2019 08:41:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B176762C for ; Fri, 5 Jul 2019 08:41:22 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1562316078.74780d6a86763c496ff6ceba415fcc448f91d937.polynomial-c@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: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 74780d6a86763c496ff6ceba415fcc448f91d937 X-VCS-Branch: master Date: Fri, 5 Jul 2019 08:41:22 +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: 4b3fb3b8-9729-4ad3-9187-744de909af37 X-Archives-Hash: 3f5e784b15ce4e3f27f8b4b2e3709caf commit: 74780d6a86763c496ff6ceba415fcc448f91d937 Author: Lars Wendler gentoo org> AuthorDate: Fri Jul 5 08:40:53 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Jul 5 08:41:18 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74780d6a x11-libs/libva: Synced live ebuild. Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Lars Wendler gentoo.org> x11-libs/libva/libva-9999.ebuild | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild index 7de898cf6aa..3a85df58500 100644 --- a/x11-libs/libva/libva-9999.ebuild +++ b/x11-libs/libva/libva-9999.ebuild @@ -1,20 +1,19 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit git-r3 - EGIT_BRANCH=master - EGIT_REPO_URI="https://github.com/intel/libva" - AUTOTOOLS_AUTORECONF="yes" -fi -inherit autotools-multilib eapi7-ver multilib +inherit multilib-minimal DESCRIPTION="Video Acceleration (VA) API for Linux" HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [[ ${PV} != *9999* ]] ; then +if [[ ${PV} = *9999* ]] ; then # Live ebuild + inherit autotools git-r3 + EGIT_BRANCH=master + EGIT_REPO_URI="https://github.com/intel/libva" + AUTOTOOLS_AUTORECONF="yes" +else SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" fi @@ -38,7 +37,8 @@ RDEPEND=" >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] ) " -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" virtual/pkgconfig " PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) @@ -62,6 +62,11 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/va/va_glx.h ) +src_prepare() { + default + [[ "${PV}" == *9999* ]] && eautoreconf +} + multilib_src_configure() { local myeconfargs=( --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" @@ -70,5 +75,5 @@ multilib_src_configure() { $(use_enable wayland) $(use_enable drm) ) - autotools-utils_src_configure + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" }