add 'x11' option (enables x11grab format)

This commit is contained in:
Sergey Svishchev 2013-05-10 16:51:09 +00:00 committed by Thomas Klausner
parent 1d752ffd45
commit 380fa4eb3d
3 changed files with 16 additions and 7 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/05/04 10:39:12 shattered Exp $
# $NetBSD: Makefile,v 1.2 2013/05/10 16:51:09 shattered Exp $
DISTNAME= ffmpeg-${PKGREVISION}
MAINTAINER= pkgsrc-users@NetBSD.org
@ -7,7 +7,7 @@ COMMENT= Decoding, encoding and streaming software
GIT_REPOSITORIES= master
GIT_REPO.master= git://source.ffmpeg.org/ffmpeg.git
# GIT_MODULE.master= emacs
GIT_MODULE.master= ffmpeg
# _GIT_FLAGS?= --depth 1
WRKSRC= ${WRKDIR}/ffmpeg

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2013/05/04 10:39:12 shattered Exp $
@comment $NetBSD: PLIST,v 1.2 2013/05/10 16:51:09 shattered Exp $
bin/ffmpeg
bin/ffprobe
bin/ffserver
@ -97,7 +97,7 @@ lib/libavformat.so.55.4.101
lib/libavutil.a
lib/libavutil.so
lib/libavutil.so.52
lib/libavutil.so.52.28.100
lib/libavutil.so.52.30.100
lib/libpostproc.a
lib/libpostproc.so
lib/libpostproc.so.52
@ -109,7 +109,7 @@ lib/libswresample.so.0.17.102
lib/libswscale.a
lib/libswscale.so
lib/libswscale.so.2
lib/libswscale.so.2.2.100
lib/libswscale.so.2.3.100
lib/pkgconfig/libavcodec.pc
lib/pkgconfig/libavdevice.pc
lib/pkgconfig/libavfilter.pc

View file

@ -1,10 +1,10 @@
# $NetBSD: options.mk,v 1.1 2013/05/04 10:39:12 shattered Exp $
# $NetBSD: options.mk,v 1.2 2013/05/10 16:51:09 shattered Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg
PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
opencore-amr
opencore-amr x11
PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
#PKG_OPTIONS_OPTIONAL_GROUPS= aac-decoder
#PKG_OPTIONS_GROUP.aac-decoder= faac
@ -146,3 +146,12 @@ CONFIGURE_ARGS+= --enable-libvpx
.else
CONFIGURE_ARGS+= --disable-libvpx
.endif
.if !empty(PKG_OPTIONS:Mx11)
CONFIGURE_ARGS+= --enable-x11grab
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libXfixes/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-x11grab
.endif