Make this work with audio/oss, conditioned on whether USE_OSS is defined.

6 files changed, 53 insertions, 12 deletions

diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo
index 8505a2a92be..4e2359e0e9f 100644
--- a/graphics/gmplayer/distinfo
+++ b/graphics/gmplayer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2002/10/25 18:20:48 wiz Exp $
+$NetBSD: distinfo,v 1.21 2002/11/01 10:19:16 jlam Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre9.tar.bz2) = e9c022e6531c7d75847130ef6ed5b4342db271ab
 Size (mplayer/MPlayer-0.90pre9.tar.bz2) = 2758568 bytes
@@ -42,6 +42,6 @@ SHA1 (mplayer/CornerMP-aqua.tar.bz2) = 4dc5a2f4cc90250f9c188ed93bf26d7e323d554d
 Size (mplayer/CornerMP-aqua.tar.bz2) = 248136 bytes
 SHA1 (mplayer/hwswskin.tar.bz2) = 00ecb41cf8b295fbd50422e2d7d1b7874b0fed12
 Size (mplayer/hwswskin.tar.bz2) = 20278 bytes
-SHA1 (patch-aa) = b337af994eea5b953d9df5246d590d368013dc5f
+SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45
 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ad) = 8204b57097d6f0b4eb08e49bca3c1bbbb464c21e
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index 880068d81ba..7d631c956f7 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2002/10/25 18:20:47 wiz Exp $
+# $NetBSD: Makefile.common,v 1.15 2002/11/01 10:19:17 jlam Exp $
 
 MPLAYER_DIST_VERSION=	0.90pre9
 #PKGREVISION=		1
@@ -30,6 +30,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 #	no source on the ftp server because of the css source code in it
 NO_SRC_ON_FTP=		${RESTRICTED}
 
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
 
@@ -40,8 +41,8 @@ CONFIGURE_ARGS+=	--with-extraincdir="${LOCALBASE}/include"
 CONFIGURE_ARGS+=	--with-extralibdir="${LOCALBASE}/lib"
 #CONFIGURE_ARGS+=	--enable-dvdread
 CONFIGURE_ARGS+=	--disable-mpdvdkit
-CONFIGURE_ARGS+=	--disable-ossaudio
 CONFIGURE_ARGS+=	--enable-faad
+CONFIGURE_ARGS+=	--disable-arts
 
 # The configure script attempts to test-execute compiled programs in /tmp,
 # but that directory may be mounted as noexec; work this around by setting
@@ -50,6 +51,12 @@ CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(USE_OSS)
+CONFIGURE_ARGS+=	--enable-ossaudio
+.else
+CONFIGURE_ARGS+=	--disable-ossaudio
+.endif
+
 .if ${MACHINE_ARCH} == "i386"
 CONFIGURE_ARGS+=	--with-win32libdir="${LOCALBASE}/lib/win32"
 .if ${MPLAYER_USE_REALMEDIA} == "YES"
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 34b64df7dd0..3036bceecb7 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.depends,v 1.6 2002/09/29 06:37:07 jlam Exp $
+# $NetBSD: Makefile.depends,v 1.7 2002/11/01 10:19:17 jlam Exp $
 
 DEPENDS+=	mplayer-share-${MPLAYER_PKG_VERSION}${PKGREVISION:Dnb${PKGREVISION}}:../../graphics/mplayer-share
 
@@ -24,5 +24,7 @@ USE_X11=	# defined
 .include "../../lang/gcc/buildlink2.mk"
 .include "../../misc/libdvdread/buildlink2.mk"
 
-.include "../../mk/ossaudio.buildlink2.mk"
+.if defined(USE_OSS)
+.  include "../../mk/ossaudio.buildlink2.mk"
+.endif
 .include "../../mk/pthread.buildlink2.mk"
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index 67e3ddfab6e..30808bbfd8e 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2002/10/25 18:20:48 wiz Exp $
+$NetBSD: distinfo,v 1.12 2002/11/01 10:19:17 jlam Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre9.tar.bz2) = e9c022e6531c7d75847130ef6ed5b4342db271ab
 Size (mplayer/MPlayer-0.90pre9.tar.bz2) = 2758568 bytes
