diff options
| author | drochner <drochner@pkgsrc.org> | 2010-05-08 16:04:05 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-05-08 16:04:05 +0000 |
| commit | 2cc59760b07fa0076691eeb3774bf4ff0dc37711 (patch) | |
| tree | 355b1888f8507b4fa9ed4be2d86eaa431dcecc56 /multimedia | |
| parent | d50b0912ac38032c58a89119361685e6b6e7fd54 (diff) | |
| download | pkgsrc-2cc59760b07fa0076691eeb3774bf4ff0dc37711.tar.gz | |
-enable xvid and mpeg2 support explicitely, seems that these are
not enebled per depault anymore upstream (this doesn't add
dependencies, so it doesn't hurt)
from Helge Muehlmeier per PR pkg/43267
-make faac support optional (off per default) because the needed
library cannot be freely redistributed for patent reasons
bump PKGREVISION
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/transcode/Makefile | 8 | ||||
| -rw-r--r-- | multimedia/transcode/options.mk | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 99fdb5e4c1f..e5389665235 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2010/01/18 09:59:18 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2010/05/08 16:04:05 drochner Exp $ DISTNAME= transcode-1.1.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= http://download.berlios.de/tcforge/ EXTRACT_SUFX= .tar.bz2 @@ -22,6 +22,9 @@ CONFIGURE_ARGS+= --enable-oss CONFIGURE_ARGS+= --enable-ogg CONFIGURE_ARGS+= --enable-theora CONFIGURE_ARGS+= --enable-vorbis +CONFIGURE_ARGS+= --enable-libmpeg2 +CONFIGURE_ARGS+= --enable-libmpeg2convert +CONFIGURE_ARGS+= --enable-xvid CONFIGURE_ARGS+= --with-libavcodec-prefix=${BUILDLINK_PREFIX.ffmpeg} CONFIGURE_ENV+= PATH_TO_AWK=${AWK:Q} @@ -39,7 +42,6 @@ PLIST_VARS+= i386 .include "options.mk" -.include "../../audio/faac/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/multimedia/transcode/options.mk b/multimedia/transcode/options.mk index dee31de8f36..cbfc5ecde7e 100644 --- a/multimedia/transcode/options.mk +++ b/multimedia/transcode/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.7 2009/11/15 18:09:35 drochner Exp $ +# $NetBSD: options.mk,v 1.8 2010/05/08 16:04:05 drochner Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.transcode PKG_SUPPORTED_OPTIONS= a52 freetype2 mjpegtools lzo libxml2 -PKG_SUPPORTED_OPTIONS+= dv imagemagick x264 +PKG_SUPPORTED_OPTIONS+= dv imagemagick x264 faac PKG_SUGGESTED_OPTIONS= a52 freetype2 mjpegtools libxml2 PKG_SUGGESTED_OPTIONS+= imagemagick x264 @@ -78,3 +78,10 @@ CONFIGURE_ARGS+= --enable-x264 CONFIGURE_ARGS+= CONFIGURE_ARGS+= --disable-x264 .endif + +.if !empty(PKG_OPTIONS:Mfaac) +. include "../../audio/faac/buildlink3.mk" +CONFIGURE_ARGS+= --enable-faac +.else +CONFIGURE_ARGS+= --disable-faac +.endif |