Add another hunk required to build with gcc4.

Package-Manager: portage-2.0.51.20-r4

3 files changed, 54 insertions, 29 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 626d812017b9..a32cd0e26719 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.211 2005/04/24 19:42:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.212 2005/04/25 14:45:20 azarah Exp $
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  files/xine-lib-gcc4.patch:
+  Add another hunk required to build with gcc4.
 
 *xine-lib-1.0-r4 (24 Apr 2005)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 6e73de95bf11..95e025d99253 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,52 +1,62 @@
-MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
-MD5 c810c4550d4d5f0653d9b026d24e4b75 xine-lib-1.0-r1.ebuild 7469
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
 MD5 fd257220f66a183e8896c0cd61cfe78c xine-lib-1.0.ebuild 8497
 MD5 b6ad8f25595f1c8e8495579462e42764 xine-lib-1_rc6-r1.ebuild 5656
-MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
+MD5 65f3325ffbc4264d096f05c63f937dfe ChangeLog 4838
+MD5 c810c4550d4d5f0653d9b026d24e4b75 xine-lib-1.0-r1.ebuild 7469
+MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
 MD5 85910e7a6aab4d7728ccdd55c1f0664b xine-lib-1.0-r2.ebuild 7506
 MD5 9415e56720946429be1cd7c6142f4351 xine-lib-1.0-r3.ebuild 7578
 MD5 79cd4ff146e065a636eae4001b6d0b6a xine-lib-1.0-r4.ebuild 7845
-MD5 d55330b6faf7def0750a6c56e33119d1 ChangeLog 4711
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
 MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r1 65
-MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
 MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
-MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
 MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
 MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
 MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
 MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
+MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68
 MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
+MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
 MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
 MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
 MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
 MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 08c1c3433fe4230c788156a2e625962a files/xine-lib-configure-checks.patch 11823
-MD5 d0a2aa9bcd1263077cd8e3fe974b6910 files/xine-lib-configure-xvmc-header.patch 901
 MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
 MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
 MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 93e50bb9c91e39eb06a74e4d66477100 files/xine-lib-XSA-2004-8.patch 1532
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r1 65
+MD5 08c1c3433fe4230c788156a2e625962a files/xine-lib-configure-checks.patch 11823
+MD5 d0a2aa9bcd1263077cd8e3fe974b6910 files/xine-lib-configure-xvmc-header.patch 901
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r2 65
-MD5 f9649b74dabc1552b78e7bf602cb1631 files/xine-lib-gcc4.patch 7845
+MD5 93e50bb9c91e39eb06a74e4d66477100 files/xine-lib-XSA-2004-8.patch 1532
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r3 65
+MD5 db77ea2067d040ca948623d374d071d8 files/xine-lib-gcc4.patch 8402
 MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r4 65
 MD5 665e9af72fa8604db8d82231f484c230 files/xine-lib-1.0-wma.patch 1741
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCbQOO1ZcsMnZjRyIRAu60AJ4pbrwAnH8xTKATvHqauR9zHqee1ACePtkm
+8lQ16J/XnS5+Wf+U8KLn3dg=
+=Z87k
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/xine-lib-gcc4.patch b/media-libs/xine-lib/files/xine-lib-gcc4.patch
index 09590ac1e9a0..8bb1c04bc5e0 100644
--- a/media-libs/xine-lib/files/xine-lib-gcc4.patch
+++ b/media-libs/xine-lib/files/xine-lib-gcc4.patch
@@ -189,3 +189,14 @@ diff -urN xine-lib-1.0.orig/src/post/audio/stretch.c xine-lib-1.0/src/post/audio
      this->num_frames += frames_to_copy;
      buf->num_frames -= frames_to_copy;
  
+--- xine-lib-1.0/src/libw32dll/wine/loader.h	2005-04-25 14:21:09.000000000 +0000
++++ xine-lib-1.0.az/src/libw32dll/wine/loader.h	2005-04-25 14:22:05.000000000 +0000
+@@ -17,7 +17,7 @@
+ extern "C" {
+ #endif
+ 
+-extern char* win32_codec_name;  // must be set before calling DrvOpen() !!!
++static char* win32_codec_name;  // must be set before calling DrvOpen() !!!
+ 
+ unsigned int _GetPrivateProfileIntA(const char* appname, const char* keyname, int default_value, const char* filename);
+ int _GetPrivateProfileStringA(const char* appname, const char* keyname,