rpms/adplug/devel adplug-2.1-include.patch, 1.2, 1.3 adplug.spec, 1.8, 1.9
Linus Walleij (snirkel)
fedora-extras-commits at redhat.com
Mon Feb 11 13:03:49 UTC 2008
Author: snirkel
Update of /cvs/extras/rpms/adplug/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27745
Modified Files:
adplug-2.1-include.patch adplug.spec
Log Message:
Shaped up the patch for GCC 4.3
adplug-2.1-include.patch:
Index: adplug-2.1-include.patch
===================================================================
RCS file: /cvs/extras/rpms/adplug/devel/adplug-2.1-include.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- adplug-2.1-include.patch 11 Feb 2008 09:37:58 -0000 1.2
+++ adplug-2.1-include.patch 11 Feb 2008 13:03:39 -0000 1.3
@@ -1,6 +1,28 @@
+diff -ur adplug-2.1-orig/src/a2m.cpp adplug-2.1/src/a2m.cpp
+--- adplug-2.1-orig/src/a2m.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/a2m.cpp 2008-02-11 13:31:41.000000000 +0100
+@@ -29,6 +29,7 @@
+ * Following commands are ignored: Gxy, Hxy, Kxy - &xy
+ */
+
++#include <cstring>
+ #include "a2m.h"
+
+ const unsigned int Ca2mLoader::MAXFREQ = 2000,
+diff -ur adplug-2.1-orig/src/adl.cpp adplug-2.1/src/adl.cpp
+--- adplug-2.1-orig/src/adl.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/adl.cpp 2008-02-11 13:59:04.000000000 +0100
+@@ -48,6 +48,7 @@
+ *
+ */
+
++#include <cstring>
+ #include <inttypes.h>
+ #include <stdarg.h>
+ #include <assert.h>
diff -ur adplug-2.1-orig/src/adplug.cpp adplug-2.1/src/adplug.cpp
---- adplug-2.1-orig/src/adplug.cpp 2008-02-11 10:28:41.000000000 +0100
-+++ adplug-2.1/src/adplug.cpp 2008-02-11 10:29:53.000000000 +0100
+--- adplug-2.1-orig/src/adplug.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/adplug.cpp 2008-02-11 13:19:49.000000000 +0100
@@ -19,6 +19,7 @@
* adplug.cpp - CAdPlug utility class, by Simon Peter <dn.tlp at gmx.net>
*/
@@ -9,3 +31,201 @@
#include <string>
#include <binfile.h>
+diff -ur adplug-2.1-orig/src/bmf.cpp adplug-2.1/src/bmf.cpp
+--- adplug-2.1-orig/src/bmf.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/bmf.cpp 2008-02-11 13:51:49.000000000 +0100
+@@ -40,6 +40,7 @@
+ comment : inaccurate replaying, because constant outport; in original player it can be 380 or 382.
+ */
+
++#include <cstring>
+ #include "bmf.h"
+ #include "debug.h"
+
+diff -ur adplug-2.1-orig/src/cff.cpp adplug-2.1/src/cff.cpp
+--- adplug-2.1-orig/src/cff.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/cff.cpp 2008-02-11 13:33:54.000000000 +0100
+@@ -24,6 +24,7 @@
+ slides use previous effect data instead of current.
+ */
+
++#include <cstring>
+ #include <stdlib.h>
+
+ #include "cff.h"
+diff -ur adplug-2.1-orig/src/dro.cpp adplug-2.1/src/dro.cpp
+--- adplug-2.1-orig/src/dro.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/dro.cpp 2008-02-11 13:56:05.000000000 +0100
+@@ -23,6 +23,7 @@
+ * NOTES: 3-oct-04: the DRO format is not yet finalized. beware.
+ */
+
++#include <cstring>
+ #include <stdio.h>
+
+ #include "dro.h"
+diff -ur adplug-2.1-orig/src/dtm.cpp adplug-2.1/src/dtm.cpp
+--- adplug-2.1-orig/src/dtm.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/dtm.cpp 2008-02-11 13:37:45.000000000 +0100
+@@ -22,6 +22,7 @@
+ NOTE: Panning (Ex) effect is ignored.
+ */
+
++#include <cstring>
+ #include "dtm.h"
+
+ /* -------- Public Methods -------------------------------- */
+diff -ur adplug-2.1-orig/src/fmc.cpp adplug-2.1/src/fmc.cpp
+--- adplug-2.1-orig/src/fmc.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/fmc.cpp 2008-02-11 13:41:19.000000000 +0100
+@@ -19,6 +19,7 @@
+ fmc.cpp - FMC Loader by Riven the Mage <riven at ok.ru>
+ */
+
++#include <cstring>
+ #include "fmc.h"
+
+ /* -------- Public Methods -------------------------------- */
+diff -ur adplug-2.1-orig/src/mad.cpp adplug-2.1/src/mad.cpp
+--- adplug-2.1-orig/src/mad.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/mad.cpp 2008-02-11 13:31:50.000000000 +0100
+@@ -19,6 +19,7 @@
+ mad.cpp - MAD loader by Riven the Mage <riven at ok.ru>
+ */
+
++#include <cstring>
+ #include "mad.h"
+
+ /* -------- Public Methods -------------------------------- */
+diff -ur adplug-2.1-orig/src/mkj.cpp adplug-2.1/src/mkj.cpp
+--- adplug-2.1-orig/src/mkj.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/mkj.cpp 2008-02-11 13:32:55.000000000 +0100
+@@ -19,6 +19,7 @@
+ * mkj.cpp - MKJamz Player, by Simon Peter <dn.tlp at gmx.net>
+ */
+
++#include <cstring>
+ #include <assert.h>
+
+ #include "mkj.h"
+diff -ur adplug-2.1-orig/src/msc.cpp adplug-2.1/src/msc.cpp
+--- adplug-2.1-orig/src/msc.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/msc.cpp 2008-02-11 13:57:26.000000000 +0100
+@@ -19,6 +19,7 @@
+ * msc.c - MSC Player by Lubomir Bulej (pallas at kadan.cz)
+ */
+
++#include <cstring>
+ #include <stdio.h>
+
+ #include "msc.h"
+diff -ur adplug-2.1-orig/src/mtk.cpp adplug-2.1/src/mtk.cpp
+--- adplug-2.1-orig/src/mtk.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/mtk.cpp 2008-02-11 13:37:52.000000000 +0100
+@@ -19,6 +19,7 @@
+ * mtk.cpp - MPU-401 Trakker Loader by Simon Peter (dn.tlp at gmx.net)
+ */
+
++#include <cstring>
+ #include "mtk.h"
+
+ /*** public methods **************************************/
+diff -ur adplug-2.1-orig/src/protrack.cpp adplug-2.1/src/protrack.cpp
+--- adplug-2.1-orig/src/protrack.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/protrack.cpp 2008-02-11 13:28:23.000000000 +0100
+@@ -25,6 +25,7 @@
+ * Protracker-like format, this is most certainly the player you want to use.
+ */
+
++#include <cstring>
+ #include "protrack.h"
+ #include "debug.h"
+
+diff -ur adplug-2.1-orig/src/rad.cpp adplug-2.1/src/rad.cpp
+--- adplug-2.1-orig/src/rad.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/rad.cpp 2008-02-11 13:43:51.000000000 +0100
+@@ -22,6 +22,7 @@
+ * some volumes are dropped out
+ */
+
++#include <cstring>
+ #include "rad.h"
+
+ CPlayer *CradLoader::factory(Copl *newopl)
+diff -ur adplug-2.1-orig/src/rat.cpp adplug-2.1/src/rat.cpp
+--- adplug-2.1-orig/src/rat.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/rat.cpp 2008-02-11 13:53:20.000000000 +0100
+@@ -29,6 +29,7 @@
+ comment : there are bug in original replayer's adlib_init(): wrong frequency registers.
+ */
+
++#include <cstring>
+ #include "rat.h"
+ #include "debug.h"
+
+diff -ur adplug-2.1-orig/src/raw.cpp adplug-2.1/src/raw.cpp
+--- adplug-2.1-orig/src/raw.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/raw.cpp 2008-02-11 13:49:33.000000000 +0100
+@@ -19,6 +19,7 @@
+ * raw.c - RAW Player by Simon Peter <dn.tlp at gmx.net>
+ */
+
++#include <cstring>
+ #include "raw.h"
+
+ /*** public methods *************************************/
+diff -ur adplug-2.1-orig/src/rix.cpp adplug-2.1/src/rix.cpp
+--- adplug-2.1-orig/src/rix.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/rix.cpp 2008-02-11 14:00:37.000000000 +0100
+@@ -20,6 +20,7 @@
+ * BSPAL <BSPAL.ys168.com>
+ */
+
++#include <cstring>
+ #include "rix.h"
+ #include "debug.h"
+
+diff -ur adplug-2.1-orig/src/rol.cpp adplug-2.1/src/rol.cpp
+--- adplug-2.1-orig/src/rol.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/rol.cpp 2008-02-11 13:54:42.000000000 +0100
+@@ -20,6 +20,7 @@
+ *
+ * Visit: http://tenacity.hispeed.com/aomit/oplx/
+ */
++#include <cstring>
+ #include <algorithm>
+
+ #include "rol.h"
+diff -ur adplug-2.1-orig/src/s3m.cpp adplug-2.1/src/s3m.cpp
+--- adplug-2.1-orig/src/s3m.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/s3m.cpp 2008-02-11 13:34:54.000000000 +0100
+@@ -22,6 +22,7 @@
+ * Extra Fine Slides (EEx, FEx) & Fine Vibrato (Uxy) are inaccurate
+ */
+
++#include <cstring>
+ #include "s3m.h"
+
+ const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
+diff -ur adplug-2.1-orig/src/sa2.cpp adplug-2.1/src/sa2.cpp
+--- adplug-2.1-orig/src/sa2.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/sa2.cpp 2008-02-11 13:50:40.000000000 +0100
+@@ -20,6 +20,7 @@
+ * SAdT Loader by Mamiya <mamiya at users.sourceforge.net>
+ */
+
++#include <cstring>
+ #include <stdio.h>
+
+ #include "sa2.h"
+diff -ur adplug-2.1-orig/src/sng.cpp adplug-2.1/src/sng.cpp
+--- adplug-2.1-orig/src/sng.cpp 2008-02-11 13:19:21.000000000 +0100
++++ adplug-2.1/src/sng.cpp 2008-02-11 13:20:27.000000000 +0100
+@@ -19,6 +19,7 @@
+ * sng.cpp - SNG Player by Simon Peter <dn.tlp at gmx.net>
+ */
+
++#include <cstring>
+ #include "sng.h"
+
+ CPlayer *CsngPlayer::factory(Copl *newopl)
Index: adplug.spec
===================================================================
RCS file: /cvs/extras/rpms/adplug/devel/adplug.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- adplug.spec 11 Feb 2008 09:12:36 -0000 1.8
+++ adplug.spec 11 Feb 2008 13:03:39 -0000 1.9
@@ -4,7 +4,7 @@
%define adplugdbver 2006-07-07
Name: adplug
Version: 2.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A software library for AdLib (OPL2) emulation
URL: http://adplug.sourceforge.net/
Group: Applications/Multimedia
@@ -100,6 +100,9 @@
%{_infodir}/*.gz
%changelog
+* Mon Feb 11 2008 Linus Walleij <triad at df.lth.se> 2.1-6
+- Nailed the GCC build problems to numerous include <cstring>.
+
* Mon Feb 11 2008 Linus Walleij <triad at df.lth.se> 2.1-5
- Patch include directives with a patch derived from Debian.
More information about the fedora-extras-commits
mailing list