diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2015-06-21 12:22:34 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2015-06-21 12:22:34 +0000 |
| commit | aea3036058d19e17717bc9daaebb3403e3547041 (patch) | |
| tree | a926d5ed2840e7f70ba98d5f56513f01ac4bbd08 /x11-libs | |
| parent | amd64 stable wrt bug #551814 (diff) | |
| download | gentoo-2-aea3036058d19e17717bc9daaebb3403e3547041.tar.gz gentoo-2-aea3036058d19e17717bc9daaebb3403e3547041.tar.bz2 gentoo-2-aea3036058d19e17717bc9daaebb3403e3547041.zip | |
Fix automagic dependency on wayland (#529388 by Oleg, Cecil Curry Manuel Rüger and others)
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libva/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch | 19 | ||||
| -rw-r--r-- | x11-libs/libva/libva-1.5.1.ebuild | 8 |
3 files changed, 32 insertions, 2 deletions
diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog index ffb981d1f131..61dae02b3419 100644 --- a/x11-libs/libva/ChangeLog +++ b/x11-libs/libva/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/libva # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.68 2015/03/22 09:01:57 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.69 2015/06/21 12:22:34 pacho Exp $ + + 21 Jun 2015; Pacho Ramos <pacho@gentoo.org> + +files/libva-1.5.1-wayland-automagic.patch, libva-1.5.1.ebuild: + Fix automagic dependency on wayland (#529388 by Oleg, Cecil Curry Manuel Rüger + and others) 22 Mar 2015; Ryan Hill <rhill@gentoo.org> libva-1.5.1.ebuild: Add nouveau to VIDEO_CARDS (bug #543982). 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 new file mode 100644 index 000000000000..d55c3f5da840 --- /dev/null +++ b/x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch @@ -0,0 +1,19 @@ +--- 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.5.1.ebuild b/x11-libs/libva/libva-1.5.1.ebuild index 2355b6bb04d3..0f06efe4b66e 100644 --- a/x11-libs/libva/libva-1.5.1.ebuild +++ b/x11-libs/libva/libva-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/libva-1.5.1.ebuild,v 1.2 2015/03/22 09:01:57 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.5.1.ebuild,v 1.3 2015/06/21 12:22:34 pacho Exp $ EAPI=5 @@ -64,6 +64,12 @@ 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 |