summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-07-14 09:21:17 +0000
committerAlexis Ballier <aballier@gentoo.org>2015-07-14 09:21:17 +0000
commit308abbd72c5f55ce2b7053a3d3aa2d5024ec9983 (patch)
treeb4b8aff8be6227643fddc4c4b37a4fdcc1485bd7 /x11-libs/libva-intel-driver
parentversion bump, bug 554830, proxy for @mgorny (diff)
downloadgentoo-2-308abbd72c5f55ce2b7053a3d3aa2d5024ec9983.tar.gz
gentoo-2-308abbd72c5f55ce2b7053a3d3aa2d5024ec9983.tar.bz2
gentoo-2-308abbd72c5f55ce2b7053a3d3aa2d5024ec9983.zip
fix build with USE=-wayland but wayland is installed, bug #553468
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'x11-libs/libva-intel-driver')
-rw-r--r--x11-libs/libva-intel-driver/ChangeLog7
-rw-r--r--x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch22
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild4
3 files changed, 30 insertions, 3 deletions
diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog
index c4fc860e6e7c..7dff5db2b5a7 100644
--- a/x11-libs/libva-intel-driver/ChangeLog
+++ b/x11-libs/libva-intel-driver/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-libs/libva-intel-driver
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.43 2015/07/14 08:46:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.44 2015/07/14 09:21:17 aballier Exp $
+
+ 14 Jul 2015; Alexis Ballier <aballier@gentoo.org>
+ libva-intel-driver-1.6.0.ebuild,
+ +files/libva-intel-driver-1.6.0-wayland-automagic.patch:
+ fix build with USE=-wayland but wayland is installed, bug #553468
14 Jul 2015; Alexis Ballier <aballier@gentoo.org>
libva-intel-driver-1.6.0.ebuild, libva-intel-driver-9999.ebuild:
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..f729732117d1
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch
@@ -0,0 +1,22 @@
+Index: libva-intel-driver-1.6.0/configure.ac
+===================================================================
+--- libva-intel-driver-1.6.0.orig/configure.ac
++++ libva-intel-driver-1.6.0/configure.ac
+@@ -165,12 +165,14 @@ if test "$enable_wayland" = "yes"; then
+ 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"])
+-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)])
++else
++ wayland_scanner_rules=""
++ AC_SUBST(wayland_scanner_rules)
++fi
++AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+ AC_OUTPUT([
+ Makefile
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
index 059926423e5b..9eaa3bb6fbb4 100644
--- 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
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild,v 1.2 2015/07/14 08:46:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild,v 1.3 2015/07/14 09:21:17 aballier Exp $
EAPI=5
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
PATCHES=(
# Fix automagic depend, bug #529388
# https://bugs.freedesktop.org/show_bug.cgi?id=79478
- "${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
+ "${FILESDIR}"/${PN}-1.6.0-wayland-automagic.patch
)
DOCS=( AUTHORS NEWS README )