From 380fa4eb3d36ef0585f1410aee68a83ffa6bb1b1 Mon Sep 17 00:00:00 2001
From: Sergey Svishchev <shattered@NetBSD.org>
Date: Fri, 10 May 2013 16:51:09 +0000
Subject: [PATCH] add 'x11' option (enables x11grab format)

---
 ffmpeg-current/Makefile   |  4 ++--
 ffmpeg-current/PLIST      |  6 +++---
 ffmpeg-current/options.mk | 13 +++++++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/ffmpeg-current/Makefile b/ffmpeg-current/Makefile
index d7500791bf..cca84ef74a 100644
--- a/ffmpeg-current/Makefile
+++ b/ffmpeg-current/Makefile
@@ -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
 
diff --git a/ffmpeg-current/PLIST b/ffmpeg-current/PLIST
index e5f8b40dab..cfea3e0660 100644
--- a/ffmpeg-current/PLIST
+++ b/ffmpeg-current/PLIST
@@ -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
diff --git a/ffmpeg-current/options.mk b/ffmpeg-current/options.mk
index 93db425fe0..ab6c7552f1 100644
--- a/ffmpeg-current/options.mk
+++ b/ffmpeg-current/options.mk
@@ -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