[Pkg-sdl-commits] [SCM] Debian packaging of SDL_mixer project branch, master, updated. debian/1.2.11-7-9-g6c0b401
Manuel A. Fernandez Montecelo
manuel.montezelo at gmail.com
Fri Jan 20 23:59:57 UTC 2012
The following commit has been merged in the master branch:
commit 9c964b2d96b2a71b6680b6c2569804117e15c559
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date: Fri Jan 20 17:10:09 2012 +0000
Work on patches: removing the ones backported from upstream and the obsolete; document and refresh the rest
diff --git a/debian/patches/00_link_libm_hgdb31b63abab9.patch b/debian/patches/00_link_libm_hgdb31b63abab9.patch
deleted file mode 100644
index 52d1233..0000000
--- a/debian/patches/00_link_libm_hgdb31b63abab9.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: link libm with sdl-mixer
- Fixed bug 1010 (libSDL_mixer should be linked with -lm)
-Author: Sam Lantinga <slouken at libsdl.org>
-Last-Update: Thu Feb 17 13:20:18 2011 -0800
---- a/configure.in
-+++ b/configure.in
-@@ -364,7 +364,7 @@
- echo "-- dynamic libvorbisidec -> $ogg_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
- else
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis -logg $LIBM"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis -logg"
- fi
- else
- AC_MSG_WARN([*** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)])
-@@ -394,7 +394,7 @@
- echo "-- dynamic libvorbisfile -> $ogg_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
- else
-- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg $LIBM"
-+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg"
- fi
- else
- AC_MSG_WARN([*** Unable to find Ogg Vorbis library (http://www.xiph.org/)])
-@@ -528,6 +528,7 @@
- AC_MSG_WARN([MP3 support disabled])
- fi
-
-+EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBM"
-
- OBJECTS=`echo $SOURCES`
- DEPENDS=`echo $SOURCES`
diff --git a/debian/patches/01_no_lvorbis_logg.patch b/debian/patches/01_no_lvorbis_logg.patch
index d6136f3..22507dd 100644
--- a/debian/patches/01_no_lvorbis_logg.patch
+++ b/debian/patches/01_no_lvorbis_logg.patch
@@ -1,6 +1,13 @@
+Description: Do not uselessly link with -lvorbis -logg.
+ Introduced in 1.2.8-4 (Wed, 21 May 2008 11:54:21 +0000).
+ .
+ Not linked with a bug report.
+Author: Sam Hocevar <sam at zoy.org>
+Last-Update: 2012-01-20
+
--- a/configure.in
+++ b/configure.in
-@@ -364,7 +364,7 @@
+@@ -457,7 +457,7 @@
echo "-- dynamic libvorbisidec -> $ogg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
else
@@ -9,7 +16,7 @@
fi
else
AC_MSG_WARN([*** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)])
-@@ -394,7 +394,7 @@
+@@ -487,7 +487,7 @@
echo "-- dynamic libvorbisfile -> $ogg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
else
diff --git a/debian/patches/02_hurd.patch b/debian/patches/02_hurd.patch
index 26fd6ca..9564677 100644
--- a/debian/patches/02_hurd.patch
+++ b/debian/patches/02_hurd.patch
@@ -1,6 +1,11 @@
+Description: Fix FTBFS on Hurd
+ Introduced in 1.2.6-3 (Tue, 31 Jul 2007 14:16:36 +0200).
+Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
+Last-Update: 2012-01-20
+Bug-Debian: http://bugs.debian.org/428892
--- a/music_cmd.c
+++ b/music_cmd.c
-@@ -54,10 +54,8 @@
+@@ -53,10 +53,8 @@
Mix_SetError("Out of memory");
return(NULL);
}
@@ -13,7 +18,7 @@
music->pid = 0;
/* We're done */
-@@ -156,7 +154,7 @@
+@@ -155,7 +153,7 @@
/* Child process - executes here */
case 0: {
@@ -22,7 +27,7 @@
char **argv;
/* Unblock signals in case we're called from a thread */
-@@ -167,11 +165,12 @@
+@@ -166,11 +164,12 @@
}
/* Execute the command */
@@ -32,22 +37,22 @@
if ( argv != NULL ) {
execvp(argv[0], argv);
}
-+ free(command);
++ SDL_free(command);
/* exec() failed */
perror(argv[0]);
-@@ -220,6 +219,8 @@
+@@ -219,6 +218,8 @@
/* Close the given music stream */
void MusicCMD_FreeSong(MusicCMD *music)
{
-+ free(music->file);
-+ free(music->cmd);
- free(music);
++ SDL_free(music->file);
++ SDL_free(music->cmd);
+ SDL_free(music);
}
--- a/music_cmd.h
+++ b/music_cmd.h
-@@ -31,8 +31,8 @@
+@@ -30,8 +30,8 @@
# include <linux/limits.h>
#endif
typedef struct {
diff --git a/debian/patches/03_awe_voice.patch b/debian/patches/03_awe_voice.patch
deleted file mode 100644
index 5404ee6..0000000
--- a/debian/patches/03_awe_voice.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/native_midi_gpl/playmidi.h
-+++ b/native_midi_gpl/playmidi.h
-@@ -52,11 +52,7 @@
- #include <stdlib.h>
- #include <sys/soundcard.h>
- #include <sys/ioctl.h>
--#ifdef linux
--#include <linux/awe_voice.h>
--#else
--#include <awe_voice.h>
--#endif
-+#include "awe_voice.h"
-
- struct chanstate {
- int program;
diff --git a/debian/patches/04_timidity_cfg_opts.patch b/debian/patches/04_timidity_cfg_opts.patch
index 11a130f..0d58111 100644
--- a/debian/patches/04_timidity_cfg_opts.patch
+++ b/debian/patches/04_timidity_cfg_opts.patch
@@ -1,6 +1,11 @@
+Description: Ignore unknown options in timidity.cfg
+ Introduced in 1.2.8-6 (Fri, 22 May 2009 10:33:13 -0400).
+Author: Brandon Barnes <winterknight at nerdshack.com>
+Last-Update: 2012-01-20
+Bug-Debian: http://bugs.debian.org/398805
--- a/timidity/timidity.c
+++ b/timidity/timidity.c
-@@ -165,7 +165,7 @@
+@@ -153,7 +153,7 @@
{
ctl->cmsg(CMSG_ERROR, VERB_NORMAL,
"%s: line %d: syntax error\n", name, line);
diff --git a/debian/patches/05_fallback_to_freepats.patch b/debian/patches/05_fallback_to_freepats.patch
index dd75938..b44a2dc 100644
--- a/debian/patches/05_fallback_to_freepats.patch
+++ b/debian/patches/05_fallback_to_freepats.patch
@@ -1,6 +1,11 @@
+Description: If timidity.cfg is not present, please try to load freepats.cfg
+ Introduced in 1.2.8-6 (Fri, 22 May 2009 10:33:13 -0400).
+Author: Fabian Greffrath <greffrath at leat.rub.de>
+Last-Update: 2012-01-20
+Bug-Debian: http://bugs.debian.org/453308
--- a/timidity/config.h
+++ b/timidity/config.h
-@@ -173,6 +173,7 @@
+@@ -162,6 +162,7 @@
then specify the library directory in the configuration file. */
#define CONFIG_FILE "timidity.cfg"
#define CONFIG_FILE_ETC "/etc/timidity.cfg"
@@ -10,7 +15,7 @@
#define DEFAULT_PATH "C:\\TIMIDITY"
--- a/timidity/timidity.c
+++ b/timidity/timidity.c
-@@ -298,7 +298,9 @@
+@@ -286,7 +286,9 @@
if (!env || read_config_file(env)<0) {
if (read_config_file(CONFIG_FILE)<0) {
if (read_config_file(CONFIG_FILE_ETC)<0) {
diff --git a/debian/patches/06_dev_snd_seq.patch b/debian/patches/06_dev_snd_seq.patch
deleted file mode 100644
index cde1cd8..0000000
--- a/debian/patches/06_dev_snd_seq.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/native_midi_gpl/native_midi_gpl.c
-+++ b/native_midi_gpl/native_midi_gpl.c
-@@ -77,9 +77,10 @@
- int ret=0;
-
- /* Open sequencer device */
-- if ((seqfd = open(SEQUENCER_DEV, O_WRONLY, 0)) < 0)
-+ if ((seqfd = open(SEQUENCER_DEV, O_WRONLY, 0)) < 0
-+ && (seqfd = open(SEQUENCER_ALTDEV, O_WRONLY, 0)) < 0)
- {
-- perror("open " SEQUENCER_DEV);
-+ perror("open " SEQUENCER_DEV " or " SEQUENCER_ALTDEV);
- return 0;
- }
-
-@@ -253,9 +254,10 @@
- }
-
- /* Open sequencer device */
-- if ((seqfd = open(SEQUENCER_DEV, O_WRONLY, 0)) < 0)
-+ if ((seqfd = open(SEQUENCER_DEV, O_WRONLY, 0)) < 0
-+ && (seqfd = open(SEQUENCER_ALTDEV, O_WRONLY, 0)) < 0)
- {
-- perror("open " SEQUENCER_DEV);
-+ perror("open " SEQUENCER_DEV " or " SEQUENCER_ALTDEV);
- goto eend;
- }
- if(!synth_setup()) { goto end;};
-@@ -324,7 +326,7 @@
- {
- if (_seqbufptr)
- if (write(seqfd, _seqbuf, _seqbufptr) == -1) {
-- perror("write " SEQUENCER_DEV);
-+ perror("write " SEQUENCER_DEV " or " SEQUENCER_ALTDEV);
- return;
- }
- _seqbufptr = 0;
-@@ -354,7 +356,7 @@
- if (ioctl(seqfd, SNDCTL_SYNTH_INFO, &card_info[i]) == -1)
- {
- fprintf(stderr, "cannot get info on soundcard\n");
-- perror(SEQUENCER_DEV);
-+ perror(SEQUENCER_DEV " or " SEQUENCER_ALTDEV);
- return 0;
- }
- card_info[i].device = i;
---- a/native_midi_gpl/playmidi.h
-+++ b/native_midi_gpl/playmidi.h
-@@ -35,6 +35,7 @@
- #define MAXTRKS 128
- /* where to find fm patch libraries */
- #define SEQUENCER_DEV "/dev/sequencer"
-+#define SEQUENCER_ALTDEV "/dev/snd/seq"
- #define O3MELODIC "/etc/std.o3"
- #define O3DRUMS "/etc/drums.o3"
- #define SBMELODIC "/etc/std.sb"
diff --git a/debian/patches/07_FLAC_SDL_RWops_memory_leaks.patch b/debian/patches/07_FLAC_SDL_RWops_memory_leaks.patch
deleted file mode 100644
index 82a424a..0000000
--- a/debian/patches/07_FLAC_SDL_RWops_memory_leaks.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix memory leaks (#600467)
- Patch split out from the alternative packaging attached to
- bug #600467. Thanks Edward Lee.
---- a/music_flac.c
-+++ b/music_flac.c
-@@ -559,6 +559,10 @@
- free (music->cvt.buf);
- }
-
-+ if (music->rwops) {
-+ SDL_RWclose(music->rwops);
-+ }
-+
- free (music);
- }
- }
diff --git a/debian/patches/series b/debian/patches/series
index d9dffe8..2dc3ebe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,4 @@
-00_link_libm_hgdb31b63abab9.patch
01_no_lvorbis_logg.patch
02_hurd.patch
-03_awe_voice.patch
04_timidity_cfg_opts.patch
05_fallback_to_freepats.patch
-06_dev_snd_seq.patch
-07_FLAC_SDL_RWops_memory_leaks.patch
--
Debian packaging of SDL_mixer project
More information about the pkg-sdl-commits
mailing list