libsidplay gcc41 fix

Package-Manager: portage-2.1_pre1

5 files changed, 54 insertions, 37 deletions

diff --git a/media-libs/libsidplay/ChangeLog b/media-libs/libsidplay/ChangeLog
index d7b4b3bd98a5..58df99e3d666 100644
--- a/media-libs/libsidplay/ChangeLog
+++ b/media-libs/libsidplay/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libsidplay
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.21 2005/11/28 03:29:17 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/ChangeLog,v 1.22 2005/12/20 04:36:23 hanno Exp $
+
+  20 Dec 2005; Hanno Boeck <hanno@gentoo.org>
+  -files/libsidplay2-gcc34.patch, +files/libsidplay2-gcc41.patch,
+  libsidplay-2.1.1.ebuild:
+  Fix for gcc 4.1.
 
   28 Nov 2005; Luis Medinas <metalgod@gentoo.org> libsidplay-1.36.57.ebuild:
   Stable on amd64.
diff --git a/media-libs/libsidplay/Manifest b/media-libs/libsidplay/Manifest
index 99080aba4da6..e6e1b8b95dc3 100644
--- a/media-libs/libsidplay/Manifest
+++ b/media-libs/libsidplay/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 305751302a4c902546e5675634cef5e4 ChangeLog 2890
+MD5 1e85f2a9252f22fe3149bf8ea70474e7 ChangeLog 3046
 MD5 4e2a41563a14e632e37d162203ef4d45 files/digest-libsidplay-1.36.57 67
 MD5 c22ab29986ab10f688530269ab08efc3 files/digest-libsidplay-2.1.1 71
 MD5 58d9cec13cbd5be46ae7a38497e141f6 files/libsidplay-gcc34.patch 907
-MD5 8f2488b49345cd06d6271c657ea79666 files/libsidplay2-gcc34.patch 874
+MD5 4ebc8fcee99f7cf51e43a3b0c9425ac5 files/libsidplay2-gcc41.patch 1555
 MD5 ac3ca28745743027f27980afc1e88187 libsidplay-1.36.57.ebuild 734
-MD5 d4cbbf12185974c6c9adcc2a3373ae09 libsidplay-2.1.1.ebuild 1005
+MD5 2932e48df1cbb8ed901ca7afac76d733 libsidplay-2.1.1.ebuild 1004
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDp4mGr2QksT29OyARAovTAKCbNNCMm9MNC3xzq5BefXipattcxQCgopIR
-lW5oAaz97fdcezMsDTTCO0s=
-=JVG8
+iD8DBQFDp4qlr2QksT29OyARAsaAAJsGdjyzsK9zM+XmPtCxk4bB9Egj0wCeOZ0k
+Wk4dDi53freUJUOTvw9jI1g=
+=cJyQ
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libsidplay/files/libsidplay2-gcc34.patch b/media-libs/libsidplay/files/libsidplay2-gcc34.patch
deleted file mode 100644
index a6f450e86b22..000000000000
--- a/media-libs/libsidplay/files/libsidplay2-gcc34.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur sidplay-libs-2.1.0.orig/libsidplay/include/sidplay/SmartPtr.h sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h
---- sidplay-libs-2.1.0.orig/libsidplay/include/sidplay/SmartPtr.h	2002-12-23 12:38:47.000000000 -0800
-+++ sidplay-libs-2.1.0/libsidplay/include/sidplay/SmartPtr.h	2004-07-03 01:04:47.603925633 -0700
-@@ -211,16 +211,16 @@
- 	{
- 		if ( bufferLen >= 1 )
- 		{
--			pBufCurrent = ( bufBegin = buffer );
--			bufEnd = bufBegin + bufferLen;
--			bufLen = bufferLen;
--			status = true;
-+			this->pBufCurrent = ( this->bufBegin = buffer );
-+			this->bufEnd = this->bufBegin + bufferLen;
-+			this->bufLen = bufferLen;
-+			this->status = true;
- 		}
- 		else
- 		{
--			pBufCurrent = bufBegin = bufEnd = 0;
--			bufLen = 0;
--			status = false;
-+			this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
-+			this->bufLen = 0;
-+			this->status = false;
- 		}
- 	}
- };
diff --git a/media-libs/libsidplay/files/libsidplay2-gcc41.patch b/media-libs/libsidplay/files/libsidplay2-gcc41.patch
new file mode 100644
index 000000000000..5bbe948b7e12
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay2-gcc41.patch
@@ -0,0 +1,39 @@
+diff -ur sidplay-libs-2.1.1-orig/libsidplay/include/sidplay/SmartPtr.h sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h
+--- sidplay-libs-2.1.1-orig/libsidplay/include/sidplay/SmartPtr.h	2004-06-14 23:08:04.000000000 +0300
++++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h	2005-12-19 11:12:04.000000000 +0300
+@@ -211,16 +211,16 @@
+ 	{
+ 		if ( bufferLen >= 1 )
+ 		{
+-			pBufCurrent = ( bufBegin = buffer );
+-			bufEnd = bufBegin + bufferLen;
+-			bufLen = bufferLen;
+-			status = true;
++			this->pBufCurrent = ( this->bufBegin = buffer );
++			this->bufEnd = this->bufBegin + bufferLen;
++			this->bufLen = bufferLen;
++			this->status = true;
+ 		}
+ 		else
+ 		{
+-			pBufCurrent = bufBegin = bufEnd = 0;
+-			bufLen = 0;
+-			status = false;
++			this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
++			this->bufLen = 0;
++			this->status = false;
+ 		}
+ 	}
+ };
+diff -ur sidplay-libs-2.1.1-orig/libsidutils/include/sidplay/utils/SidUsage.h sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h
+--- sidplay-libs-2.1.1-orig/libsidutils/include/sidplay/utils/SidUsage.h	2004-06-14 23:08:08.000000000 +0300
++++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h	2005-12-19 11:12:25.000000000 +0300
+@@ -33,7 +33,7 @@
+     uint_least16_t length;  // usage scan length
+ 
+     // Copy common parts of basic usage to extended usage.
+-    sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage)
++    sid2_usage_t &operator= (const sid_usage_t &usage)
+     {
+         *((sid_usage_t *) this) = usage;
+         return *this;
diff --git a/media-libs/libsidplay/libsidplay-2.1.1.ebuild b/media-libs/libsidplay/libsidplay-2.1.1.ebuild
index 3f407d59bc47..6afd3cfa514f 100644
--- a/media-libs/libsidplay/libsidplay-2.1.1.ebuild
+++ b/media-libs/libsidplay/libsidplay-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1.ebuild,v 1.6 2004/12/15 21:59:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsidplay/libsidplay-2.1.1.ebuild,v 1.7 2005/12/20 04:36:23 hanno Exp $
 
 inherit libtool eutils
 
@@ -23,7 +23,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/libsidplay2-gcc34.patch
+	epatch ${FILESDIR}/libsidplay2-gcc41.patch
 
 	elibtoolize
 }