- Fix configure to detect sound better

Submitted by:	saper@sgh.waw.pl

2 files changed, 141 insertions, 0 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 5f44baa03bb9..62d9c93c5927 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	vice
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 .if defined(VICE_WITH_GNOME)
diff --git a/emulators/vice/files/patch-sound b/emulators/vice/files/patch-sound
new file mode 100644
index 000000000000..b9fda5f9b5cc
--- /dev/null
+++ b/emulators/vice/files/patch-sound
@@ -0,0 +1,140 @@
+--- configure.orig	Mon Jan 20 19:45:51 2003
++++ configure	Fri Feb 14 03:16:36 2003
+@@ -2587,7 +2587,7 @@
+ fi
+ 
+ if test x"$with_sdl" = "xyes"; then
+-	for ac_prog in sdl-config
++	for ac_prog in sdl11-config
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -3906,7 +3906,7 @@
+ 	SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o"
+ fi
+ 
+-for ac_hdr in linux/soundcard.h machine/soundcard.h
++for ac_hdr in linux/soundcard.h machine/soundcard.h sys/soundcard.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -4039,7 +4039,7 @@
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp `esd-config --cflags` conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:4044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -4068,7 +4068,7 @@
+ 
+ 
+ if test x"$with_sdl" = "xyes"; then
+-  for ac_hdr in SDL/SDL_audio.h
++  for ac_hdr in SDL_audio.h
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -4081,7 +4081,7 @@
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp `sdl11-config --cflags` conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:4086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -4342,7 +4342,7 @@
+ fi
+ 
+ if test x"$with_sdl" = "xyes"; then
+-	LIBS="$LIBS `sdl-config --libs`"
++	LIBS="$LIBS `sdl11-config --libs`"
+ 	echo $ac_n "checking for SDL_OpenAudio in -lSDL""... $ac_c" 1>&6
+ echo "configure:4348: checking for SDL_OpenAudio in -lSDL" >&5
+ ac_lib_var=`echo SDL'_'SDL_OpenAudio | sed 'y%./+-%__p_%'`
+@@ -4350,7 +4350,7 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lSDL $SOUND_LIBS $LIBS"
++LIBS="$SOUND_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4356 "configure"
+ #include "confdefs.h"
+@@ -4384,7 +4384,8 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lSDL $LIBS"
++  LIBS="`sdl11-config --libs` $LIBS"
++  CPPFLAGS="`sdl11-config --cflags` $CPPFLAGS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+@@ -4493,7 +4494,8 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lesd $SOUND_LIBS $LIBS"
++LIBS="`esd-config --libs` $SOUND_LIBS $LIBS"
++CPPFLAGS="`esd-config --cflags` $CPPFLAGS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4499 "configure"
+ #include "confdefs.h"
+@@ -4527,7 +4529,7 @@
+ #define $ac_tr_lib 1
+ EOF
+ 
+-  LIBS="-lesd $LIBS"
++  LIBS="`esd-config --libs` $LIBS"
+ 
+ else
+   echo "$ac_t""no" 1>&6
+--- src/config.h.in.orig	Sat Jan 18 13:12:15 2003
++++ src/config.h.in	Fri Feb 14 03:24:18 2003
+@@ -229,6 +229,9 @@
+ /* Define if you have the <machine/soundcard.h> header file.  */
+ #undef HAVE_MACHINE_SOUNDCARD_H
+ 
++/* Define if you have the <sys/soundcard.h> header file.  */
++#undef HAVE_SYS_SOUNDCARD_H
++
+ /* Define if you have the <midasdll.h> header file.  */
+ #undef HAVE_MIDASDLL_H
+ 
+--- src/sound.c.orig	Sat Jan 11 16:38:57 2003
++++ src/sound.c	Fri Feb 14 03:21:39 2003
+@@ -977,7 +977,7 @@
+ #if defined(USE_ARTS)
+     sound_init_arts_device();
+ #endif
+-#if defined(HAVE_LINUX_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
++#if defined(HAVE_LINUX_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H) || defined (HAVE_SYS_SOUNDCARD_H)
+     sound_init_uss_device();
+ #endif
+ #if defined(HAVE_ESD_H) && defined(HAVE_LIBESD)
+--- src/sounddrv/soundsdl.c.orig	Sat Jan 12 21:35:58 2002
++++ src/sounddrv/soundsdl.c	Fri Feb 14 03:13:41 2003
+@@ -26,7 +26,7 @@
+ 
+ /* XXX: includes */
+ 
+-#include <SDL/SDL_audio.h>
++#include <SDL_audio.h>
+ #include <unistd.h>
+ 
+ #include "vice.h"
+--- src/sounddrv/sounduss.c.orig	Sun Sep 29 20:37:11 2002
++++ src/sounddrv/sounduss.c	Fri Feb 14 03:17:42 2003
+@@ -50,6 +50,9 @@
+ #if defined(HAVE_MACHINE_SOUNDCARD_H)
+ #include <machine/soundcard.h>
+ #endif
++#if defined(HAVE_SYS_SOUNDCARD_H)
++#include <sys/soundcard.h>
++#endif
+ 
+ static int uss_fd = -1;
+ static int uss_8bit = 0;