public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva/files/, x11-libs/libva/
@ 2016-06-23  8:18 Alexis Ballier
  0 siblings, 0 replies; 2+ messages in thread
From: Alexis Ballier @ 2016-06-23  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     702cc0ce44f05c2edb3f06baef21ec2a9ab96ca7
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 23 08:17:45 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 23 08:17:45 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=702cc0ce

x11-libs/libva: remove old

Package-Manager: portage-2.3.0_rc1

 x11-libs/libva/Manifest                            |  7 --
 ...libva-1.2.0-autotools-out-of-source-build.patch | 11 ---
 .../files/libva-1.5.1-wayland-automagic.patch      | 19 -----
 x11-libs/libva/libva-1.3.1.ebuild                  | 86 --------------------
 x11-libs/libva/libva-1.4.0.ebuild                  | 86 --------------------
 x11-libs/libva/libva-1.4.1.ebuild                  | 86 --------------------
 x11-libs/libva/libva-1.5.0.ebuild                  | 85 --------------------
 x11-libs/libva/libva-1.5.1.ebuild                  | 92 ----------------------
 x11-libs/libva/libva-1.6.0.ebuild                  | 92 ----------------------
 x11-libs/libva/libva-1.6.1.ebuild                  | 92 ----------------------
 10 files changed, 656 deletions(-)

diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 1ca8ffd..bee0fb3 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,10 +1,3 @@
-DIST libva-1.3.1.tar.bz2 760656 SHA256 8789b1f1ca9cbc2c1ae477323ec8f5fb269b9360410d4d5e9ec96d679b3cc297 SHA512 12afa39b965c50beb4a3f356b0fea18123d885a3c24b452a59906db38369362b290b35eaebcbc3e6079aa5d63f8d9c263d236bde9744d4b3725497bc700e5661 WHIRLPOOL 71feddc30e44fa1e461dad93a2342a65b9fa3319a044561037e96879ce166b09d82b6ea9898735cfe54812f9964a3310d80e822c9abb7a0d4b9e9acabd8a2488
-DIST libva-1.4.0.tar.bz2 769099 SHA256 70c36e6bd1159658043d655372cecf7a45d90c168df8868c112ed2189a6b7651 SHA512 f49a3c4bcd3d9b7813daa3793bec0ccbd54859c4b116e7009e9877d580a506f94f272600bba74cc5b2ef2caead15d24104d92f501a5fc5d02d62d7fac4f3da3c WHIRLPOOL bc936bb97682cfb93b5d050439330942908e1f45c8159d9cde9c6299b5eaaf7909a2aea3950308ff37d3c0945b59692b9b7013e25119e8d07d47c16ce41c5939
-DIST libva-1.4.1.tar.bz2 761421 SHA256 0662af0ecdf1cfd2bb47e86f5bf66009554fe12ce7bf5b9cec6a2cc43f3f4c11 SHA512 f5da66de96fcc1c7a86eae3a8b1cfd9d1e56d5f647be8fd831061e2a55b3ee98c4ecd392c518ae29d1c315b7358c6eda2c2727ee4386a0754b8b0be027a6e3fa WHIRLPOOL 8cf1e02f9ea9be36abfacc962013c7c41ad32dd03abffd104cc4273a8e5adbad64ae283cbe49cc4651c9f73818b8067bc7937bb747e7baf6f4396dbe389e0f8d
-DIST libva-1.5.0.tar.bz2 774266 SHA256 e946d4b3110e4e23ec6a588e0c828937e502c67196d1266214441fefc4b83486 SHA512 68f7605678b7c617edce8d81d88880806c92b431147614b4f802f0f93d844f14f6d3756040002d063ef4d049e2949958ea0f95a3bb2eafc8f47729c0ee97905a WHIRLPOOL 5cb34734061421d19d968e4f1bbc1629e31aeebadf1b61c9d9e5445c739ab5451fd4507cf44999c4c0067a0322a1649afd6289a7eb7aeea90deb9058f234cbfa
-DIST libva-1.5.1.tar.bz2 761390 SHA256 2511b25ead7a6ac1358bc4b81157647fef61e3904ccaca3cfefc3e976a0da005 SHA512 f3198c7b138974c75b0a929c26b15b4b72ec38fccd782a6d0b4df7ab0d496ceb14beac6837da13806c9dcfe6576d2cf585c01acd6e90ba0542d43c07efe530d8 WHIRLPOOL fc711102dbfab7ce3f81ef91d27e943d75217d668ec7605de75168b758f0465aeecd7f7b16407bf7fb48ea4367f1d589e9fabdd7e583803ae2aecf4a0ca4f74a
-DIST libva-1.6.0.tar.bz2 786561 SHA256 3ad9dc9c1a6a10e9cc4234c2a1cd5e568ec0cd25145e86875eba6e0d69153458 SHA512 59a451e42bdb70bca83e90800763e0a1a666044189d6399acf1d539b5ebb85d6e12317e8c7f7a97345549de9fd34ee4c7dc52d17ad5c3eb083f80aa15d1b8ed0 WHIRLPOOL a930d02a64c3caf33146aaf8340a4e1850d693595e3455406680d4611a092c779a3c4dbd97628b3a8e3340327262940f161b5fe925bf9a62022801b027a99a2b
-DIST libva-1.6.1.tar.bz2 771910 SHA256 7fa2c23fb4431ed8590a52173db18e8760fabb7321d14110c574cc8674594e2e SHA512 cd21c27b89c975cbf6cc77125625dca77332467b291536e0fa4640618871be9dbd1c51e7bd09d15b1af8dbd9166a29113f2dd10a50558ffa00d21161cb9d7958 WHIRLPOOL 5f9091315b411fe8b9d4a4e246bf41066355632b457e84c7beeb4d40d238d2d4defd828e455639e0403fd29b8f7877118f7658c9e768b5062eeceaf5556fbf4f
 DIST libva-1.6.2.tar.bz2 787002 SHA256 c417f09cdeef549e54f4be5f9876026513afeac395c5be28750b431d848c8bd0 SHA512 7e69c44cc1aaa94f0a9e8662ac10974b9e5ab2b29cb2b230370ef1449d8926ea4d4571593c6fa78c6601da4322716c7ab3d1ff42e889252c4769cc267bdc04be WHIRLPOOL e74193d0d31c1be4229b58058064e2e743aeb729e3daef045c7882e8f317c9ccccad9d74bbbea8144c6706a8793052f77acb1d3fcd6488e679be1e97a4a113f4
 DIST libva-1.7.0.tar.bz2 788519 SHA256 a689bccbcc81a66b458e448377f108c057d3eee44a2e21a23c92c549dc8bc95f SHA512 b6b5317e875c9a4e17ec4f8d37383edf83a479aa4d9fa85bcf7debecae40efc56506905a0eefcc695364543436b3d80ed007eb45c6161fae01ee979ed82a3ca0 WHIRLPOOL 6d92c658c72575150f05bf30070a5af75ee6aed6804939c888062ac245cbefc51cf099c04ab45794ad2b1e8eb52b4ca35a9b89513c27bbf03310cdd9f5d46311
 DIST libva-1.7.1.tar.bz2 801086 SHA256 480023cc55f254f371eb8683ea0563fe6f3ab36db6ce91c1b8d0a999ee5815c9 SHA512 6d0a1b3f7e23e2ab3dcd1e255d82912cce60bc29a58df4ce7c1e53dfbcd33cc8236f7185369ab31f181995ae8b5d706112c908efbc9eba4c3201e529d4379dbe WHIRLPOOL 5ee21e2ac603bb1675f6d22abb7223da4a1cbc43dc4ee6d720cfccfa2e69751d84983368eaacaa56e992c9e550fa85ecfbb054580a1a6038df8adc1fc614a633

diff --git a/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch b/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch
deleted file mode 100644
index 6d36154..0000000
--- a/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/va/Makefile.am	2013-06-26 21:45:56.000000000 -0400
-+++ b/va/Makefile.am	2014-01-29 14:41:48.878917222 -0500
-@@ -59,7 +59,7 @@
- 
- libva_ldflags = \
- 	$(LDADD) -no-undefined	\
--	-Wl,-version-script,libva.syms \
-+	-Wl,-version-script,$(top_srcdir)/va/libva.syms \
- 	$(NULL)
- 
- lib_LTLIBRARIES			= libva.la

