diff options
Diffstat (limited to 'audio')
-rw-r--r-- | audio/spiralloops/Makefile | 3 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-ai | 22 | ||||
-rw-r--r-- | audio/spiralloops/patches/patch-aj | 22 | ||||
-rw-r--r-- | audio/spiralsynth/distinfo | 4 | ||||
-rw-r--r-- | audio/spiralsynth/patches/patch-am | 32 | ||||
-rw-r--r-- | audio/streamripper-current/distinfo | 3 | ||||
-rw-r--r-- | audio/streamripper-current/patches/patch-lib_ripstream.c | 13 |
7 files changed, 90 insertions, 9 deletions
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile index ab0bc2a774a..be23ce325f4 100644 --- a/audio/spiralloops/Makefile +++ b/audio/spiralloops/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2011/11/23 08:20:38 marino Exp $ +# $NetBSD: Makefile,v 1.33 2012/02/15 22:47:31 hans Exp $ # DISTNAME= SpiralLoops-2.0.0 @@ -24,6 +24,7 @@ GNU_CONFIGURE= yes MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\"" CXXFLAGS+= -DFLTK_1_0_COMPAT +CXXFLAGS.SunOS+= -DSOUND_PCM_WRITE_CHANNELS=SNDCTL_DSP_CHANNELS INSTALLATION_DIRS= bin diff --git a/audio/spiralloops/patches/patch-ai b/audio/spiralloops/patches/patch-ai index da97fd00e10..be1d266b7c4 100644 --- a/audio/spiralloops/patches/patch-ai +++ b/audio/spiralloops/patches/patch-ai @@ -1,8 +1,26 @@ -$NetBSD: patch-ai,v 1.1 2003/12/19 16:37:54 ben Exp $ +$NetBSD: patch-ai,v 1.2 2012/02/15 22:47:31 hans Exp $ --- SpiralSound/Output.C.orig 2001-04-19 13:48:12.000000000 -0700 +++ SpiralSound/Output.C -@@ -29,7 +29,7 @@ m_Channels(Channels) +@@ -19,6 +19,17 @@ + #include "Output.h" + #include "Sample.h" + ++#ifdef __sun ++#include <sys/byteorder.h> ++#define LITTLE_ENDIAN 1234 ++#define BIG_ENDIAN 4321 ++#ifdef _BIG_ENDIAN ++#define __BYTE_ORDER BIG_ENDIAN ++#else ++#define __BYTE_ORDER LITTLE_ENDIAN ++#endif ++#endif ++ + Output::Output(int Channels) : + m_Amp(0.5), + m_Channels(Channels) +@@ -29,7 +40,7 @@ m_Channels(Channels) m_Buffer.Zero(); } diff --git a/audio/spiralloops/patches/patch-aj b/audio/spiralloops/patches/patch-aj index 28b6a13231a..126bcd43d9d 100644 --- a/audio/spiralloops/patches/patch-aj +++ b/audio/spiralloops/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.2 2011/11/23 08:20:38 marino Exp $ +$NetBSD: patch-aj,v 1.3 2012/02/15 22:47:31 hans Exp $ --- SpiralSound/RiffWav.C.orig 2001-04-19 20:48:12.000000000 +0000 +++ SpiralSound/RiffWav.C @@ -11,7 +11,25 @@ $NetBSD: patch-aj,v 1.2 2011/11/23 08:20:38 marino Exp $ #include <fstream> #include <stdio.h> #include <stdlib.h> -@@ -55,7 +55,7 @@ WavFile::HeaderInfo::HeaderInfo() : Riff +@@ -26,6 +26,17 @@ + #include <sys/stat.h> + #include <fcntl.h> + ++#ifdef __sun ++#include <sys/byteorder.h> ++#define LITTLE_ENDIAN 1234 ++#define BIG_ENDIAN 4321 ++#ifdef _BIG_ENDIAN ++#define __BYTE_ORDER BIG_ENDIAN ++#else ++#define __BYTE_ORDER LITTLE_ENDIAN ++#endif ++#endif ++ + const int HEADERLEN = (4+24+8); + + #if __BYTE_ORDER == BIG_ENDIAN +@@ -55,7 +66,7 @@ WavFile::HeaderInfo::HeaderInfo() : Riff #endif } diff --git a/audio/spiralsynth/distinfo b/audio/spiralsynth/distinfo index b5fe5907001..aafeef9babe 100644 --- a/audio/spiralsynth/distinfo +++ b/audio/spiralsynth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2011/11/23 08:32:10 marino Exp $ +$NetBSD: distinfo,v 1.14 2012/02/15 22:52:50 hans Exp $ SHA1 (SpiralSynth-2.0.0.tar.gz) = ea42c5b7710237139f5281cf0c4ca155c184c4cd RMD160 (SpiralSynth-2.0.0.tar.gz) = c05f38a9ae8b8b87f520c11854631e6dfa00c034 @@ -14,7 +14,7 @@ SHA1 (patch-ai) = e21a111e3e52fc3c24433f248fa1bfdf566e72dd SHA1 (patch-aj) = 7e3e29fbfd38428d68f195db8a7f5007c1417c88 SHA1 (patch-ak) = 67643c5abea0498f8ea046c5abd52f2d328a5538 SHA1 (patch-al) = 7436bce933cbddcd4f869ab2cbbe27762d4273e5 -SHA1 (patch-am) = 4899c78015028a6e8047e5527362646e40a10708 +SHA1 (patch-am) = 78ab70a1952f389712412515652c2e8cc7d917a3 SHA1 (patch-an) = 2bafb1a9a959816af43a858fdb4a9df5586a91e9 SHA1 (patch-ao) = 138f58bd7fae0226690747efcb8daf472e3a5337 SHA1 (patch-ar) = 44ab335b5a7831080d58a952f3cc13e5795a3f0e diff --git a/audio/spiralsynth/patches/patch-am b/audio/spiralsynth/patches/patch-am index 4b6610bbf5c..67cc9547b48 100644 --- a/audio/spiralsynth/patches/patch-am +++ b/audio/spiralsynth/patches/patch-am @@ -1,4 +1,4 @@ -$NetBSD: patch-am,v 1.1 2004/11/25 17:24:27 ben Exp $ +$NetBSD: patch-am,v 1.2 2012/02/15 22:52:50 hans Exp $ --- SpiralSound/Output.C.orig Sun Jun 2 13:58:06 2002 +++ SpiralSound/Output.C @@ -12,3 +12,33 @@ $NetBSD: patch-am,v 1.1 2004/11/25 17:24:27 ben Exp $ #define CHECK_AND_REPORT_ERROR if (result<0) \ { \ +@@ -224,7 +227,7 @@ void OSSOutput::OpenWrite() + CHECK_AND_REPORT_ERROR; + + val = 1; +- result = ioctl(m_Dspfd, SOUND_PCM_WRITE_CHANNELS, &val); ++ result = ioctl(m_Dspfd, SNDCTL_DSP_CHANNELS, &val); + CHECK_AND_REPORT_ERROR; + + val = AFMT_S16_LE; +@@ -260,9 +263,11 @@ void OSSOutput::OpenRead() + result = ioctl(m_Dspfd,SNDCTL_DSP_RESET,NULL); + CHECK_AND_REPORT_ERROR; + ++#ifdef SOUND_PCM_READ_CHANNELS + val = 1; + result = ioctl(m_Dspfd, SOUND_PCM_READ_CHANNELS, &val); + CHECK_AND_REPORT_ERROR; ++#endif + + val = AFMT_S16_LE; + result = ioctl(m_Dspfd,SNDCTL_DSP_SETFMT,&val); +@@ -317,7 +322,7 @@ void OSSOutput::OpenReadWrite() + CHECK_AND_REPORT_ERROR; + + val = 1; +- result = ioctl(m_Dspfd, SOUND_PCM_WRITE_CHANNELS, &val); ++ result = ioctl(m_Dspfd, SNDCTL_DSP_CHANNELS, &val); + CHECK_AND_REPORT_ERROR; + + val = AFMT_S16_LE; diff --git a/audio/streamripper-current/distinfo b/audio/streamripper-current/distinfo index e64eec60b0e..4624fdf50e6 100644 --- a/audio/streamripper-current/distinfo +++ b/audio/streamripper-current/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/01/07 18:51:28 drochner Exp $ +$NetBSD: distinfo,v 1.2 2012/02/15 22:55:16 hans Exp $ SHA1 (streamripper-1.64.3.tar.gz) = 08dff7b4e48e16ad581e0b28fb77bdcddeeee0bb RMD160 (streamripper-1.64.3.tar.gz) = d0d5d18fc7e5086bb768e6a51e566e16f0ced730 Size (streamripper-1.64.3.tar.gz) = 857175 bytes SHA1 (patch-ac) = b22e18723d4888d78f0e5e01e0db40f010b15f96 SHA1 (patch-ad) = 583dbf02c8adf75eccdfea8c0e8aa181e89256de +SHA1 (patch-lib_ripstream.c) = 4cc71c5d58cec36711d9c90a327dea9f466cec2a diff --git a/audio/streamripper-current/patches/patch-lib_ripstream.c b/audio/streamripper-current/patches/patch-lib_ripstream.c new file mode 100644 index 00000000000..266f1849dd5 --- /dev/null +++ b/audio/streamripper-current/patches/patch-lib_ripstream.c @@ -0,0 +1,13 @@ +$NetBSD: patch-lib_ripstream.c,v 1.1 2012/02/15 22:55:16 hans Exp $ + +--- lib/ripstream.c.orig 2008-12-27 15:32:07.000000000 +0100 ++++ lib/ripstream.c 2012-01-11 21:38:08.772278869 +0100 +@@ -731,7 +731,7 @@ write_id3v2_frame(RIP_MANAGER_INFO* rmi, + char bigbuf[HEADER_SIZE] = ""; + ID3V2frame id3v2frame; + #ifndef WIN32 +- __uint32_t framesize = 0; ++ uint32_t framesize = 0; + #else + unsigned long int framesize = 0; + #endif |