Sun Mar 16 21:22:45 2008 UTC ()
Add x264-devel include, seems to be needed after all.


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

--- pkgsrc/multimedia/mplayer-share/options.mk 2008/03/16 11:56:49 1.28
+++ pkgsrc/multimedia/mplayer-share/options.mk 2008/03/16 21:22:45 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.28 2008/03/16 11:56:49 wiz Exp $ 1# $NetBSD: options.mk,v 1.29 2008/03/16 21:22:45 wiz 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
@@ -264,26 +264,27 @@ CONFIGURE_ARGS+= --disable-theora @@ -264,26 +264,27 @@ CONFIGURE_ARGS+= --disable-theora
264.if empty(PKG_OPTIONS:Mvidix) 264.if empty(PKG_OPTIONS:Mvidix)
265CONFIGURE_ARGS+= --disable-vidix-internal 265CONFIGURE_ARGS+= --disable-vidix-internal
266CONFIGURE_ARGS+= --disable-vidix-external 266CONFIGURE_ARGS+= --disable-vidix-external
267.endif 267.endif
268 268
269.if !empty(PKG_OPTIONS:Mvorbis) 269.if !empty(PKG_OPTIONS:Mvorbis)
270CONFIGURE_ARGS+= --enable-libvorbis 270CONFIGURE_ARGS+= --enable-libvorbis
271.else 271.else
272CONFIGURE_ARGS+= --disable-libvorbis 272CONFIGURE_ARGS+= --disable-libvorbis
273.endif 273.endif
274 274
275.if !empty(PKG_OPTIONS:Mx264) 275.if !empty(PKG_OPTIONS:Mx264)
276CONFIGURE_ARGS+= --enable-x264 276CONFIGURE_ARGS+= --enable-x264
 277. include "../../multimedia/x264-devel/buildlink3.mk"
277.else 278.else
278CONFIGURE_ARGS+= --disable-x264 279CONFIGURE_ARGS+= --disable-x264
279.endif 280.endif
280 281
281.if !empty(PKG_OPTIONS:Mxvid) 282.if !empty(PKG_OPTIONS:Mxvid)
282CONFIGURE_ARGS+= --enable-xvid 283CONFIGURE_ARGS+= --enable-xvid
283EXTRA_LIBS+= -lxvidcore 284EXTRA_LIBS+= -lxvidcore
284. include "../../multimedia/xvidcore/buildlink3.mk" 285. include "../../multimedia/xvidcore/buildlink3.mk"
285.else 286.else
286CONFIGURE_ARGS+= --disable-xvid 287CONFIGURE_ARGS+= --disable-xvid
287.endif 288.endif
288 289
289.if !empty(PKG_OPTIONS:Mmplayer-ssse3) 290.if !empty(PKG_OPTIONS:Mmplayer-ssse3)