diff --git a/x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch b/x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch
deleted file mode 100644
index d55c3f5..0000000
--- a/x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac	2015-06-14 18:17:48.776175722 +0200
-+++ b/configure.ac	2015-06-14 18:26:45.710159385 +0200
-@@ -275,14 +275,13 @@
-     if test "$USE_WAYLAND" = "yes"; then
-         AC_DEFINE([HAVE_VA_WAYLAND], [1],
-                   [Defined to 1 if VA/Wayland API is built])
-+        m4_ifdef([WAYLAND_SCANNER_RULES],
-+	  [WAYLAND_SCANNER_RULES(['$(top_buildir)/va/wayland/protocol'])],
-+	  [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])        
-     fi
- fi
- AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
- 
--m4_ifdef([WAYLAND_SCANNER_RULES],
--    [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
--    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)

diff --git a/x11-libs/libva/libva-1.3.1.ebuild b/x11-libs/libva/libva-1.3.1.ebuild
deleted file mode 100644
index 949f5d8..0000000
--- a/x11-libs/libva/libva-1.3.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
-			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-		)
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-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() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}

diff --git a/x11-libs/libva/libva-1.4.0.ebuild b/x11-libs/libva/libva-1.4.0.ebuild
deleted file mode 100644
index 1aa368c..0000000
--- a/x11-libs/libva/libva-1.4.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
-			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-		)
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-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() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}

diff --git a/x11-libs/libva/libva-1.4.1.ebuild b/x11-libs/libva/libva-1.4.1.ebuild
deleted file mode 100644
index 1aa368c..0000000
--- a/x11-libs/libva/libva-1.4.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
-			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-		)
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
-DOCS=( NEWS )
-
-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() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}

diff --git a/x11-libs/libva/libva-1.5.0.ebuild b/x11-libs/libva/libva-1.5.0.ebuild
deleted file mode 100644
index 11574fd..0000000
--- a/x11-libs/libva/libva-1.5.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
-			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-		)
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS=( NEWS )
-
-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() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}

diff --git a/x11-libs/libva/libva-1.5.1.ebuild b/x11-libs/libva/libva-1.5.1.ebuild
deleted file mode 100644
index bbad88c..0000000
--- a/x11-libs/libva/libva-1.5.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-REQUIRED_USE="|| ( drm wayland X )"
-
-VIDEO_CARDS="dummy nvidia intel fglrx nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
-			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-		)
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="opengl? ( X )"
-
-DOCS=( NEWS )
-
-PATCHES=(
-	# Fix automagic depend, bug #529388
-	# https://bugs.freedesktop.org/show_bug.cgi?id=79478
-	"${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
-)
-
-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() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}

diff --git a/x11-libs/libva/libva-1.6.0.ebuild b/x11-libs/libva/libva-1.6.0.ebuild
deleted file mode 100644
index 2e28edc..0000000
--- a/x11-libs/libva/libva-1.6.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-
-VIDEO_CARDS="dummy nvidia intel fglrx nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
-			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-		)
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-DOCS=( NEWS )
-
-PATCHES=(
-	# Fix automagic depend, bug #529388
-	# https://bugs.freedesktop.org/show_bug.cgi?id=79478
-	"${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
-)
-
-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() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}

