summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-02-28 21:17:57 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-02-28 21:17:57 +0000
commit366f92e293a6d95015c24a6f2568101be6f54ee6 (patch)
treedf7f270d6a3ab6b104809a84652d21e901cf647a /media-plugins/vdr-xineliboutput
parentRenamed USE=indicate to USE=ayatana and fixed docs install, thanks ssuominen (diff)
downloadgentoo-2-366f92e293a6d95015c24a6f2568101be6f54ee6.tar.gz
gentoo-2-366f92e293a6d95015c24a6f2568101be6f54ee6.tar.bz2
gentoo-2-366f92e293a6d95015c24a6f2568101be6f54ee6.zip
Update cvs patch
(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins/vdr-xineliboutput')
-rw-r--r--media-plugins/vdr-xineliboutput/ChangeLog6
-rw-r--r--media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch28
2 files changed, 19 insertions, 15 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 576da21e1798..77537b691958 100644
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-plugins/vdr-xineliboutput
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.63 2011/02/28 16:17:48 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.64 2011/02/28 21:17:57 idl0r Exp $
+
+ 28 Feb 2011; Christian Ruppert <idl0r@gentoo.org>
+ files/vdr-xineliboutput-9999-build-system.patch:
+ Update cvs patch
28 Feb 2011; Christian Ruppert <idl0r@gentoo.org>
vdr-xineliboutput-9999.ebuild:
diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
index 9787219c30f8..c147c7de96ee 100644
--- a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch
@@ -1,10 +1,10 @@
Index: Makefile
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/Makefile,v
-retrieving revision 1.105
-diff -u -b -B -r1.105 Makefile
---- Makefile 15 Dec 2010 14:43:36 -0000 1.105
-+++ Makefile 15 Dec 2010 17:05:50 -0000
+retrieving revision 1.106
+diff -u -b -B -r1.106 Makefile
+--- Makefile 23 Jan 2011 19:42:08 -0000 1.106
++++ Makefile 28 Feb 2011 21:16:10 -0000
@@ -323,7 +323,7 @@
install : XINELIBOUTPUT_INSTALL_MSG =
@@ -26,10 +26,10 @@ diff -u -b -B -r1.105 Makefile
Index: configure
===================================================================
RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/configure,v
-retrieving revision 1.29
-diff -u -b -B -r1.29 configure
---- configure 23 Nov 2010 13:21:06 -0000 1.29
-+++ configure 15 Dec 2010 17:05:50 -0000
+retrieving revision 1.32
+diff -u -b -B -r1.32 configure
+--- configure 28 Feb 2011 12:35:18 -0000 1.32
++++ configure 28 Feb 2011 21:16:10 -0000
@@ -231,7 +231,6 @@
xshm
xdpms
@@ -38,7 +38,7 @@ diff -u -b -B -r1.29 configure
xrender
xshape
opengl
-@@ -267,7 +266,6 @@
+@@ -270,7 +269,6 @@
echo " --disable-xshm disable XShm support [no]"
echo " --disable-xdpms disable Xdpms support [no]"
echo " --disable-xinerama disable Xinerama support [no]"
@@ -46,16 +46,16 @@ diff -u -b -B -r1.29 configure
echo " --disable-xrender disable Xrender support (HUD OSD) [no]"
echo " --disable-xshape disable Xshape support (non-transparent HUD OSD without composite manager) [no]"
echo " --disable-opengl disable OpenGL support (transparent HUD OSD without composite manager) [no]"
-@@ -326,7 +324,7 @@
+@@ -330,7 +328,7 @@
check_deps(){
disabled libxine && disable x11 fb libavutil libjpeg
- disabled x11 && disable dbus-glib-1 xshm xrender xshape opengl xrandr xdpms xinerama vdpau
+ disabled x11 && disable dbus-glib-1 xshm xrender xshape opengl xdpms xinerama vdpau
- disabled vdr && disable libextractor
- disabled xrender && disable opengl
- disabled xshape && disable opengl
-@@ -367,7 +365,6 @@
+ disabled vdr && disable libextractor libcap
+ disabled dlfcn && disable opengl
+ disabled pthread && disable opengl
+@@ -374,7 +372,6 @@
test_library X11 xshm "X11/extensions/XShm.h" "-lXext" "XShmQueryExtension(0)"
test_library X11 xrender "X11/extensions/Xrender.h" "-lXrender" "XRenderQueryFormats(0)"
test_library X11 xshape "X11/extensions/shape.h" "-lXext" "XShapeQueryExtension(0,0,0)"