diff options
| author | hans <hans@pkgsrc.org> | 2012-01-11 20:26:13 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-01-11 20:26:13 +0000 |
| commit | 2927856781129b47fa9974e3a99b97d5fa2b4ea7 (patch) | |
| tree | 2c877bf7710169e1bb0a3a8126f99b3729ad14ce /audio/splay | |
| parent | 4575532107f2e0076d1d9681895c01d8e001194f (diff) | |
| download | pkgsrc-2927856781129b47fa9974e3a99b97d5fa2b4ea7.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'audio/splay')
| -rw-r--r-- | audio/splay/Makefile | 3 | ||||
| -rw-r--r-- | audio/splay/distinfo | 4 | ||||
| -rw-r--r-- | audio/splay/patches/patch-ab | 52 |
3 files changed, 52 insertions, 7 deletions
diff --git a/audio/splay/Makefile b/audio/splay/Makefile index 814b892744a..c31f398c116 100644 --- a/audio/splay/Makefile +++ b/audio/splay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2009/07/07 16:49:05 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2012/01/11 20:26:13 hans Exp $ # DISTNAME= splay-0.8.2 @@ -17,6 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-xsplay CONFIGURE_ARGS+= --without-pthread LIBS+= ${LIBOSSAUDIO} +LIBS.SunOS+= -lsocket -lnsl .include "../../mk/oss.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/splay/distinfo b/audio/splay/distinfo index d2a50935faf..82c4854cc97 100644 --- a/audio/splay/distinfo +++ b/audio/splay/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2011/09/04 23:49:57 dholland Exp $ +$NetBSD: distinfo,v 1.9 2012/01/11 20:26:13 hans Exp $ SHA1 (splay-0.8.2.tar.gz) = 25288afa1b52bf25be8f9c4ceb44325c50fa00c8 RMD160 (splay-0.8.2.tar.gz) = f1a99ad9e7e70f5e0000aede05966cc5a0b36ad3 Size (splay-0.8.2.tar.gz) = 109060 bytes SHA1 (patch-aa) = a1c7edc9939454e437a6ad301cd5955f59612ed5 -SHA1 (patch-ab) = 9fc28c320ad90922dd0aa583904acd58f4cf3ba1 +SHA1 (patch-ab) = e5fe8f1aa8ce9a22fcc3140c6ead51978f165caf SHA1 (patch-ac) = f90b0e93ed4e72d20926e1bbe7dd5d21f4b39770 SHA1 (patch-ad) = 5d52e0878eb313a7d7684a6505daa4ece3add746 SHA1 (patch-ae) = 6b343541593d1d6ca8dd641ebb299a95d3bdc067 diff --git a/audio/splay/patches/patch-ab b/audio/splay/patches/patch-ab index 1e438a50646..8624f2c3574 100644 --- a/audio/splay/patches/patch-ab +++ b/audio/splay/patches/patch-ab @@ -1,20 +1,29 @@ -$NetBSD: patch-ab,v 1.6 2004/06/09 12:53:46 minskim Exp $ +$NetBSD: patch-ab,v 1.7 2012/01/11 20:26:13 hans Exp $ --- mpegsound/mpegsound.h.orig 1998-03-06 11:43:55.000000000 -0600 +++ mpegsound/mpegsound.h -@@ -11,6 +11,11 @@ +@@ -11,6 +11,20 @@ /************************************/ #include <stdio.h> #include <sys/types.h> +#ifdef __linux__ +#include <endian.h> ++#elif defined(__sun) ++#include <sys/byteorder.h> ++#define LITTLE_ENDIAN 1234 ++#define BIG_ENDIAN 4321 ++#ifdef _LITTLE_ENDIAN ++#define BYTE_ORDER LITTLE_ENDIAN ++#else ++#define BYTE_ORDER BIG_ENDIAN ++#endif +#else +#include <machine/endian.h> +#endif #ifdef PTHREADEDMPEG #ifdef HAVE_PTHREAD_H -@@ -90,6 +95,8 @@ +@@ -90,6 +104,8 @@ /*******************************************/ /* Define values for Microsoft WAVE format */ /*******************************************/ @@ -23,7 +32,7 @@ $NetBSD: patch-ab,v 1.6 2004/06/09 12:53:46 minskim Exp $ #define RIFF 0x46464952 #define WAVE 0x45564157 #define FMT 0x20746D66 -@@ -101,6 +108,21 @@ +@@ -101,27 +117,42 @@ #define MODE_MONO 0 #define MODE_STEREO 1 @@ -45,3 +54,38 @@ $NetBSD: patch-ab,v 1.6 2004/06/09 12:53:46 minskim Exp $ /********************/ /* Type definitions */ /********************/ + typedef float REAL; + + typedef struct _waveheader { +- u_int32_t main_chunk; // 'RIFF' +- u_int32_t length; // filelen +- u_int32_t chunk_type; // 'WAVE' +- +- u_int32_t sub_chunk; // 'fmt ' +- u_int32_t sc_len; // length of sub_chunk, =16 +- u_int16_t format; // should be 1 for PCM-code +- u_int16_t modus; // 1 Mono, 2 Stereo +- u_int32_t sample_fq; // frequence of sample +- u_int32_t byte_p_sec; +- u_int16_t byte_p_spl; // samplesize; 1 or 2 bytes +- u_int16_t bit_p_spl; // 8, 12 or 16 bit ++ uint32_t main_chunk; // 'RIFF' ++ uint32_t length; // filelen ++ uint32_t chunk_type; // 'WAVE' ++ ++ uint32_t sub_chunk; // 'fmt ' ++ uint32_t sc_len; // length of sub_chunk, =16 ++ uint16_t format; // should be 1 for PCM-code ++ uint16_t modus; // 1 Mono, 2 Stereo ++ uint32_t sample_fq; // frequence of sample ++ uint32_t byte_p_sec; ++ uint16_t byte_p_spl; // samplesize; 1 or 2 bytes ++ uint16_t bit_p_spl; // 8, 12 or 16 bit + +- u_int32_t data_chunk; // 'data' +- u_int32_t data_length; // samplecount ++ uint32_t data_chunk; // 'data' ++ uint32_t data_length; // samplecount + }WAVEHEADER; + + typedef struct |