summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorben <ben>2004-03-14 07:15:49 +0000
committerben <ben>2004-03-14 07:15:49 +0000
commit7667caaf9e6fa5d2dc4146660ac2064213a67b07 (patch)
treea750b2bda4f212b402536ee02a73c4d6633e07d4 /audio
parentc65b120554c68bbeb80e2e816099f0b028ba5cae (diff)
downloadpkgsrc-7667caaf9e6fa5d2dc4146660ac2064213a67b07.tar.gz
Make xmms-modplug build with GCC 2.95.3.
Diffstat (limited to 'audio')
-rw-r--r--audio/xmms-modplug/distinfo5
-rw-r--r--audio/xmms-modplug/patches/patch-ac21
-rw-r--r--audio/xmms-modplug/patches/patch-ae12
3 files changed, 34 insertions, 4 deletions
diff --git a/audio/xmms-modplug/distinfo b/audio/xmms-modplug/distinfo
index 3ced735074f..7707ed7fd5a 100644
--- a/audio/xmms-modplug/distinfo
+++ b/audio/xmms-modplug/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2004/03/09 04:38:40 ben Exp $
+$NetBSD: distinfo,v 1.3 2004/03/14 07:15:49 ben Exp $
SHA1 (modplugxmms-2.05.tar.gz) = ccb307fc7490a94aad2aadb5dac4e4e96aa7892f
Size (modplugxmms-2.05.tar.gz) = 242595 bytes
-SHA1 (patch-ac) = 397f601e6d02767a1d178892cc38e96fd8b36a9e
+SHA1 (patch-ac) = 894ceefe4fe405b7ca5b3a5ec824b54de4b1f117
SHA1 (patch-ad) = 55fcd439905303d3666bf2b8676e3aeeede7ea0f
+SHA1 (patch-ae) = 5f9ba3568d9c2cdad0305624e9eeb00594e97d83
diff --git a/audio/xmms-modplug/patches/patch-ac b/audio/xmms-modplug/patches/patch-ac
index f200405de3d..9111cdca7e7 100644
--- a/audio/xmms-modplug/patches/patch-ac
+++ b/audio/xmms-modplug/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2004/03/09 04:38:40 ben Exp $
+$NetBSD: patch-ac,v 1.3 2004/03/14 07:15:49 ben Exp $
---- modplugplay/modplugplay.c.orig 2003-10-16 03:47:46.000000000 -0700
+--- modplugplay/modplugplay.c.orig Thu Oct 16 03:47:46 2003
+++ modplugplay/modplugplay.c
@@ -89,7 +89,9 @@ command line option handling
#define VERSION "1.0"
@@ -12,3 +12,20 @@ $NetBSD: patch-ac,v 1.2 2004/03/09 04:38:40 ben Exp $
static struct termios stored_settings;
int audio_fd, mixer_fd;
+@@ -288,7 +290,6 @@ int main(int argc, char* argv[])
+ int songsplayed = 0;
+
+ ModPlug_Settings settings;
+- ModPlug_GetSettings(&settings);
+
+ int format;
+ int channels = 2;
+@@ -317,6 +318,8 @@ int main(int argc, char* argv[])
+ int surdly=0; // y
+ int bas=0; // x
+ int basrng=0; // c
++
++ ModPlug_GetSettings(&settings);
+
+ if ((format = get_byteorder()) == -1) {
+ return 1;
diff --git a/audio/xmms-modplug/patches/patch-ae b/audio/xmms-modplug/patches/patch-ae
new file mode 100644
index 00000000000..09a8e5fc0b4
--- /dev/null
+++ b/audio/xmms-modplug/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2004/03/14 07:15:49 ben Exp $
+
+--- modplugxmms/modplugxmms.h.orig Fri Oct 10 22:08:19 2003
++++ modplugxmms/modplugxmms.h
+@@ -14,6 +14,7 @@
+ #endif
+
+ #include "plugin.h"
++#include <pthread.h>
+
+ using namespace std;
+