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

Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64

4 files changed, 55 insertions, 17 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/Manifest b/media-video/qx11grab/Manifest
index 67e08a93ebf7..29dd259e075d 100644
--- a/media-video/qx11grab/Manifest
+++ b/media-video/qx11grab/Manifest
@@ -5,26 +5,27 @@ AUX 0.4.1-detect-avconv-presets-dir.patch 867 RMD160 1e5cfd4e9611f7a3ebf991e819a
 AUX 0.4.1-fix-install-destination.patch 865 RMD160 74b58da2b342d1fd07609690a71b335b952dafb6 SHA1 0223a10599875d2fa05a2f2f467e3d7f659ba433 SHA256 61b912f5f3d84b360449f8c0b4f3dae16e28546d1dbb7886416a0c884b1e378a
 AUX 0.4.1-fix-typos-in-CMakeLists.patch 907 RMD160 9b9175cf1f6cdc30d792a7a618a7abe69132ea97 SHA1 13a7fdd719b506660750796e13c4140b831092a6 SHA256 1e425b839ac238524926afc49783314bea436a758033001206e2c80a5c929fa2
 AUX 0.4.1-optional-pulseaudio.patch 1276 RMD160 fd173c469cd72123dd584eaa32e36067f588baf0 SHA1 c1acc33d21a79e5d924dfb95b1965fadbcbb8213 SHA256 9cbdc0c0a337edae89ae87c9f281ce76f0090635e714313c95d997db8f7bad40
+AUX 0.4.3-fix-ffmpeg-filter-check.patch 1327 RMD160 49bfc73857dee36d0eb22ad3daa3f8668d221ad3 SHA1 28b92abea03be5ac8757dbcc5f7047275784a173 SHA256 ed7a5250c172306043b3e0d2c6c6b9d78bf7003248d9f72e63e4a6382934d758
 DIST qx11grab-0.4.1.tar.xz 337792 RMD160 59b8efacd25c5991e277aabc4c9cee85d5d62658 SHA1 bba5c503c9410261cfdebb428d9ad8eeb9535a16 SHA256 8873d7e9ebf434d13bf81f4f155801a774251f04199a2ff149ad3c36d7afc7d1
 DIST qx11grab-0.4.3.tar.xz 361016 RMD160 dc780a5262357f99b34a7f94f24670c042201971 SHA1 c1b256519f48cdbab58a431d662713316fa907e7 SHA256 39c556ac5a45521677345d0fc30ad821999dae623ff5fc535c1336b1adc199dd
 EBUILD qx11grab-0.4.1-r2.ebuild 1481 RMD160 ac9470be6a9c59bf4454afe9fb167ef59eb57cb5 SHA1 c7f18cc6e361f13ab0c2e7ccc3078320c84c78a2 SHA256 a39717ce451fee1006434e84c93b6f293cbbe8adfd0c9349f414ef91a38e5630
-EBUILD qx11grab-0.4.3.ebuild 1382 RMD160 ecc6ff701d11595447b689a8bf72b231cf896149 SHA1 4b77f5131a610c6e5093bff76bca327a7315132b SHA256 58cbe355d7211fbbf338243bcc6081753aebfeaced7bea3dd272119d56919a16
-MISC ChangeLog 4096 RMD160 12aa365dfc457eb1ab6a143e0e93eba96b60eb08 SHA1 5fae0abe23289874e5268ee94d6a08622db44ea8 SHA256 4bb7c1afe1b0bcbadb7781c6dc6d62e73d0b71af97ba20bc48b2b3346320ecaf
+EBUILD qx11grab-0.4.3.ebuild 1446 RMD160 6c874b53b165f72d9d0cf0ef83e005a3f3e26220 SHA1 7cfd0ae97ffc6fc4d341bbabc227efce6f8983a4 SHA256 99beb5b8bbad98a6bf5f514612800af1d28459cbf50d4a83ba534d057a3d7e29
+MISC ChangeLog 4310 RMD160 252e4811b7b28ecc93ec5188873a9e416a03629b SHA1 5eca7060f9b3b58f44a7aecb4030ba7951f7d0dd SHA256 ebdf5c3faf28a3f5be5406ea637ffcc79bddd892d5dd416b46e7975589c2674d
 MISC metadata.xml 155 RMD160 654eebe07944b4d18c58e4a54c50758eceead53e SHA1 967490b59f5185a6849cb5583390dd0d0b0dd512 SHA256 94ed5876ef16dbc191744ff6b8939a0f428fcb8add316d898880e1c4c880b9e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPk/mpAAoJENXLsxwXqFxy/88QAKRFHs2F1gylPSgFJpY9CN3g
