Merge live ebuild patch with upstream changes.

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

3 files changed, 38 insertions, 72 deletions

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index cd7295b31bf1..1c4514a6c41b 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.56 2010/10/25 18:31:17 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.57 2010/11/23 17:55:48 idl0r Exp $
+
+  23 Nov 2010; Christian Ruppert <idl0r@gentoo.org>
+  files/vdr-xineliboutput-9999-build-system.patch:
+  Merge live ebuild patch with upstream changes.
 
   25 Oct 2010; Christian Ruppert <idl0r@gentoo.org>
   vdr-xineliboutput-9999.ebuild,
diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index c247e95066d2..135c3696f036 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d4591f1a2525cdebbda53636c1138cf3563e592 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b
 AUX vdr-xineliboutput-1.0.4_p20090810-compile-fix.diff 3657 RMD160 7f7c9b16b3c00cabe826971cbd3d7a559b1f5577 SHA1 b0cb9b85ee75800045076616da182d5b9eda38a5 SHA256 e4062ec7b43136b2113173641a6b5b7a2d50cd892a0aec8cf778c97874f84743
 AUX vdr-xineliboutput-1.0.5-ldflags.patch 1382 RMD160 92521e35a1e1f30c0f8da49c4e2673cadef03b62 SHA1 0b686aab9344dda5db7e66c77a6acab9437e0020 SHA256 e455aaf86c771e71848f01bd281ac4cbdc4c710a91b1896069bbf41da5c876ad
-AUX vdr-xineliboutput-9999-build-system.patch 7968 RMD160 66f524a2d2cd4657d54e9f450839192c2e00a454 SHA1 e31c89f977ee473de111603892fa1567a5bf8fd2 SHA256 e283ed1283b655e3bac6785b16050afb8584b443de7f7658b3f570e7ae4a4867
+AUX vdr-xineliboutput-9999-build-system.patch 6287 RMD160 bd694d40fe4ca269d88e811fd6c03ca2affee15a SHA1 a2e98a95d418ccf9a14683587862db96a88c1ff4 SHA256 bcc3846d7fbddf2b7ce6302d1b96a6f063df0d9ab13676e7ba900c22ca396aeb
 DIST vdr-xineliboutput-1.0.2.tgz 325042 RMD160 8564fd1c55c50e665168f4cd46a7bea33419257e SHA1 e7eadd3774429804b168928a840253d827fb5dcf SHA256 de8e4dbb60b73e91f7e13859b3bb246545c201edceb97431ae2bb08933b015b6
 DIST vdr-xineliboutput-1.0.3.tgz 329144 RMD160 b78c8f53d6406c9f499a090d97f082a6d08ec5a1 SHA1 0a97ccb92bbef13421371294dbde8884d7d1d496 SHA256 a194fbdfc79791f0980715dcb98b1f9393562052e125aedb8401f4691be1ae92
 DIST vdr-xineliboutput-1.0.4.tgz 327859 RMD160 2faef32accf4f985bf1a7e748a7d18ccfa519337 SHA1 389d51ea3b56fd312b5273cd3f9ba19fe9e46732 SHA256 c1cb82e02b193356864c0f6e12fb9ef59406fc2ce94244925d7523b3ec58e8ef
@@ -21,16 +21,16 @@ EBUILD vdr-xineliboutput-1.0.4_p20091118.ebuild 3599 RMD160 018f6f522d695eb41e40
 EBUILD vdr-xineliboutput-1.0.5-r1.ebuild 3603 RMD160 b639fe120ee0f4b414c28099801034efbbde34b9 SHA1 474d879901c527dbb640c02be3fbda20d3468a3a SHA256 43acac7740bfca1e0abe75a6608ddbcbccf03f89eb4b90303c089cefbda337eb
 EBUILD vdr-xineliboutput-1.0.5.ebuild 3536 RMD160 4eeb1bdec5e3bb4fd8e200dd9d4441434ba40b10 SHA1 a89f6c96a8080458f8bcb36b1ee936227858d135 SHA256 06a9b61f7e7616ae73a79affe464285173f7465d7f6199fb56c56aaa5aa2a866
 EBUILD vdr-xineliboutput-9999.ebuild 3320 RMD160 82324a56ec80c628acab8dca005a42ce0cc5eb89 SHA1 1f2882e5427ca673335787f7ce99f1e691160c63 SHA256 1c771d18fa352718e2c9c9436e420e857933dcd62f47621195ddd1a6421e80d3
-MISC ChangeLog 11759 RMD160 1eb29a57735e23eb91c2362cbf067575372c76bf SHA1 61a46b7fda2c1b0385cc28be9c39db7e5a94def7 SHA256 002676637fe77673843e999cf3a09aadaaface7d195bf224cf85784455dca3b0
+MISC ChangeLog 11912 RMD160 d795da26fa7221b0885fb2ab193fca5bdcf31623 SHA1 9a17f7dbe546f50ec66d7004c6772b56b2484799 SHA256 85dc727ba866baa24f2080d273f0b50e56f4c180466d1784dc06f8dab0267c02
 MISC metadata.xml 901 RMD160 b57c7638aea62eb9259a62287a90e418f1615af5 SHA1 94c1c0c068bf8b4ba19ef876d2f53a16740194fa SHA256 91ce76b6909fe4327c6e68f500764e365bea14af50a6053cdaba6da0fb88e75b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQEcBAEBAgAGBQJMxcz6AAoJEMOx0zmdw4Z1zH4H/it+x1Yx4SivT1gafZaVpL1+
-chlYthr0DcBylaWuM2TGw9B9Nsrv0gEDw/axC4OItuqMKwErmjsVTUSETy+xUN7H
-h+e4vdrzu2kDkyfXdThDPMXaZ4Smc0T6OnIG9+frEClIQssAcB86/lN0W5nwGOVl
-Y8E3ritq6yCuIlvvtuFY+nT67gip83aai+U6I1TjroKoglensI9/pXWW3BHtw1Lc
-aHjBAkvhfFQf/JtkQ/DI2hOXzah3aHK62H0KL++DaQN+74s+beIJWRxbWqzozEw0
-q13dxem9bvQZQ9nbPDqzZDJZPN8d/LfB85599Tr+Wa1/w3Vn1V/1nGiovcslds4=
-=/Y4u
+iQEcBAEBCAAGBQJM7AAqAAoJEMOx0zmdw4Z1nxkH/3e17YeUliv2KwXUIiVNaJ5f
+u4Mx33FkObgTn2DRSCyTXp7JUbQPFCDl9BiX9kqLr5XE1tdrVsSt0WJTbTGhLMUU
+kmyylQG4pTmaXRulFHtrA9t5VpIBeZCSeynrl7FdnK3leAqDEGfp2cXDH4uvgfgV
+kMbcWpkw4Gml/UtWuTDUtvig9iyd+/BFoF7/D8AEPF4QLdGXTvdtNroGTMEJWCxi
+DUMsCDp+EKQp8V/ICAojK5t8TUybTHMBBAweBC2Pva0F4vdzGA22t4s5xAnVuV9L
+F3bglc932e+prpsxKAS40K8UM9TSI2IDwfckNvHBs3It3q8cFBpFgiNdqb0tMd8=
+=lYhC
 -----END PGP SIGNATURE-----
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)"