libsidplay-1 gcc43 fix (bug #251159)

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.28-rc8 x86_64

4 files changed, 55 insertions, 8 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index 605496897b2d..225df1157770 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.37 2008/11/16 18:30:04 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.38 2008/12/16 13:35:56 hanno Exp $
+
+  16 Dec 2008; Hanno Boeck <hanno@gentoo.org>
+  +files/libsidplay-1.36.59-gcc43.patch, libsidplay-1.36.59.ebuild:
+  Fix for gcc 4.3 in libsidplay-1, patch taken from Frugalware Linux.
 
   16 Nov 2008; Hanno Boeck <hanno@gentoo.org>
   +files/libsidplay-2.1.1-gcc43.patch, libsidplay-1.36.57.ebuild,
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index c5c5a9f3e57d..b465026f7ae2 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libsidplay-1.36.59-gcc43.patch 1415 RMD160 5f31b82e3c63a2129f14162b56011813fbf7240e SHA1 3b28d4182b62b8c9facd17bb72df4faafcd98fc8 SHA256 68476bfee9a378b045c81eb0f6d9aee7341610fe6b22047d67ce859a7a3b5053
 AUX libsidplay-2.1.1-fbsd.patch 494 RMD160 083c0d2b1a6cfe93f5b338250348fbfa62f47856 SHA1 fd232adb6b7b951fbdc10d646640db6293047a6b SHA256 91e4dafff5539527e8231f3e8c30fd7ad5afac4904d37c2e38199dfc09d6c419
 AUX libsidplay-2.1.1-gcc43.patch 2513 RMD160 6eabc62255f4c56d5cb790c092af563252f6931e SHA1 ae18384f86c615d00cdd3b1ce7e64306a0794645 SHA256 e21559e444b70a48bb009cd9fbcbbafde53472c59212c8f76034f4c35c2855f1
 AUX libsidplay-gcc34.patch 907 RMD160 ede02b956fd59a498db70a1d992e318fc8d3683c SHA1 52333ba1d37e827d7228b79874e20d50f4a97bf0 SHA256 2d953dfb0f24c9fbaa61558423c22733ce64db56296ffcf4e7721b0f34696377
@@ -9,14 +10,14 @@ DIST libsidplay-1.36.57.tgz 242267 RMD160 a6869bcff7b12d3afb5b5fec867e18217f484a
 DIST libsidplay-1.36.59.tgz 390097 RMD160 8dffb19abac64934f00a65a8adc859fbdf39657e SHA1 66056b55dc96b9ae1aab542f0260d1e6db158e51 SHA256 3da9b38d4eb5bf9e936b9604ba92da0594ef38047d50cf806a8e11c400008024
 DIST sidplay-libs-2.1.1.tar.gz 1900252 RMD160 1ce4c3cb80470a834c5887b3f3be0b61ca71e4cd SHA1 8af6350866edc30b0d331e075fa97292f6f645a5 SHA256 e9a24ada48215a46d2c232a70c5601bc9505e997f120e8f2ba3713e09e28d1f9
 EBUILD libsidplay-1.36.57.ebuild 734 RMD160 39e40ec5b0e2d128d7738daca761c1cf45cda178 SHA1 83712d7d50b0d85a200d0e520e9510ba988a91e7 SHA256 5bfbfcb38bff595bb748c93eb71ca355487481c47d653862373f8ee1fc933fec
-EBUILD libsidplay-1.36.59.ebuild 718 RMD160 35d319d9a4ad8597a0311b821b976d6ac8952f21 SHA1 be178f1788a68ca6bd50f9c0923ae9cebe09cdbe SHA256 98785235dc331669ce6d5abf720ff5b6dd3290731d45d84e28187449ddfab2d5
+EBUILD libsidplay-1.36.59.ebuild 788 RMD160 3690533418cae40de92e8d04c25d4a48caa96d8e SHA1 ba3debeb95792273f9b19d77886877649f3311df SHA256 67400a09496802c41c06dd0772fb5da5a831e76a7eaf176490f01e6ad8075b59
 EBUILD libsidplay-2.1.1.ebuild 1133 RMD160 9f4d5322d57ebd39e77f9ccb6d8aecc3e73f0a64 SHA1 f74b25dabcf5a588325be67a3a5397326f9e353c SHA256 38f41d8a8960d5dcf0d697a78fe1ba4d2b8898c1b6d2ac27f10009f3ca092c72
-MISC ChangeLog 4730 RMD160 08fb2145fdcb234408f685dfd3dd5c3fc8720ae7 SHA1 41832d1ef73391dd01a3dd71537cd6db277fa982 SHA256 cdd53da5505dd629987b66cd6f1525e0142388cd3b6f43d2af5f0a0be280cb46
+MISC ChangeLog 4915 RMD160 49867e419afcd24bf6b9431cd8115ce702da83b5 SHA1 7c65b02ce54635b7bf891844d3510481de90a9f3 SHA256 ea1de16860c850a2bc2044c61c0a2bf1461c66e1ac57fd72174437f39d74c4a6
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkgZqUACgkQr2QksT29OyDzRwCfWwDFk/vxGncK/HHkWvHr+VDU
-q5QAn1AuWQhK5bXSi1lZnqUxJrFrjRYH
-=V6AP
+iEYEARECAAYFAklHrpoACgkQr2QksT29OyDHAQCgn+dhPc25r77+LOj6QClt/ZIh
+5t4AoJMna1gGx0tVQ77NqeUVkQBd4A0A
+=IIhE
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch b/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch
new file mode 100644
index 000000000000..5beef46c6c14
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-1.36.59-gcc43.patch
@@ -0,0 +1,40 @@
+diff --git a/src/sidtune.cpp b/src/sidtune.cpp
+index 4d1d33b..6fbae80 100644
+--- a/src/sidtune.cpp
++++ b/src/sidtune.cpp
+@@ -306,11 +306,7 @@ udword sidTune::loadFile(const char* fileName, ubyte** bufferRef)
+         return 0;
+     }
+     // Open binary input file stream at end of file.
+-#if defined(SID_HAVE_IOS_BIN)
+-	ifstream myIn( fileName, ios::in|ios::bin|ios::ate );
+-#else
+ 	ifstream myIn( fileName, ios::in|ios::binary|ios::ate );
+-#endif
+ 	// As a replacement for !is_open(), bad() and the NOT-operator
+     // don't seem to work on all systems.
+ #if defined(SID_DONT_HAVE_IS_OPEN)
+@@ -972,11 +968,7 @@ bool sidTune::saveC64dataFile( const char* fileName, bool overWriteFlag )
+         }
+ 		// Open binary output file stream.
+         else
+-#if defined(SID_HAVE_IOS_BIN)
+-            fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+             fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ 		if ( !fMyOut )
+ 		{ 
+ 			info.statusString = text_cantCreateFile;
+@@ -1061,11 +1053,7 @@ bool sidTune::savePSIDfile( const char* fileName, bool overWriteFlag )
+         }
+ 		// Open binary output file stream.
+         else
+-#if defined(SID_HAVE_IOS_BIN)
+-            fMyOut.open( fileName, ios::out|ios::bin|ios::trunc );
+-#else
+             fMyOut.open( fileName, ios::out|ios::binary|ios::trunc );
+-#endif
+ 		if ( !fMyOut )
+ 		{
+ 			info.statusString = text_cantCreateFile;
diff --git a/media-libs/libsidplay/libsidplay-1.36.59.ebuild b/media-libs/libsidplay/libsidplay-1.36.59.ebuild
index 70db59d5a75e..5da4328ba3ce 100644
--- a/media-libs/libsidplay/libsidplay-1.36.59.ebuild
+++ b/media-libs/libsidplay/libsidplay-1.36.59.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.59.ebuild,v 1.3 2008/11/16 18:30:04 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-1.36.59.ebuild,v 1.4 2008/12/16 13:35:56 hanno Exp $
 
-inherit libtool
+inherit libtool eutils
 
 IUSE=""
 DESCRIPTION="C64 SID player library"
@@ -19,6 +19,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	epatch "${FILESDIR}/${P}-gcc43.patch" || die "epatch failed"
+
 	# Needed to get a sane .so versionning on fbsd, please don't drop
 	elibtoolize
 }