pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Don't offer the "oss" option ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/40cbfe9d0f85
branches:  trunk
changeset: 519466:40cbfe9d0f85
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Oct 03 14:47:40 2006 +0000

description:
Don't offer the "oss" option on platforms which don't support OSS.
This fixes the build under Mac OS X. Sounds playback works fine via
the "macosx" audio driver on this platform.

diffstat:

 multimedia/mplayer-share/options.mk |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r 5440e086d06d -r 40cbfe9d0f85 multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Tue Oct 03 14:35:01 2006 +0000
+++ b/multimedia/mplayer-share/options.mk       Tue Oct 03 14:47:40 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2006/08/04 20:48:25 wiz Exp $
+# $NetBSD: options.mk,v 1.17 2006/10/03 14:47:40 tron Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -6,14 +6,19 @@
 # not defined yet, so we cannot use it here.
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/oss.buildlink3.mk"
 
 # -------------------------------------------------------------------------
 # Define PKG_SUPPORTED_OPTIONS based on the current package and system.
 # -------------------------------------------------------------------------
 
 # Options supported by both mplayer* or mencoder*.
+
+.if ${OSS_TYPE} != "none"
 PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread oss png theora vorbis
+.else
+PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis
+.endif
 
 # Set options based on the specific package being built.
 .if !empty(PKGNAME:M*mplayer*)
@@ -204,9 +209,8 @@
 CONFIGURE_ARGS+=       --disable-nas
 .endif
 
-.if !empty(PKG_OPTIONS:Moss)
+.if ${OSS_TYPE} != "none" && !empty(PKG_OPTIONS:Moss)
 CONFIGURE_ARGS+=       --enable-ossaudio
-.  include "../../mk/oss.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-ossaudio
 .endif



Home | Main Index | Thread Index | Old Index