Sync patch against the latest CVS HEAD.

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

3 files changed, 14 insertions, 50 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/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index fb32fe28764f..3dc1cedaeacb 100644
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -4,7 +4,7 @@ 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 2874 RMD160 22b84a890ca89d07b61f306f65959ebac12d4382 SHA1 2cb11a32a9bfa9c65a0e48b605b60a8d4fa79b03 SHA256 44c814d6b5dbca6ada91bc99c3b6ce972acb4e2a7786be50881a64639d8ea737
+AUX vdr-xineliboutput-9999-build-system.patch 744 RMD160 b8dd6bc9faa0181bf4b5e70ba39e2f227698f566 SHA1 b03d095f980a59275eceb47740e63a8028fdb344 SHA256 43e52f8d29cb9aed4e487eb63f14101dfdbb30ba42f74ee57eb7bbf512f89bbd
 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 3594 RMD160 b6f743ea9d70608566f8
 EBUILD vdr-xineliboutput-1.0.5-r1.ebuild 3603 RMD160 33661dc71f021ca958fea2f61afc0716e0e30c02 SHA1 0dca430d232851224c890fd966f8d466d90b4e99 SHA256 7540288cdb08fc685242d38f60d39bb146b8d80cd87184c2fa9024321a28e675
 EBUILD vdr-xineliboutput-1.0.5.ebuild 3531 RMD160 f88d4eea1aaac7b22805385f3dfdde03f32357e6 SHA1 aa739d3aeaad7519d3e4e31f75eb151adb70e50e SHA256 5edf3f2762e284e5b7fc84840bfdc78ef6ac43d8b42e4a59db104e50516b18e8
 EBUILD vdr-xineliboutput-9999.ebuild 3526 RMD160 4a4c20010f5cf2cb0038341b47f1757da89cf365 SHA1 a358a2494a5ad1ff0c5e368e7f620c600ce3ebbb SHA256 b4d65c292cb842f5a2377cd14c8f9759be7a2ccbbfdb9d5487de205a2305522c
-MISC ChangeLog 13175 RMD160 392c1127702ef88ebbb2b6ea8f4c7402f4fbc2d3 SHA1 8a0fa862931a181dcf64d5f28e253a264657c71c SHA256 50664e4797caf7bce9409ce6d5b0f9ad293fa0b73fefe1198e0053abe79809f4
+MISC ChangeLog 13321 RMD160 45b838c5e75dc77ef4b1c8f7f5b0eb3a649b14ec SHA1 757fd639b2f26987f932a5159d2531fe500a1a94 SHA256 a27c68f757b51d4cd1658aa3d52940aafa0e57f379eec572fd57f36c24a30316
 MISC metadata.xml 804 RMD160 aaaab1df7261b1b9e73593e2ebd6c313af3f42f4 SHA1 219eb301e18ad40171d490608bd9f14b632aa174 SHA256 a53774573f62d66518accf24ef448083279c4361041c16428657a5c227734298
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJNbBEKAAoJEMOx0zmdw4Z11vQH/RAVTDFiEuPgEXGe+dI6gT+R
-/AWMNZndk3vzFrZVGy2+G5aGCb+nn8q/h6RsgcIm+nCMxvNiJ/3gphzb+A+kdYWu
-5Yl1j3O/7ZwJc/UyynL0L4eSG1ubRsepElbJ74egZZAoDj3S/qNN9j9e7u1x+V8x
-DJHMsNE6C3ZI+JW9d4YXvEmWT7Bhs5T5ydIrn2odg6G9OheFg00E/lZhrYCZTJRA
-tT2pl4kKaKq9zVQZMxcV2opKsuRNXbK4BNSzCMPB1vj60Z9xZXcA6UWzpazLZrSg
-w4azwE0nHw8eb2hGOv22L4IgNY35CweI7tKRbdGcPoaUTk7/AbrnGcly3+WijEY=
-=qNyZ
+iQEcBAEBCAAGBQJNckAfAAoJEMOx0zmdw4Z1+HAIAKtqqGrk6vphD1z28CMEivGJ
+Zw7IPKnKPHnMMXvQa6tPPuZ5b9ajovI0wLFHSAUJHzuo9Nqb+Ho80vc1j/5OHFBE
+PilsG9tAHj/Qg38SGFcO5N3MeAHxCwDjJoSLWBu7XzEGJi73aSP/CqAAZQhscrLz
+rnf76rNI+8mRvOZqGZDB9Dnth1t51SxekHfsms+UaBo1NZiAq4TKzJThsIkWg2H5
+zWG4COjVeDfBqasM0fihAKksGqcFGAE+LZ9qWPAbUiy41/Ep+kryuY5rEYGbuNUR
+3AIaYAXXGkQup7bL6UMngkeBLfg4NEHsgKmiLE9/VM5pwtkueZaZK09auOY/dA4=
+=6iqs
 -----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 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)"