[SCM] adplug/master: Update patches for new upstream changes.
ceros-guest at users.alioth.debian.org
ceros-guest at users.alioth.debian.org
Sun Sep 26 17:58:59 UTC 2010
The following commit has been merged in the master branch:
commit 63510c7e31ac1aa6b1eab18e518dc879be1e171e
Author: Andres Mejia <mcitadel at gmail.com>
Date: Sun Sep 26 12:21:53 2010 -0400
Update patches for new upstream changes.
diff --git a/debian/patches/01-include.patch b/debian/patches/01-include.patch
index 5c9d477..8a889cf 100644
--- a/debian/patches/01-include.patch
+++ b/debian/patches/01-include.patch
@@ -13,9 +13,9 @@ Updates includes for libbinio 1.4.1.
--- a/src/adplug.cpp
+++ b/src/adplug.cpp
-@@ -20,7 +20,7 @@
- */
+@@ -21,7 +21,7 @@
+ #include <cstring>
#include <string>
-#include <binfile.h>
+#include <libbinio/binfile.h>
diff --git a/debian/patches/02-fix-ftbfs-with-gcc-4.3.patch b/debian/patches/02-fix-ftbfs-with-gcc-4.3.patch
deleted file mode 100644
index 2f0d0f4..0000000
--- a/debian/patches/02-fix-ftbfs-with-gcc-4.3.patch
+++ /dev/null
@@ -1,211 +0,0 @@
-Fix missing includes, needed for gcc-4.3 transition.
-
---- a/src/a2m.cpp
-+++ b/src/a2m.cpp
-@@ -33,6 +33,8 @@
-
- #include "a2m.h"
-
-+#include <cstring>
-+
- const unsigned int Ca2mLoader::MAXFREQ = 2000,
- Ca2mLoader::MINCOPY = ADPLUG_A2M_MINCOPY,
- Ca2mLoader::MAXCOPY = ADPLUG_A2M_MAXCOPY,
---- a/src/bmf.cpp
-+++ b/src/bmf.cpp
-@@ -43,6 +43,8 @@
- #include "bmf.h"
- #include "debug.h"
-
-+#include <cstring>
-+
- const unsigned char CxadbmfPlayer::bmf_adlib_registers[117] =
- {
- 0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0, 0xE0, 0xE3,
---- a/src/cff.cpp
-+++ b/src/cff.cpp
-@@ -28,6 +28,8 @@
-
- #include "cff.h"
-
-+#include <cstring>
-+
- /* -------- Public Methods -------------------------------- */
-
- CPlayer *CcffLoader::factory(Copl *newopl)
---- a/src/dro.cpp
-+++ b/src/dro.cpp
-@@ -27,6 +27,8 @@
-
- #include "dro.h"
-
-+#include <cstring>
-+
- /*** public methods *************************************/
-
- CPlayer *CdroPlayer::factory(Copl *newopl)
---- a/src/dtm.cpp
-+++ b/src/dtm.cpp
-@@ -24,6 +24,8 @@
-
- #include "dtm.h"
-
-+#include <cstring>
-+
- /* -------- Public Methods -------------------------------- */
-
- CPlayer *CdtmLoader::factory(Copl *newopl)
---- a/src/fmc.cpp
-+++ b/src/fmc.cpp
-@@ -21,6 +21,8 @@
-
- #include "fmc.h"
-
-+#include <cstring>
-+
- /* -------- Public Methods -------------------------------- */
-
- CPlayer *CfmcLoader::factory(Copl *newopl)
---- a/src/mad.cpp
-+++ b/src/mad.cpp
-@@ -21,6 +21,8 @@
-
- #include "mad.h"
-
-+#include <cstring>
-+
- /* -------- Public Methods -------------------------------- */
-
- CPlayer *CmadLoader::factory(Copl *newopl)
---- a/src/mkj.cpp
-+++ b/src/mkj.cpp
-@@ -24,6 +24,8 @@
- #include "mkj.h"
- #include "debug.h"
-
-+#include <cstring>
-+
- CPlayer *CmkjPlayer::factory(Copl *newopl)
- {
- return new CmkjPlayer(newopl);
---- a/src/msc.cpp
-+++ b/src/msc.cpp
-@@ -24,6 +24,8 @@
- #include "msc.h"
- #include "debug.h"
-
-+#include <cstring>
-+
- const unsigned char CmscPlayer::msc_signature [MSC_SIGN_LEN] = {
- 'C', 'e', 'r', 'e', 's', ' ', '\x13', ' ',
- 'M', 'S', 'C', 'p', 'l', 'a', 'y', ' ' };
---- a/src/mtk.cpp
-+++ b/src/mtk.cpp
-@@ -21,6 +21,8 @@
-
- #include "mtk.h"
-
-+#include <cstring>
-+
- /*** public methods **************************************/
-
- CPlayer *CmtkLoader::factory(Copl *newopl)
---- a/src/protrack.cpp
-+++ b/src/protrack.cpp
-@@ -28,6 +28,8 @@
- #include "protrack.h"
- #include "debug.h"
-
-+#include <cstring>
-+
- #define SPECIALARPLEN 256 // Standard length of special arpeggio lists
- #define JUMPMARKER 0x80 // Orderlist jump marker
-
---- a/src/rad.cpp
-+++ b/src/rad.cpp
-@@ -24,6 +24,8 @@
-
- #include "rad.h"
-
-+#include <cstring>
-+
- CPlayer *CradLoader::factory(Copl *newopl)
- {
- return new CradLoader(newopl);
---- a/src/rat.cpp
-+++ b/src/rat.cpp
-@@ -32,6 +32,8 @@
- #include "rat.h"
- #include "debug.h"
-
-+#include <cstring>
-+
- const unsigned char CxadratPlayer::rat_adlib_bases[18] =
- {
- 0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12,
---- a/src/raw.cpp
-+++ b/src/raw.cpp
-@@ -21,6 +21,8 @@
-
- #include "raw.h"
-
-+#include <cstring>
-+
- /*** public methods *************************************/
-
- CPlayer *CrawPlayer::factory(Copl *newopl)
---- a/src/rix.cpp
-+++ b/src/rix.cpp
-@@ -23,6 +23,9 @@
- #include "rix.h"
- #include "debug.h"
-
-+#include <cstdlib>
-+#include <cstring>
-+
- const unsigned char CrixPlayer::adflag[] = {0,0,0,1,1,1,0,0,0,1,1,1,0,0,0,1,1,1};
- const unsigned char CrixPlayer::reg_data[] = {0,1,2,3,4,5,8,9,10,11,12,13,16,17,18,19,20,21};
- const unsigned char CrixPlayer::ad_C0_offs[] = {0,1,2,0,1,2,3,4,5,3,4,5,6,7,8,6,7,8};
---- a/src/rol.h
-+++ b/src/rol.h
-@@ -25,6 +25,7 @@
-
- #include <vector>
- #include <string>
-+#include <cstring>
-
- #include "player.h"
-
---- a/src/s3m.cpp
-+++ b/src/s3m.cpp
-@@ -24,6 +24,8 @@
-
- #include "s3m.h"
-
-+#include <cstring>
-+
- const char Cs3mPlayer::chnresolv[] = // S3M -> adlib channel conversion
- {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,0,1,2,3,4,5,6,7,8,-1,-1,-1,-1,-1,-1,-1};
-
---- a/src/sa2.cpp
-+++ b/src/sa2.cpp
-@@ -25,6 +25,8 @@
- #include "sa2.h"
- #include "debug.h"
-
-+#include <cstring>
-+
- CPlayer *Csa2Loader::factory(Copl *newopl)
- {
- return new Csa2Loader(newopl);
---- a/src/sng.cpp
-+++ b/src/sng.cpp
-@@ -21,6 +21,8 @@
-
- #include "sng.h"
-
-+#include <cstring>
-+
- CPlayer *CsngPlayer::factory(Copl *newopl)
- {
- return new CsngPlayer(newopl);
diff --git a/debian/patches/03-no-tests.patch b/debian/patches/03-no-tests.patch
deleted file mode 100644
index 64e3867..0000000
--- a/debian/patches/03-no-tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Don't run tests; we have stripped that directory from the tarball.
-
---- a/configure
-+++ b/configure
-@@ -1528,7 +1528,7 @@
-
-
-
-- ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile adplugdb/Makefile test/Makefile adplug.pc"
-+ ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile adplugdb/Makefile adplug.pc"
-
- am__api_version="1.9"
- ac_aux_dir=
-@@ -21725,7 +21725,6 @@
- "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
- "adplugdb/Makefile" ) CONFIG_FILES="$CONFIG_FILES adplugdb/Makefile" ;;
-- "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
- "adplug.pc" ) CONFIG_FILES="$CONFIG_FILES adplug.pc" ;;
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
---- a/configure.in
-+++ b/configure.in
-@@ -1,7 +1,7 @@
- # Tell autoconf we're compiling a C++ library, using automake & libtool
- AC_INIT(adplug,2.0.1)
- AC_CONFIG_SRCDIR(src/adplug.cpp)
--AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile adplugdb/Makefile test/Makefile adplug.pc])
-+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile adplugdb/Makefile adplug.pc])
- AM_INIT_AUTOMAKE
- AM_MAINTAINER_MODE
- AM_PROG_LIBTOOL
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -185,7 +185,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = src doc adplugdb test
-+SUBDIRS = src doc adplugdb
- EXTRA_DIST = adplug.spec adplug.qpg BUGS adplug.pc.in
- AUTOMAKE_OPTIONS = dist-bzip2
- pkgconfigdir = $(libdir)/pkgconfig
diff --git a/debian/patches/series b/debian/patches/series
index 935b94a..d5251b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
01-include.patch
-02-fix-ftbfs-with-gcc-4.3.patch
-03-no-tests.patch
--
adplug packaging
More information about the pkg-multimedia-commits
mailing list