Fix build on SunOS 5.11.

This commit is contained in:
hans 2012-01-11 20:21:54 +00:00
parent e2f1d386e8
commit 9569cc7b00
3 changed files with 55 additions and 4 deletions

View file

@ -1,7 +1,8 @@
$NetBSD: distinfo,v 1.16 2009/08/18 16:47:18 joerg Exp $
$NetBSD: distinfo,v 1.17 2012/01/11 20:21:54 hans Exp $
SHA1 (snd-9.9.tar.gz) = 8c00b1d48d66032a9085b8ae652a5d25c8ef14a2
RMD160 (snd-9.9.tar.gz) = 39561a38d8bba7ead73a16fc7647cb2bd6ef275a
Size (snd-9.9.tar.gz) = 12349176 bytes
SHA1 (patch-aa) = b17208a09350d6f9be61b60d6ece6d92d60c5ad5
SHA1 (patch-aa) = 187d033726161b14c341c2dd31f365c26f40bc75
SHA1 (patch-ab) = c6f2a3c134c2fb2adee67b672f66a092e7962b75
SHA1 (patch-audio.c) = 88beedda1dbb9a93655d184c73703c2b90104dc4

View file

@ -1,8 +1,25 @@
$NetBSD: patch-aa,v 1.5 2008/04/28 12:47:44 wiz Exp $
$NetBSD: patch-aa,v 1.6 2012/01/11 20:21:54 hans Exp $
--- configure.orig 2008-04-24 19:29:25.000000000 +0200
+++ configure
@@ -24530,7 +24530,7 @@ fi
@@ -20970,6 +20970,16 @@ _ACEOF
LIBS="$LIBS -lm"
AUDIO_SYSTEM=Sun
;;
+ *-*-solaris2.11)
+ cat >>confdefs.h <<\_ACEOF
+#define MUS_LINUX 1
+#define HAVE_OSS 1
+_ACEOF
+
+ LIBS="$LIBS -lm -ldl"
+ AUDIO_SYSTEM=OSS
+ LDSO_FLAGS="-G"
+ ;;
*-*-solaris*)
cat >>confdefs.h <<\_ACEOF
#define MUS_SUN 1
@@ -24530,7 +24540,7 @@ fi
if test "$ac_snd_have_extension_language" = no ; then
if test "$ac_snd_have_gui" = no ; then
if test "$ac_cv_header_dlfcn_h" = yes ; then

View file

@ -0,0 +1,33 @@
$NetBSD: patch-audio.c,v 1.1 2012/01/11 20:21:54 hans Exp $
No midi support on SunOS.
--- audio.c.orig 2008-04-09 14:10:30.000000000 +0200
+++ audio.c 2012-01-02 16:13:15.136170006 +0100
@@ -2927,8 +2927,10 @@ static void oss_describe_audio_state_1(v
int fd;
int status = 0, level, i, recsrc, devmask, recmask, stereodevs, caps;
int numdevs = 0, rate = 0, channels = 0, blocksize = 0, formats = 0, deffmt = 0, min_rate = 0, max_rate = 0;
+#ifndef __sun
struct synth_info sinfo;
struct midi_info minfo;
+#endif
const char *sound_device_names[] = SOUND_DEVICE_LABELS;
char dsp_name[LABEL_BUFFER_SIZE];
char version[LABEL_BUFFER_SIZE];
@@ -2996,6 +2998,7 @@ static void oss_describe_audio_state_1(v
}
pprint("\n\n");
+#ifndef __sun
fd = open(SYNTH_NAME, O_RDWR, 0);
if (fd == -1) fd = open(SYNTH_NAME, O_RDONLY, 0);
if (fd == -1)
@@ -3050,6 +3053,7 @@ static void oss_describe_audio_state_1(v
}
if (fd != -1) close(fd);
pprint("--------------------------------\n");
+#endif
MIXER_INFO:
mus_snprintf(dsp_name, LABEL_BUFFER_SIZE, "%s%d", MIXER_NAME, dsp_num);