@@ -8,6 +8,6 @@ SHA1 (mplayer/mp-arial-iso-8859-2.zip) = a1ef7ea4f4349cd4451052351f7c300597a1b5d
 Size (mplayer/mp-arial-iso-8859-2.zip) = 255907 bytes
 SHA1 (mplayer/koi8r-font.tar.bz2) = d8f44c101aaae32b5674c16da3549f5e520c077e
 Size (mplayer/koi8r-font.tar.bz2) = 68817 bytes
-SHA1 (patch-aa) = b337af994eea5b953d9df5246d590d368013dc5f
+SHA1 (patch-aa) = e941800773428dae213c13384b0fb7cfc19befda
 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ad) = 8204b57097d6f0b4eb08e49bca3c1bbbb464c21e
diff --git a/graphics/mplayer-share/patches/patch-aa b/graphics/mplayer-share/patches/patch-aa
index 49588a68c45..6a3e0048ecb 100644
--- a/graphics/mplayer-share/patches/patch-aa
+++ b/graphics/mplayer-share/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2002/10/25 18:20:48 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2002/11/01 10:19:18 jlam Exp $
 
---- configure.orig	Thu Oct 24 20:12:40 2002
+--- configure.orig	Thu Oct 24 14:12:40 2002
 +++ configure
 @@ -298,8 +298,8 @@ for ac_option do
      _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
@@ -13,3 +13,35 @@ $NetBSD: patch-aa,v 1.3 2002/10/25 18:20:48 wiz Exp $
      ;;
    --enable-runtime-cpudetection)
      _runtime_cpudetection=yes
+@@ -2970,8 +2970,22 @@ if test "$_ossaudio" = yes ; then
+     _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound/dsp"'
+     _def_ossaudio_devmixer='#define PATH_DEV_MIXER "/dev/sound/mixer"'
+   else
+-     if netbsd || openbsd ; then
++     cat > $TMPC << EOF
++#include <sys/ioctl.h>
++$_inc_soundcard
++#ifdef OPEN_SOUND_SYSTEM
++int main(void) { return 0; }
++#else
++#error Not the real thing
++#endif
++EOF
++     _real_ossaudio=no
++     cc_check && _real_ossaudio=yes
++     if test "$_real_ossaudio" = yes; then
++       _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
++     elif netbsd || openbsd ; then
+        _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/sound"'
++       netbsd && _ld_arch="$_ld_arch -lossaudio"
+        openbsd && _ld_arch="$_ld_arch -lossaudio"
+      else
+        _def_ossaudio_devdsp='#define PATH_DEV_DSP "/dev/dsp"'
+@@ -4324,7 +4338,6 @@ test "$_real" = yes && _ld_dl_dynamic='-
+ _ld_arch="$_ld_arch $_ld_pthread $_ld_dl $_ld_dl_dynamic"
+ bsdos && _ld_arch="$_ld_arch -ldvd"
+ if netbsd ; then
+-  _ld_arch="$_ld_arch -lossaudio"
+   x86 && _ld_arch="$_ld_arch -li386"
+ fi
+ 
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index 1d352e514e7..242d4d7edfe 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.23 2002/10/25 18:20:47 wiz Exp $
+$NetBSD: distinfo,v 1.24 2002/11/01 10:19:17 jlam Exp $
 
 SHA1 (mplayer/MPlayer-0.90pre9.tar.bz2) = e9c022e6531c7d75847130ef6ed5b4342db271ab
 Size (mplayer/MPlayer-0.90pre9.tar.bz2) = 2758568 bytes
-SHA1 (patch-aa) = b337af994eea5b953d9df5246d590d368013dc5f
+SHA1 (patch-aa) = 9b4e0940ce1b091dad068a5b87e0b7857914fa45
 SHA1 (patch-ab) = e36a37c5d011319e0b02f30487ecf489f067f13d
 SHA1 (patch-ad) = 8204b57097d6f0b4eb08e49bca3c1bbbb464c21e