kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add "libvpx" option, enabled per default (supposedly harmless license),

Browse source 
bump PKGREV
This commit is contained in:
drochner 2011-01-24 19:07:16 +00:00
parent 38053fe3ab
commit 3725d0eb4b
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
multimedia/ffmpeg/Makefile
View file

@ -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/

6
multimedia/ffmpeg/buildlink3.mk
View file

@ -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

13
multimedia/ffmpeg/options.mk
View file

@ -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