diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-06-24 19:48:30 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-06-24 19:48:30 +0000 |
| commit | 0c464298aabe8c2312e5d7ca2ee92278919d8ee6 (patch) | |
| tree | 488c6e0b0b8abf40bcd54ef5b5e6d79c874df62c /x11-libs/libva-intel-driver | |
| parent | Version bump. Fix bug 552566. (diff) | |
| download | gentoo-2-0c464298aabe8c2312e5d7ca2ee92278919d8ee6.tar.gz gentoo-2-0c464298aabe8c2312e5d7ca2ee92278919d8ee6.tar.bz2 gentoo-2-0c464298aabe8c2312e5d7ca2ee92278919d8ee6.zip | |
Fix automagic wayland depend (#529388)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'x11-libs/libva-intel-driver')
3 files changed, 33 insertions, 2 deletions
diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog index 1489f1f1b636..913695bf0dc5 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.40 2015/03/20 13:23:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.41 2015/06/24 19:48:30 pacho Exp $ + + 24 Jun 2015; Pacho Ramos <pacho@gentoo.org> + +files/libva-intel-driver-1.5.1-wayland-automagic.patch, + libva-intel-driver-1.5.1.ebuild: + Fix automagic wayland depend (#529388) *libva-intel-driver-1.5.1 (20 Mar 2015) 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/libva-intel-driver-1.5.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild index a45ffc9b53f3..7b68c4fb4ccf 100644 --- 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 @@ -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.5.1.ebuild,v 1.1 2015/03/20 13:23:30 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild,v 1.2 2015/06/24 19:48:30 pacho Exp $ EAPI=5 @@ -40,6 +40,12 @@ RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${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() { |