diff options
author | hans <hans@pkgsrc.org> | 2012-02-15 22:23:15 +0000 |
---|---|---|
committer | hans <hans@pkgsrc.org> | 2012-02-15 22:23:15 +0000 |
commit | 4ac8f98f8b3bfc7cbd26c3376cce407fcb1fca56 (patch) | |
tree | d3e26a8b4e2e7c794edf1bf6c7e60ac4d3ff1519 /audio/ocp | |
parent | 3fb89d16a095e0c2a1ad527277f0a27e0073317b (diff) | |
download | pkgsrc-4ac8f98f8b3bfc7cbd26c3376cce407fcb1fca56.tar.gz |
Fix build on SunOS.
Diffstat (limited to 'audio/ocp')
-rw-r--r-- | audio/ocp/Makefile | 11 | ||||
-rw-r--r-- | audio/ocp/distinfo | 5 | ||||
-rw-r--r-- | audio/ocp/patches/patch-af | 15 | ||||
-rw-r--r-- | audio/ocp/patches/patch-playay_ayplay.c | 13 |
4 files changed, 39 insertions, 5 deletions
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index d9d5dbc48dd..884b0d4ba7d 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2012/02/05 21:48:26 sbd Exp $ +# $NetBSD: Makefile,v 1.11 2012/02/15 22:23:15 hans Exp $ DISTNAME= ocp-0.1.21 PKGREVISION= 1 @@ -23,11 +23,20 @@ USE_LANGUAGES= c c++ USE_NCURSES= yes # resize_term INFO_FILES= yes +REPLACE_SH= ocp-curses ocp-sdl ocp-vcsa ocp-x11 + # ymtype.so wants to link -llzh before it's finished building MAKE_JOBS_SAFE= no CONFIGURE_ARGS+= --exec-prefix=${PREFIX} CONFIGURE_ARGS+= --infodir=${PREFIX}/info +CONFIGURE_ARGS+= --without-x11 +CONFIGURE_ARGS+= --without-sdl + +CFLAGS.SunOS+= -mimpure-text +CFLAGS.SunOS+= -DSOUND_PCM_WRITE_CHANNELS=SNDCTL_DSP_CHANNELS +CFLAGS.SunOS+= -DSOUND_PCM_WRITE_BITS=SNDCTL_DSP_SETFMT +CFLAGS.SunOS+= -DSOUND_PCM_WRITE_RATE=SNDCTL_DSP_SPEED .include "../../audio/libid3tag/buildlink3.mk" .include "../../audio/libmad/buildlink3.mk" diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo index f8ad67e4caa..65e881682c1 100644 --- a/audio/ocp/distinfo +++ b/audio/ocp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2011/11/28 16:46:29 wiz Exp $ +$NetBSD: distinfo,v 1.5 2012/02/15 22:23:16 hans Exp $ SHA1 (ocp-0.1.21.tar.bz2) = aaa16cf1979c572b09c73e7cc61350bfc4477380 RMD160 (ocp-0.1.21.tar.bz2) = 6b42e93e9fe5879e844b2d336825a2db156b7e6f @@ -7,4 +7,5 @@ SHA1 (patch-ab) = d33aad7cfa41330c5cb026a7d3e92545f741f429 SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6 SHA1 (patch-ad) = 1a3e3aa02eeae905faebac7fc7fc27eb93fa0e46 SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65 -SHA1 (patch-af) = d379ded1f683c8299293436a3f9f7c0d32b06ec4 +SHA1 (patch-af) = 63c598841a9998cce54deb0b9898c5b433f0fe21 +SHA1 (patch-playay_ayplay.c) = 565efad3e619743fd7260c2957152a0b116674c4 diff --git a/audio/ocp/patches/patch-af b/audio/ocp/patches/patch-af index 96296f60a1c..28db1d591b9 100644 --- a/audio/ocp/patches/patch-af +++ b/audio/ocp/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $ +$NetBSD: patch-af,v 1.2 2012/02/15 22:23:16 hans Exp $ --- config.h.in.orig 2008-01-14 18:48:57.000000000 +0000 +++ config.h.in -@@ -215,7 +215,7 @@ +@@ -250,7 +250,7 @@ #include <duma.h> #endif @@ -11,3 +11,14 @@ $NetBSD: patch-af,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $ #define NO_DLCLOSE #endif +@@ -272,7 +272,9 @@ extern void *memmem(const void *haystack + /* A lot of structures etc. uses PATH_MAX, NAME_MAX and friends, so we + * still #include <limits.h> here + */ +- ++#ifndef NAME_MAX ++#define NAME_MAX PATH_MAX ++#endif + + #undef GCC_411_RUNTIMECHECK + diff --git a/audio/ocp/patches/patch-playay_ayplay.c b/audio/ocp/patches/patch-playay_ayplay.c new file mode 100644 index 00000000000..42e4b253b0a --- /dev/null +++ b/audio/ocp/patches/patch-playay_ayplay.c @@ -0,0 +1,13 @@ +$NetBSD: patch-playay_ayplay.c,v 1.1 2012/02/15 22:23:16 hans Exp $ + +--- playay/ayplay.c.orig 2011-11-17 22:46:08.000000000 +0100 ++++ playay/ayplay.c 2012-01-18 12:00:17.650251502 +0100 +@@ -1129,7 +1129,7 @@ void __attribute__ ((visibility ("intern + aybufrate=256*sp; + } + +-void __attribute__ ((visibility ("internal"))) aySetVolume(unsigned char vol_, signed char bal_, signed char pan_, unsigned char opt) ++void __attribute__ ((visibility ("internal"))) aySetVolume(uint8_t vol_, int8_t bal_, int8_t pan_, uint8_t opt) + { + pan=pan_; + volr=voll=vol_*4; |