Fix bug 412213 and add a workaround for an additional issue with ffmpeg filters checking.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

3 files changed, 39 insertions, 2 deletions

diff --git a/media-video/qx11grab/ChangeLog b/media-video/qx11grab/ChangeLog
index 7d7b0506a2ae..bca19e2f655f 100644
--- a/media-video/qx11grab/ChangeLog
+++ b/media-video/qx11grab/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/qx11grab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.23 2012/04/22 12:29:16 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.24 2012/04/22 15:50:33 pesa Exp $
+
+  22 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/0.4.3-fix-ffmpeg-filter-check.patch, qx11grab-0.4.3.ebuild:
+  Fix bug 412213 and add a workaround for an additional issue with ffmpeg
+  filters checking.
 
   22 Apr 2012; Davide Pesavento <pesa@gentoo.org>
   -files/qx11grab-0.2.1_rc4-as-needed.patch, -qx11grab-0.2.1_rc4.ebuild,
diff --git a/media-video/qx11grab/files/0.4.3-fix-ffmpeg-filter-check.patch b/media-video/qx11grab/files/0.4.3-fix-ffmpeg-filter-check.patch
new file mode 100644
index 000000000000..73f4cd191b5b
--- /dev/null
+++ b/media-video/qx11grab/files/0.4.3-fix-ffmpeg-filter-check.patch
@@ -0,0 +1,28 @@
+diff -urN qx11grab-0.4.3.orig/modules/FindFFmpeg.cmake qx11grab-0.4.3/modules/FindFFmpeg.cmake
+--- qx11grab-0.4.3.orig/modules/FindFFmpeg.cmake	2012-04-22 17:37:13.146507207 +0200
++++ qx11grab-0.4.3/modules/FindFFmpeg.cmake	2012-04-22 17:37:47.640075978 +0200
+@@ -156,9 +156,9 @@
+ 
+ MACRO (FFMPEG_FILTER_EXISTS FILTER VARIABLE)
+   TRY_RUN (filter_arg _filter_supported
+-    ${CMAKE_BINARY_DIR}
+-    ${CMAKE_MODULE_PATH}/check_ffmpeg_filter.c
+-    COMPILE_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}
++    ${CMAKE_BINARY_DIR}/CMakeTmp
++    ${CMAKE_SOURCE_DIR}/modules/check_ffmpeg_filter.c
++    COMPILE_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -std=gnu89"
+     CMAKE_FLAGS
+       "-DINCLUDE_DIRECTORIES:STRING=${FFMPEG_INCLUDEDIR}"
+       "-DLINK_LIBRARIES:STRING=${FFMPEG_AVUTIL_LIBRARY};${FFMPEG_AVFILTER_LIBRARY}"
+diff -urN qx11grab-0.4.3.orig/modules/check_ffmpeg_filter.c qx11grab-0.4.3/modules/check_ffmpeg_filter.c
+--- qx11grab-0.4.3.orig/modules/check_ffmpeg_filter.c	2012-04-22 17:37:13.147507195 +0200
++++ qx11grab-0.4.3/modules/check_ffmpeg_filter.c	2012-04-22 17:37:18.619438786 +0200
+@@ -27,7 +27,7 @@
+ 
+ int main(int argc, char **argv)
+ {
+-  if( ( argc < 1 ) || strlen(argv[1]) < 3 )
++  if( ( argc < 2 ) || strlen(argv[1]) < 3 )
+   {
+     fprintf ( stderr, "Missing Filter arguments\n" );
+     return EXIT_FAILURE;
diff --git a/media-video/qx11grab/qx11grab-0.4.3.ebuild b/media-video/qx11grab/qx11grab-0.4.3.ebuild
index 501584e683f8..f214ee6ac9fd 100644
--- a/media-video/qx11grab/qx11grab-0.4.3.ebuild
+++ b/media-video/qx11grab/qx11grab-0.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.3.ebuild,v 1.2 2012/04/17 12:57:07 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.4.3.ebuild,v 1.3 2012/04/22 15:50:33 pesa Exp $
 
 EAPI=4
 
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
 "
 PDEPEND="virtual/freedesktop-icon-theme"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-fix-ffmpeg-filter-check.patch"
+)
+
 src_prepare() {
 	base_src_prepare