Mon Mar 24 23:44:19 2008 UTC ()
If using the mplayer-ssse3 option, then include override-as.mk from binutils.


(tnn)
diff -r1.29 -r1.30 pkgsrc/multimedia/mplayer-share/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/multimedia/mplayer-share/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mplayer-share/options.mk 2008/03/16 21:22:45 1.29
+++ pkgsrc/multimedia/mplayer-share/options.mk 2008/03/24 23:44:19 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.29 2008/03/16 21:22:45 wiz Exp $ 1# $NetBSD: options.mk,v 1.30 2008/03/24 23:44:19 tnn Exp $
2 2
3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) 3.if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)
4 4
5# Note: This expression is the same as ${PKGBASE}, but the latter is 5# Note: This expression is the same as ${PKGBASE}, but the latter is
6# not defined yet, so we cannot use it here. 6# not defined yet, so we cannot use it here.
7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//} 7PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
8 8
9.include "../../mk/oss.buildlink3.mk" 9.include "../../mk/oss.buildlink3.mk"
10 10
11# ------------------------------------------------------------------------- 11# -------------------------------------------------------------------------
12# Define PKG_SUPPORTED_OPTIONS based on the current package and system. 12# Define PKG_SUPPORTED_OPTIONS based on the current package and system.
13# ------------------------------------------------------------------------- 13# -------------------------------------------------------------------------
14 14
@@ -280,25 +280,26 @@ CONFIGURE_ARGS+= --disable-x264 @@ -280,25 +280,26 @@ CONFIGURE_ARGS+= --disable-x264
280.endif 280.endif
281 281
282.if !empty(PKG_OPTIONS:Mxvid) 282.if !empty(PKG_OPTIONS:Mxvid)
283CONFIGURE_ARGS+= --enable-xvid 283CONFIGURE_ARGS+= --enable-xvid
284EXTRA_LIBS+= -lxvidcore 284EXTRA_LIBS+= -lxvidcore
285. include "../../multimedia/xvidcore/buildlink3.mk" 285. include "../../multimedia/xvidcore/buildlink3.mk"
286.else 286.else
287CONFIGURE_ARGS+= --disable-xvid 287CONFIGURE_ARGS+= --disable-xvid
288.endif 288.endif
289 289
290.if !empty(PKG_OPTIONS:Mmplayer-ssse3) 290.if !empty(PKG_OPTIONS:Mmplayer-ssse3)
291# needs a recent assembler 291# needs a recent assembler
292.include "../../devel/binutils/buildlink3.mk" 292.include "../../devel/binutils/buildlink3.mk"
 293.include "../../devel/binutils/override-as.mk"
293.else 294.else
294CONFIGURE_ARGS+= --disable-ssse3 295CONFIGURE_ARGS+= --disable-ssse3
295.endif 296.endif
296 297
297# ------------------------------------------------------------------------- 298# -------------------------------------------------------------------------
298# Handle extra libraries (part 1) 299# Handle extra libraries (part 1)
299# ------------------------------------------------------------------------- 300# -------------------------------------------------------------------------
300.if ${EXTRA_LIBS} != "" 301.if ${EXTRA_LIBS} != ""
301CONFIGURE_ARGS+= --extra-libs=${EXTRA_LIBS:C/^ //:Q} 302CONFIGURE_ARGS+= --extra-libs=${EXTRA_LIBS:C/^ //:Q}
302.endif 303.endif
303 304
304.endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) 305.endif # defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*)