diff options
| author |   Brian Harring <ferringb@gentoo.org> | 2004-02-01 13:32:34 +0000 |
|---|---|---|
| committer | Brian Harring <ferringb@gentoo.org> | 2004-02-01 13:32:34 +0000 |
| commit | 5a5bf746c173417c5a3f352caa3b223411f5f3b4 (patch) | |
| tree | 5faeb610224037f06c971a10ab90fa3aaf88d33a /media-sound/timidity++/files | |
| parent | Added a patch to get ntfsprogs to compile on 2.6 headers; closes bug #39106. ... (diff) | |
| download | gentoo-2-5a5bf746c173417c5a3f352caa3b223411f5f3b4.tar.gz gentoo-2-5a5bf746c173417c5a3f352caa3b223411f5f3b4.tar.bz2 gentoo-2-5a5bf746c173417c5a3f352caa3b223411f5f3b4.zip | |
Alsalib-1.0 compilation fix (35457)
Diffstat (limited to 'media-sound/timidity++/files')
| -rw-r--r-- | media-sound/timidity++/files/timidity++-2.12.0-alsalib-fix.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/media-sound/timidity++/files/timidity++-2.12.0-alsalib-fix.patch b/media-sound/timidity++/files/timidity++-2.12.0-alsalib-fix.patch new file mode 100644 index 000000000000..1dedd0bd0397 --- /dev/null +++ b/media-sound/timidity++/files/timidity++-2.12.0-alsalib-fix.patch @@ -0,0 +1,49 @@ +diff -urN interface/alsaseq_c.c interface/alsaseq_c.c +--- interface/alsaseq_c.c 2002-01-16 04:21:49.000000000 -0600 ++++ interface/alsaseq_c.c 2004-01-21 01:46:55.414954936 -0600 +@@ -45,6 +45,7 @@ + #endif + #include <signal.h> + ++#define ALSA_PCM_OLD_HW_PARAMS_API + #include <sys/asoundlib.h> + + #include "timidity.h" +@@ -76,7 +77,7 @@ + + static struct seq_context alsactx; + +-#if SND_LIB_MINOR >= 6 ++#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR==1 + /* !! this is a dirty hack. not sure to work in future !! */ + static int snd_seq_file_descriptor(snd_seq_t *handle) + { +@@ -536,7 +537,7 @@ + seq_play_event(&ev); + break; + +-#if SND_LIB_MINOR >= 6 ++#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR==1 + #define snd_seq_addr_equal(a,b) ((a)->client == (b)->client && (a)->port == (b)->port) + case SND_SEQ_EVENT_PORT_SUBSCRIBED: + if (snd_seq_addr_equal(&aevp->data.connect.dest, &aevp->dest)) { +diff -urN timidity/alsa_a.c timidity/alsa_a.c +--- timidity/alsa_a.c 2002-01-16 04:15:20.000000000 -0600 ++++ timidity/alsa_a.c 2004-01-21 00:39:51.324709640 -0600 +@@ -41,10 +41,15 @@ + #endif + + /*ALSA header file*/ ++#define ALSA_PCM_OLD_HW_PARAMS_API + #include <sys/asoundlib.h> + + #if defined(SND_LIB_MINOR) +-#define ALSA_LIB SND_LIB_MINOR ++# if SND_LIB_MAJOR==1 ++# define ALSA_LIB 10 ++# else ++# define ALSA_LIB SND_LIB_MINOR ++# endif + #else + #define ALSA_LIB 3 + #endif |