diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-08-20 14:35:29 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-08-20 14:35:29 +0000 |
| commit | 74f59a1ef340eee53e5beeff7e628b44187081d8 (patch) | |
| tree | 1e04ae919f6ec9f1f834b20068fe34c70b265da8 /media-libs/xine-lib | |
| parent | Version bump, new homepage, ebuild cleanup, fix quoting (diff) | |
| download | gentoo-2-74f59a1ef340eee53e5beeff7e628b44187081d8.tar.gz gentoo-2-74f59a1ef340eee53e5beeff7e628b44187081d8.tar.bz2 gentoo-2-74f59a1ef340eee53e5beeff7e628b44187081d8.zip | |
Fix building with recent videoproto wrt #332389 by Rahul Jain, Matteo Azzali and Geoff Leach.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/xine-lib')
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.1.19-xvmc.patch | 19 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.1.19.ebuild | 5 |
3 files changed, 28 insertions, 3 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index da5a940ade85..284df9a6b2ea 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.631 2010/08/18 04:17:37 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.632 2010/08/20 14:35:28 ssuominen Exp $ + + 20 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> + xine-lib-1.1.19.ebuild, +files/xine-lib-1.1.19-xvmc.patch: + Fix building with recent videoproto wrt #332389 by Rahul Jain, Matteo + Azzali and Geoff Leach. 18 Aug 2010; Jeroen Roovers <jer@gentoo.org> xine-lib-1.1.18.1.ebuild: Stable for HPPA (bug #317141). diff --git a/media-libs/xine-lib/files/xine-lib-1.1.19-xvmc.patch b/media-libs/xine-lib/files/xine-lib-1.1.19-xvmc.patch new file mode 100644 index 000000000000..f395654435b5 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.1.19-xvmc.patch @@ -0,0 +1,19 @@ +Quoting ChangeLog of X11's videoproto package: +vldXvMC.h: stop uselessly including XvMClib.h + +http://bugs.gentoo.org/332389 + +--- src/video_out/xxmc.h ++++ src/video_out/xxmc.h +@@ -77,10 +77,10 @@ + #include <X11/extensions/XShm.h> + #include <X11/extensions/Xv.h> + #include <X11/extensions/Xvlib.h> ++#include <X11/extensions/XvMClib.h> + #ifdef HAVE_VLDXVMC + #include <X11/extensions/vldXvMC.h> + #else +- #include <X11/extensions/XvMClib.h> + #include <X11/extensions/XvMC.h> + #endif + diff --git a/media-libs/xine-lib/xine-lib-1.1.19.ebuild b/media-libs/xine-lib/xine-lib-1.1.19.ebuild index d2000776eba0..09d814b8c827 100644 --- a/media-libs/xine-lib/xine-lib-1.1.19.ebuild +++ b/media-libs/xine-lib/xine-lib-1.1.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.19.ebuild,v 1.2 2010/07/27 19:52:04 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.19.ebuild,v 1.3 2010/08/20 14:35:28 ssuominen Exp $ EAPI=3 inherit eutils flag-o-matic toolchain-funcs multilib @@ -89,7 +89,8 @@ DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" src_prepare() { - epatch "${DISTDIR}"/${PN}-1.1.15-textrel-fix.patch + epatch "${DISTDIR}"/${PN}-1.1.15-textrel-fix.patch \ + "${FILESDIR}"/${P}-xvmc.patch } src_configure() { |