diff --git a/x11-libs/libva/libva-1.6.1.ebuild b/x11-libs/libva/libva-1.6.1.ebuild
deleted file mode 100644
index 2e28edc..0000000
--- a/x11-libs/libva/libva-1.6.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-SCM=""
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SCM=git-2
-	EGIT_BRANCH=master
-	EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
-fi
-
-AUTOTOOLS_AUTORECONF="yes"
-inherit autotools-multilib ${SCM} multilib
-
-DESCRIPTION="Video Acceleration (VA) API for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/vaapi"
-if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
-	SRC_URI=""
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="https://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-if [ "${PV%9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-else
-	KEYWORDS=""
-fi
-IUSE="+drm egl opengl vdpau wayland X"
-
-VIDEO_CARDS="dummy nvidia intel fglrx nouveau"
-for x in ${VIDEO_CARDS}; do
-	IUSE+=" video_cards_${x}"
-done
-
-RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
-	egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? (
-		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
-			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
-		)
-	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
-	"
-
-REQUIRED_USE="|| ( drm wayland X )
-		opengl? ( X )"
-
-DOCS=( NEWS )
-
-PATCHES=(
-	# Fix automagic depend, bug #529388
-	# https://bugs.freedesktop.org/show_bug.cgi?id=79478
-	"${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
-)
-
-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() {
-	local myeconfargs=(
-		--with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
-		$(use_enable video_cards_dummy dummy-driver)
-		$(use_enable opengl glx)
-		$(use_enable X x11)
-		$(use_enable wayland)
-		$(use_enable egl)
-		$(use_enable drm)
-	)
-	autotools-utils_src_configure
-}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva/files/, x11-libs/libva/
@ 2021-01-29  8:59 Lars Wendler
  0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2021-01-29  8:59 UTC (permalink / raw
  To: gentoo-commits

commit:     a691ff58f141b95596de85abad71471e8a427da8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 29 08:59:18 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Jan 29 08:59:37 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a691ff58

x11-libs/libva: Use upstream fix for USE="wayland" build

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../files/libva-2.10.0-fix_wayland_build.patch     | 29 ++++++++++++++++++++
 .../libva/files/libva-2.10.0-unbreak_gnu_sed.patch | 31 ----------------------
 x11-libs/libva/libva-2.10.0.ebuild                 |  2 +-
 3 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch b/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch
new file mode 100644
index 00000000000..cf799cd3d68
--- /dev/null
+++ b/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch
@@ -0,0 +1,29 @@
+From 3a71a012b72480ffdf1e2361845036f3cc9d7154 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Sat, 9 Jan 2021 13:17:38 +0000
+Subject: [PATCH] autotools: use shell grouping instead of sed to prepend a
+ line
+
+dash and pdksh don't support $'...'
+
+/bin/sed: -e expression #1, char 2: unknown command: `1'
+---
+ va/wayland/Makefile.am | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
+index f48afb4d..40a54616 100644
+--- a/va/wayland/Makefile.am
++++ b/va/wayland/Makefile.am
+@@ -70,8 +70,9 @@ va_wayland_drm.c: $(protocol_source_h)
+ %-client-protocol-export.c : %.xml
+ 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+ %-client-protocol.c: %-client-protocol-export.c
+-	$(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \
+-	                   -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@
++	$(AM_V_GEN){ echo '#include "sysdeps.h"'; $(SED) \
++		-e 's@WL_EXPORT@DLL_HIDDEN@g' \
++		< $<; } > $@
+ 
+ EXTRA_DIST = \
+ 	wayland-drm.xml         \

diff --git a/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch b/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch
deleted file mode 100644
index 411c6c47558..00000000000
--- a/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 508cf475854c83b61a63d4c5f143b9a405fef77c Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 9 Jan 2021 01:21:55 +0100
-Subject: [PATCH] Revert "autotools: unbreak --enable-wayland with BSD sed"
-
-This reverts commit 78431a361bed0b6e9f1f3ebc0de8897b069b3848
-as it breaks GNU sed
-
-https://github.com/intel/libva/issues/489
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- va/wayland/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
-index f48afb4..705efa3 100644
---- a/va/wayland/Makefile.am
-+++ b/va/wayland/Makefile.am
-@@ -70,7 +70,7 @@ va_wayland_drm.c: $(protocol_source_h)
- %-client-protocol-export.c : %.xml
- 	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
- %-client-protocol.c: %-client-protocol-export.c
--	$(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \
-+	$(AM_V_GEN)$(SED) -e '1i#include "sysdeps.h"' \
- 	                   -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@
- 
- EXTRA_DIST = \
--- 
-2.30.0
-

diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild
index 8f6274df251..6dbd26cce39 100644
--- a/x11-libs/libva/libva-2.10.0.ebuild
+++ b/x11-libs/libva/libva-2.10.0.ebuild
@@ -62,7 +62,7 @@ MULTILIB_WRAPPED_HEADERS=(
 )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.10.0-unbreak_gnu_sed.patch"
+	"${FILESDIR}/${PN}-2.10.0-fix_wayland_build.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-01-29  8:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-23  8:18 [gentoo-commits] repo/gentoo:master commit in: x11-libs/libva/files/, x11-libs/libva/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2021-01-29  8:59 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox