diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-05-19 08:34:04 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-05-19 08:34:04 +0000 |
| commit | 916cdd9d372c0d404b3aaa850964b43e38a915e2 (patch) | |
| tree | 57f2f1b81e1086c0ff778feee2f5cf11577d14fd /multimedia | |
| parent | 74e2f74a161aa376446a3ba300f301cb9143dead (diff) | |
| download | ports-916cdd9d372c0d404b3aaa850964b43e38a915e2.tar.gz ports-916cdd9d372c0d404b3aaa850964b43e38a915e2.zip | |
Notes
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 9 | ||||
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index c10cec7ef14d..11371c4616fb 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= ffmpeg DISTVERSION= 2012-04-25 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mm/ffmpeg @@ -66,6 +66,7 @@ OPTIONS= AACPLUS "Enable aac via libaacplus" off \ VO_AMRWBENC "AMR Wide Band audio encoder (vo-amrwbenc)" off \ VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \ VP8 "VP8 codec via libvpx" on \ + X11GRAB "Enable x11grabbing" off \ X264 "H.264 encoder" on \ XVID "Xvid encoder via xvidcore" on @@ -101,6 +102,11 @@ USE_OPENSSL= yes FFMPEG_NONFREE= yes .endif +.if defined(WITH_X11GRAB) +USE_XORG= x11 xext xfixes +CONFIGURE_ARGS+= --enable-x11grab +.endif + .include <bsd.port.pre.mk> CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin @@ -113,7 +119,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ - --enable-x11grab \ --enable-memalign-hack \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index cbe81246d3b4..2f53ee189efd 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -6,7 +6,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.12 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -52,6 +52,7 @@ OPTIONS= AACPLUS "Enable aac via libaacplus" off \ VO_AMRWBENC "AMR Wide Band audio encoder (vo-amrwbenc)" off \ VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \ VP8 "VP8 codec via libvpx" on \ + X11GRAB "Enable x11 grabbing" off \ X264 "H.264 encoder" on \ XVID "Xvid encoder via xvidcore" on @@ -82,6 +83,13 @@ COMPAT_HEADERS=libavcodec/avcodec.h \ libpostproc/postprocess.h \ libswscale/swscale.h +.include <bsd.port.options.mk> + +.if defined(WITH_X11GRAB) +USE_XORG= x11 xext xfixes +CONFIGURE_ARGS+= --enable-x11grab +.endif + .include <bsd.port.pre.mk> CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin @@ -94,7 +102,6 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ - --enable-x11grab \ --enable-memalign-hack \ --enable-runtime-cpudetect \ --cc="${CC}" \ |