pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-share Add vidix option, only for Li...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/42ef2691781e
branches:  trunk
changeset: 536869:42ef2691781e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 27 13:19:40 2007 +0000

description:
Add vidix option, only for Linux.
Fixes build on NetBSD/amd64.

diffstat:

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

diffs (55 lines):

diff -r ae7744bc4528 -r 42ef2691781e multimedia/mplayer-share/options.mk
--- a/multimedia/mplayer-share/options.mk       Thu Dec 27 12:48:38 2007 +0000
+++ b/multimedia/mplayer-share/options.mk       Thu Dec 27 13:19:40 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2007/12/21 17:41:12 drochner Exp $
+# $NetBSD: options.mk,v 1.25 2007/12/27 13:19:40 wiz Exp $
 
 .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
 
@@ -14,10 +14,9 @@
 
 # Options supported by both mplayer* or mencoder*.
 
+PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis
 .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
+PKG_SUPPORTED_OPTIONS+=        oss
 .endif
 
 # Set options based on the specific package being built.
@@ -41,6 +40,9 @@
 .elif ${OPSYS} == "SunOS"
 PKG_SUPPORTED_OPTIONS+=        mlib
 .endif
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=        vidix
+.endif
 
 # Platform-specific options.
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
@@ -70,6 +72,9 @@
 PKG_SUGGESTED_OPTIONS+=        ${_o_}
 .  endif
 .endfor
+.if ${OPSYS} == "Linux"
+PKG_SUGGESTED_OPTIONS+=        vidix
+.endif
 
 # -------------------------------------------------------------------------
 # Handle extra libraries (part 1)
@@ -247,6 +252,12 @@
 CONFIGURE_ARGS+=       --disable-theora
 .endif
 
+# disable vidix if not in options
+.if empty(PKG_OPTIONS:Mvidix)
+CONFIGURE_ARGS+=       --disable-vidix-internal
+CONFIGURE_ARGS+=       --disable-vidix-external
+.endif
+
 .if !empty(PKG_OPTIONS:Mvorbis)
 CONFIGURE_ARGS+=       --enable-libvorbis
 .else



Home | Main Index | Thread Index | Old Index