diff options
| author | drochner <drochner@pkgsrc.org> | 2011-01-24 19:07:16 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-01-24 19:07:16 +0000 |
| commit | 0bb0b53a1935accb6adf3ada4ee261257bb9a5cc (patch) | |
| tree | 152b3bfac347eb61a1c781bf552bdffdb957453a /multimedia/ffmpeg | |
| parent | 5a701e728240a08bcc85e3c61ebf69026d323f43 (diff) | |
| download | pkgsrc-0bb0b53a1935accb6adf3ada4ee261257bb9a5cc.tar.gz | |
add "libvpx" option, enabled per default (supposedly harmless license),
bump PKGREV
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/ffmpeg/buildlink3.mk | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg/options.mk | 13 |
3 files changed, 17 insertions, 5 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index b0f3fdf05e7..9bc9287b8d8 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.64 2011/01/17 22:14:02 tron Exp $ +# $NetBSD: Makefile,v 1.65 2011/01/24 19:07:16 drochner Exp $ # XXX This is release 0.6.1 but we had date-based pkgnames before. PKGNAME= ffmpeg-20101018.0.6.1 +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ffmpeg.mplayerhq.hu/ diff --git a/multimedia/ffmpeg/buildlink3.mk b/multimedia/ffmpeg/buildlink3.mk index 7ee83928557..e1ff23eee49 100644 --- a/multimedia/ffmpeg/buildlink3.mk +++ b/multimedia/ffmpeg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2011/01/17 16:51:05 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2011/01/24 19:07:16 drochner Exp $ BUILDLINK_TREE+= ffmpeg @@ -34,6 +34,10 @@ pkgbase := ffmpeg . include "../../audio/faac/buildlink3.mk" .endif +.if !empty(PKG_BUILD_OPTIONS.ffmpeg:Mlibvpx) +. include "../../multimedia/libvpx/buildlink3.mk" +.endif + .include "../../devel/libgetopt/buildlink3.mk" .endif # FFMPEG_BUILDLINK3_MK diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk index 68b03a8183f..f375273b3dc 100644 --- a/multimedia/ffmpeg/options.mk +++ b/multimedia/ffmpeg/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.18 2011/01/17 16:51:05 drochner Exp $ +# $NetBSD: options.mk,v 1.19 2011/01/24 19:07:16 drochner Exp $ # Global and legacy options PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg -PKG_SUPPORTED_OPTIONS= theora xvid faad faac x264 opencore-amr -PKG_SUGGESTED_OPTIONS= theora xvid x264 +PKG_SUPPORTED_OPTIONS= theora xvid faad faac x264 opencore-amr libvpx +PKG_SUGGESTED_OPTIONS= theora xvid x264 libvpx #PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder #PKG_OPTIONS_GROUP.aac-decoder= faad faac @@ -93,3 +93,10 @@ CONFIGURE_ARGS+= --enable-libx264 .else CONFIGURE_ARGS+= --disable-vdpau .endif + +.if !empty(PKG_OPTIONS:Mlibvpx) +CONFIGURE_ARGS+= --enable-libvpx +.include "../../multimedia/libvpx/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-libvpx +.endif |