summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Ruppert <idl0r@gentoo.org>2011-03-05 13:52:26 +0000
committerChristian Ruppert <idl0r@gentoo.org>2011-03-05 13:52:26 +0000
commit8a1a3a8652625a4e679646da8be5286b9a1bcbe1 (patch)
treee535e37249e38e38e23064287345c7640ff63f6a /media-plugins
parentppc/ppc64 stable wrt #339424 (diff)
downloadgentoo-2-8a1a3a8652625a4e679646da8be5286b9a1bcbe1.tar.gz
gentoo-2-8a1a3a8652625a4e679646da8be5286b9a1bcbe1.tar.bz2
gentoo-2-8a1a3a8652625a4e679646da8be5286b9a1bcbe1.zip
Sync patch against the latest CVS HEAD.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-xineliboutput/ChangeLog6
-rw-r--r--media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-9999-build-system.patch40
2 files changed, 5 insertions, 41 deletions
diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index 77537b691958..cbfd2983f45c 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.64 2011/02/28 21:17:57 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.65 2011/03/05 13:52:26 idl0r Exp $
+
+ 05 Mar 2011; Christian Ruppert <idl0r@gentoo.org>
+ files/vdr-xineliboutput-9999-build-system.patch:
+ Sync patch against the latest CVS HEAD.
28 Feb 2011; Christian Ruppert <idl0r@gentoo.org>
files/vdr-xineliboutput-9999-build-system.patch:
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 c147c7de96ee..9e4569347771 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
@@ -23,43 +23,3 @@ diff -u -b -B -r1.106 Makefile
ifeq ($(XINELIBOUTPUT_XINEPLUGIN), yes)
@mkdir -p $(DESTDIR)/$(XINEPLUGINDIR)/post
@echo Installing $(DESTDIR)/$(XINEPLUGINDIR)/$(XINEINPUTVDR)
-Index: configure
-===================================================================
-RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/configure,v
-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
- xinerama
-- xrandr
- xrender
- xshape
- opengl
-@@ -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]"
-- echo " --disable-xrandr disable Xrandr support (video mode switching) [no]"
- 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]"
-@@ -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 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)"
-- test_library X11 xrandr "X11/extensions/Xrandr.h" "-lXrandr" "XRRGetScreenInfo(0,0)"
- test_library X11 xdpms "X11/extensions/dpms.h" "-lXext" "DPMSDisable(0)"
- test_library X11 xinerama "X11/extensions/Xinerama.h" "-lXinerama" "XineramaQueryScreens(0,0)"
- test_library X11 opengl "GL/glx.h" "-lGL -lGLU -lglut" "glXQueryVersion(0,0,0)"