[fedora-extras-commits] rpms/libsidplay/devel libsidplay-post57fixes.patch, NONE, 1.1 libsidplay.spec, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Update of /cvs/extras/rpms/libsidplay/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv2159

Modified Files:
	libsidplay.spec 
Added Files:
	libsidplay-post57fixes.patch 
Log Message:
Fix build for FC3/GCC 3.4.


libsidplay-post57fixes.patch:

--- NEW FILE libsidplay-post57fixes.patch ---
diff -Nur libsidplay-1.36.57/src/mus_.cpp libsidplay-1.36.59/src/mus_.cpp
--- libsidplay-1.36.57/src/mus_.cpp	1999-06-17 07:59:35.000000000 +0200
+++ libsidplay-1.36.59/src/mus_.cpp	2004-08-17 13:43:38.000000000 +0200
@@ -76,7 +76,7 @@
                 infoString[line][si++] = c;  // copy to info string
             }
             // If character is 0x9d (left arrow key) then move back.
-            if ((*spPet == 0x9d) && (si>=0))
+            if ((*spPet == 0x9d) && (si>0))
             {
                 si--;
             }
diff -Nur libsidplay-1.36.57/src/smart.h libsidplay-1.36.59/src/smart.h
--- libsidplay-1.36.57/src/smart.h	2001-12-29 00:10:17.000000000 +0100
+++ libsidplay-1.36.59/src/smart.h	2004-07-17 23:43:15.000000000 +0200
@@ -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;
         }
     }
 };


Index: libsidplay.spec
===================================================================
RCS file: /cvs/extras/rpms/libsidplay/devel/libsidplay.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsidplay.spec	8 Nov 2004 04:48:25 -0000	1.4
+++ libsidplay.spec	10 Nov 2004 02:23:35 -0000	1.5
@@ -1,9 +1,10 @@
 Name: libsidplay
 Summary: A Commodore 64 music player and SID chip emulator library.
 Version: 1.36.57
-Release: 0.fdr.4.2
+Release: 5
 Epoch: 0
 Source: http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/%{name}-%{version}.tgz
+Patch: libsidplay-post57fixes.patch
 Icon: sidplay.xpm
 Group: System Environment/Libraries
 URL: http://www.geocities.com/SiliconValley/Lakes/5147/
@@ -27,6 +28,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .post57fixes
 
 %build
 %ifarch %{ix86}
@@ -61,7 +63,12 @@
 %{_libdir}/libsidplay.a
 %{_includedir}/sidplay
 
-%changelog 
+%changelog
+* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.36.57-5
+- Fix build for FC3/GCC 3.4 with patch from newer upstream release
+  (I'm still upstream for this, afaik).
+- Bump release.
+
 * Fri Apr 25 2003 Panu Matilainen <pmatilai at welho.com> 1.36.57-0.fdr.4
 - strict dependency in -devel package
 - simpler arch detection