Merge live ebuild patch with upstream changes.

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

1 files changed, 23 insertions, 61 deletions

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 3e0a0b01fc1d..9c44d7ec1689 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.94
-diff -u -b -B -r1.94 Makefile
---- Makefile	19 Oct 2010 11:53:31 -0000	1.94
-+++ Makefile	21 Oct 2010 15:33:10 -0000
+retrieving revision 1.99
+diff -u -b -B -r1.99 Makefile
+--- Makefile	23 Nov 2010 13:46:59 -0000	1.99
++++ Makefile	23 Nov 2010 17:53:25 -0000
 @@ -127,9 +127,9 @@
  ### The name of executable and libraries
  ###
@@ -18,18 +18,15 @@ diff -u -b -B -r1.94 Makefile
  VDRSXFE              = vdr-sxfe
  VDRFBFE              = vdr-fbfe
  XINEINPUTVDR         = xineplug_inp_xvdr.so
-@@ -273,9 +273,9 @@
+@@ -273,7 +273,7 @@
  	$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(CFLAGS_X11) $(OPTFLAGS) -o $@ $<
  
  ### Internationalization (I18N):
 -
 +ifeq ($(HAVE_I18N), yes)
  PODIR     = po
--LOCALEDIR ?= $(VDRDIR)/locale
-+LOCALEDIR ?= $(DESTDIR)$(VDRDIR)/locale
+ LOCALEDIR ?= $(DESTDIR)$(VDRDIR)/locale
  I18Npo    = $(wildcard $(PODIR)/*.po)
- I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
- I18Npot   = $(PODIR)/$(PLUGIN).pot
 @@ -293,6 +293,7 @@
  $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
  	@mkdir -p $(dir $@)
@@ -47,59 +44,34 @@ diff -u -b -B -r1.94 Makefile
  
  frontends: config $(TARGETS_FE) $(TARGETS_XINE)
  	$(XINELIBOUTPUT_INSTALL_MSG)
-@@ -327,50 +328,44 @@
- #
+@@ -328,8 +329,6 @@
  
  $(VDRPLUGIN): $(OBJS) $(OBJS_MPG)
--	$(CXX) $(CXXFLAGS) $(LDFLAGS_SO) $(OBJS) $(OBJS_MPG) $(LIBS) $(LIBS_VDR) -o $@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS) $(OBJS_MPG) $(LIBS) $(LIBS_VDR) -o $@
 -	@-rm -rf $(LIBDIR)/$@.$(APIVERSION)
 -	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS) $(OBJS_MPG) $(LIBS) $(LIBS_VDR) -o $@
  
  #
  # vdr-sxfe
- #
+@@ -337,8 +336,6 @@
  
  $(VDRPLUGIN_SXFE): $(OBJS_SXFE_SO)
--	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@
+ 	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@
 -	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION)
 -	@cp $@ $(LIBDIR)/$(VDRPLUGIN_SXFE).$(VERSION)
-+	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_SXFE_SO) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) -o $@
  $(VDRSXFE): $(OBJS_SXFE)
--	$(CC) -g $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_SXFE) $(LIBS_X11) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
  
- #
- # vdr-fbfe
- #
+@@ -348,8 +345,6 @@
  
  $(VDRPLUGIN_FBFE): $(OBJS_FBFE_SO)
--	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@
+ 	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@
 -	@-rm -rf $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION)
 -	@cp $@ $(LIBDIR)/$(VDRPLUGIN_FBFE).$(VERSION)
-+	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_FBFE_SO) $(LIBS_XINE) $(LIBS_JPEG) -o $@
  $(VDRFBFE): $(OBJS_FBFE)
--	$(CC) -g $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
- 
- #
- # xine plugins
- #
- 
- $(XINEINPUTVDR): $(OBJS_XINEINPUTVDR)
--	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LIBS_XINE) $(LIBS_AVUTIL) $(LIBS_PTHREAD) -o $@ $(OBJS_XINEINPUTVDR)
-+	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $(OBJS_XINEINPUTVDR) $(LIBS_XINE) $(LIBS_AVUTIL) $(LIBS_PTHREAD) -o $@
- $(XINEPOSTAUTOCROP): xine_post_autocrop.o
--	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LIBS_XINE) -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $< -o $@ $(LIBS_XINE)
- $(XINEPOSTSWSCALE): xine_post_swscale.o
--	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LIBS_XINE) -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $< -o $@ $(LIBS_XINE)
- $(XINEPOSTAUDIOCHANNEL): xine_post_audiochannel.o
--	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LIBS_XINE) -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS_SO) $(LDFLAGS) $< -o $@ $(LIBS_XINE)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_FBFE) $(LIBS_XINE) $(LIBS_JPEG) $(LIBS_PTHREAD) -o $@
  
- #
+@@ -370,7 +365,7 @@
  # install
  #
  
@@ -152,11 +124,11 @@ diff -u -b -B -r1.94 Makefile
 Index: configure
 ===================================================================
 RCS file: /cvsroot/xineliboutput/vdr-xineliboutput/configure,v
-retrieving revision 1.28
-diff -u -b -B -r1.28 configure
---- configure	19 Oct 2010 11:59:20 -0000	1.28
-+++ configure	21 Oct 2010 15:33:10 -0000
-@@ -231,11 +231,11 @@
+retrieving revision 1.29
+diff -u -b -B -r1.29 configure
+--- configure	23 Nov 2010 13:21:06 -0000	1.29
++++ configure	23 Nov 2010 17:53:25 -0000
+@@ -231,7 +231,6 @@
    xshm
    xdpms
    xinerama
@@ -164,12 +136,7 @@ diff -u -b -B -r1.28 configure
    xrender
    xshape
    opengl
-   vdpau
-+  i18n
- "
- 
- # set defaults
-@@ -266,11 +266,11 @@
+@@ -267,7 +266,6 @@
    echo "  --disable-xshm         disable XShm support [no]"
    echo "  --disable-xdpms        disable Xdpms support [no]"
    echo "  --disable-xinerama     disable Xinerama support [no]"
@@ -177,12 +144,7 @@ diff -u -b -B -r1.28 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]"
-   echo "  --disable-vdpau        disable VDPAU support (X11) [no]"
-+  echo "  --disable-xrandr       disable Xrandr support (video mode switching) [no]"
-   echo
-   echo "  --debug                debug configure script"
-   echo "  --disable-pkgconfig    do not use pkg-config"
-@@ -324,7 +324,7 @@
+@@ -326,7 +324,7 @@
  
  check_deps(){
    disabled libxine && disable x11 fb libavutil libjpeg
@@ -191,7 +153,7 @@ diff -u -b -B -r1.28 configure
    disabled vdr     && disable libextractor
    disabled xrender && disable opengl
    disabled xshape  && disable opengl
-@@ -365,7 +365,6 @@
+@@ -367,7 +365,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)"