-mFEGRwVSQMOuH/lP/2kjBtocMlAM9LaGdPDWA/7OO9iL7tD2nf794RL7oEnL2/JD
-ze9S6G6iCHgJSOboAYgRJSExlFOcsJv+on/CbkErFeMsIAQ7LevqhrfiL8kskI04
-1qrLPVI0S/l/J8QtXQ/a4qSdtm9phGriNGMex2eLXGYCiRmK8yoZdx5ZidIc3cXK
-x+Oj7QSGzW01MoiZSEIquWAvX6ChgNj/+Zp/LtnlxDnqyNTIG+hFXQHB0ACa/3b4
-NLM0SDJh6mX6UFgUkxG4fU1XzlIaR4ycbPARiZGagggcnCeAxlvVxVHroog6HofS
-FAVH7W89lehj/jC88jWRSFNd9sYbAR6KPqPIvUW6qwOPuaFxYGuDvOuXfk3qVpIw
-fQu2bImofwqWM/Uo94dWQIBG9xHukrmBcZwKIAZC6q0jTuMSRp03YrR+Ium59lad
-6pb7KpwPGHiJNJjdu4rX6/TRBdiRgBbyB9xoFMPQQK/oBHaiZqnrnWJ4tHDNPqLp
-8+2EtZrRGMB7/IqO1BLurzodY/KvZxJxBUveg929/wENuqBONCBzf/DtZKWpQ9D/
-0mkkl8ozLX0G5t7XR/PS0xjoJmWzrbGlybpevyIP5LzthSDoz2QzS+9dmmWPwavd
-fcCk48Fo1pzSeb2LCQuE
-=45Vk
+iQIcBAEBCgAGBQJPlCjXAAoJENXLsxwXqFxyNPsQALZ337AiyO5mVd2VfxpYbEk+
+h+hDiMKyiMFcFjIzW9ezdvYpBI5CJtJK6aecu2yiMnyUWgXJHm++K2hZidAlarJf
+ehx6ejBy/2iQVz1llmYQJw83I4gNgYRAnhgg8tQwDIuMc6K9MC5UNCBepmHpe35+
+HSrEzAENaYV5IBoHewQisVucilidZJZOZJCRGvGu051X4wMhawLTgV7ohwPR/Eqy
+ssM1vqCfvGudEmzT6N2YnRtegiyS5FGl2Aku8grd9t8DTc3bK8zBsNFhDlxsDnnb
+4YvefCJNzzdjo/eURk/l65y8NJC1HCsybuXcaKyZIAG0ktc7x2yrcpd106m6iVNT
++tcxE4hatJk2XCcE3guz70yF5G3abjRKqcb0ddLksiaHPVepYCp3NRvkKMn9hnlz
+9zUDQhOwRTKrkph7u6sQDm4hkBjNBsnSYwhjKdOJaxR3gdL79xUsk1hK+SAvRaUQ
+bgpx+IPCfYLtB6kXYyU5FVjqV6MvhvZIPnqt0XQBXtGQbg/Nm3yz+4XRq5bDiP8C
+4gtLH3QVCocIHdJBwRJpwBV80yhscgUCvoYPxZ5Z3ngYgcyNGiItk+j/30nBC99r
+vUTYDABv7k0AYTOAMswDsfNhfYL4ijet/ZRK8UZVLitCRIlI+haGTCuDlxNaVb2R
+3LYHbJ/aZsm8g66aa/mj
+=8ztM
 -----END PGP SIGNATURE-----
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