summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/libva-intel-driver
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/libva-intel-driver')
-rw-r--r--x11-libs/libva-intel-driver/Manifest5
-rw-r--r--x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch20
-rw-r--r--x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch37
-rw-r--r--x11-libs/libva-intel-driver/files/nox.patch27
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild52
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild57
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild58
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild63
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild63
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild57
-rw-r--r--x11-libs/libva-intel-driver/metadata.xml16
11 files changed, 455 insertions, 0 deletions
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
new file mode 100644
index 000000000000..fd5074f856ee
--- /dev/null
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -0,0 +1,5 @@
+DIST libva-intel-driver-1.3.0.tar.bz2 965030 SHA256 734c15e78495f53fecb9862a22579d05ca5994fac4d04e3cc804ca9cbaa7fb6c SHA512 09566199409f76b8a533857c6bef26c35cd21b1555d29b395e72649fa0337b86b4a65eb5adf4144649ae26d5d8c93f1462d19011c95de9256728cadf56975e5d WHIRLPOOL 727b1bd14a55baa60092a5f2f9bc0bfb2ca39328103f812ccb3be8391246c0b0c4e99b596527e7189e2700d91d15aceed1e5284808644d46e26b2d470d67194f
+DIST libva-intel-driver-1.4.1.tar.bz2 980214 SHA256 fe6784c7ba6092204e3e7d4142e6023386b43f08127dae1243385078c5c21fec SHA512 1b0d868c50ae18dde025618618b984ffc71d3e7827edda125479a42cd4c197c8059f764c7ffe601d83c2838038a6dd18e6a80caf13176897ac271bec75644550 WHIRLPOOL 7b36831efc3619a315c5711210af06a8637411b59fd9941256248e783305b482df402c2bdc84d15175c01adc18abf8995b123e8952e6b525e69104833676f34e
+DIST libva-intel-driver-1.5.0.tar.bz2 1019243 SHA256 d0b448193ab34b622cd14e4db8ca29991a4038b4eb459a8fbbcbd7db843da3dc SHA512 aef41b40a9d926c2555e58258a65b82a406e24ab4e4e513390674dfabc05c8e6ebc31bf00adfd399800e81523f88209a4df286216fb8e7236c8f11f09061825e WHIRLPOOL 38879dcf16aa869478197463d619e13ae7fa4bcbe185a5ce724a4ba7e64dc914840add4c876697c52b8599adc401f42b24ee9307a7765e3f7caa541cdb5fd17c
+DIST libva-intel-driver-1.5.1.tar.bz2 1046744 SHA256 0bdb6c303d03ccb536ab726936448c3310deb3b914af51d7cae39b5539e0eadc SHA512 cb1298ffffbf43a42fca3a030ed2baecdb30468c8d2a8b1e5f2bb2849c3ce9956cb21a5da0a6482a2fba1b8a09358363237f8325e48d184e4ad49557546e7e25 WHIRLPOOL 5255e8653b9ac912b78bbd952c2de8ed00823892a54f9f9796811ff0638a13b5e3f1b73e6566f01fcb971aac0f9b25aba7a208adc5587e93c94dae5e829b83e3
+DIST libva-intel-driver-1.6.0.tar.bz2 1091478 SHA256 9876afe4610c01a8ee5ba9348266515fce4dd031139d580ad97984d06afa08d4 SHA512 8920d6a53bc13df519facdc3e8f2546ac2d27d7f512219f9f949c93563ff637af0abdb7487a26209b79d23db990ecbc4ba6b14f15d4fc0f65f264699509b9b74 WHIRLPOOL e1820defdc1d621e955f4511ad60529665d210b6d10e054b24781c441d5fcac75a077170dc86b4604f5bdeea5649f3e5a5a1b001916b286d5077cc4d427dbfa4
diff --git a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch
new file mode 100644
index 000000000000..9f0c0d4e8fef
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch
@@ -0,0 +1,20 @@
+--- configure.ac~ 2015-03-20 04:48:37.000000000 +0100
++++ configure.ac 2015-06-24 21:45:47.954846367 +0200
+@@ -164,12 +164,13 @@
+ PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland],
+ [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])],
+ [USE_WAYLAND="no"])
++ m4_ifdef([WAYLAND_SCANNER_RULES],
++ [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
++ [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++
+ fi
+-AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+-m4_ifdef([WAYLAND_SCANNER_RULES],
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+ AC_OUTPUT([
+ Makefile
diff --git a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch
new file mode 100644
index 000000000000..f2707a00ad4f
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch
@@ -0,0 +1,37 @@
+From 405437e31d3faf6adc32d887ae1945b8d93f7846 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 24 Jul 2015 17:01:23 +0200
+Subject: [PATCH] Do not require wayland-scanner if wayland is disabled
+
+Do not perform fatal wayland-scanner checks if wayland is disabled
+(either by --disable-wayland or wayland check failure) even if
+wayland-scanner macros are installed on the system.
+---
+ configure.ac | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6e73059..70eb275 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,9 +168,14 @@ if test "$enable_wayland" = "yes"; then
+ fi
+ AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+-m4_ifdef([WAYLAND_SCANNER_RULES],
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++if test "$USE_WAYLAND" = "yes"; then
++ m4_ifdef([WAYLAND_SCANNER_RULES],
++ [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
++ [wayland_scanner_rules=/dev/null; AC_SUBST_FILE(wayland_scanner_rules)])
++else
++ wayland_scanner_rules=/dev/null
++ AC_SUBST_FILE(wayland_scanner_rules)
++fi
+
+ AC_OUTPUT([
+ Makefile
+--
+2.4.6
+
diff --git a/x11-libs/libva-intel-driver/files/nox.patch b/x11-libs/libva-intel-driver/files/nox.patch
new file mode 100644
index 000000000000..ac41f4fa08e9
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/nox.patch
@@ -0,0 +1,27 @@
+commit bf324e3440246a487997a1624ac862e3e4027f9e
+Author: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon Aug 4 19:05:18 2014 +0200
+
+ add missing include
+
+ Without this building without HAVE_VA_X11 fails with:
+ [...]
+ In file included from i965_drv_video.c:37:0:
+ i965_output_wayland.h:31:26: error: unknown type name 'VADriverContextP'
+ i965_output_wayland.h:34:31: error: unknown type name 'VADriverContextP'
+ i965_drv_video.c:5243:9: error: 'i965_output_wayland_init' undeclared here (not in a function)
+ i965_drv_video.c:5244:9: error: 'i965_output_wayland_terminate' undeclared here (not in a function)
+ [....]
+
+diff --git a/src/i965_output_wayland.h b/src/i965_output_wayland.h
+index 61ca39f..acea8d9 100644
+--- a/src/i965_output_wayland.h
++++ b/src/i965_output_wayland.h
+@@ -26,6 +26,7 @@
+ #define I965_OUTPUT_WAYLAND_H
+
+ #include <stdbool.h>
++#include <va/va_backend.h>
+
+ bool
+ i965_output_wayland_init(VADriverContextP ctx);
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild
new file mode 100644
index 000000000000..395a921b8339
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 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/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${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 wayland X"
+
+RDEPEND=">=x11-libs/libva-1.3.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild
new file mode 100644
index 000000000000..17e6f9579be7
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 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/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${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 wayland X"
+
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild
new file mode 100644
index 000000000000..e57c247cd408
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild
@@ -0,0 +1,58 @@
+# 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/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${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 wayland X"
+
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}/nox.patch" )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild
new file mode 100644
index 000000000000..a085497801d0
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild
@@ -0,0 +1,63 @@
+# 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/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${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 wayland X"
+
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ # Fix automagic depend, bug #529388
+ # https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ "${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild
new file mode 100644
index 000000000000..8c7d5093b967
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild
@@ -0,0 +1,63 @@
+# 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/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${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 wayland X"
+
+RDEPEND=">=x11-libs/libva-1.6[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ # Fix automagic depend, bug #529388
+ # https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ "${FILESDIR}"/${PN}-1.6.0-wayland-automagic.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
new file mode 100644
index 000000000000..fea13863510d
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -0,0 +1,57 @@
+# 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/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${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 wayland X"
+
+RDEPEND=">=x11-libs/libva-1.6[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
new file mode 100644
index 000000000000..59caf2126158
--- /dev/null
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>aballier@gentoo.org</email>
+ <name>Alexis Ballier</name>
+ </maintainer>
+ <maintainer>
+ <email>jekarlson@gmail.com</email>
+ <name>Emil Karlson</name>
+ </maintainer>
+ <use>
+ <flag name='drm'>Enables VA/DRM API support.</flag>
+ </use>
+</pkgmetadata>