fix build with ffmpeg 0.8, bug #378001

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

diff --git a/media-video/qx11grab/ChangeLog b/media-video/qx11grab/ChangeLog
index 4daaa0dab2a752cc42f3b8a1ae3b6712938a970c..c7fdd24609d01267fb2700af84703db1e76cc3a8 100644 (file)
--- a/media-video/qx11grab/ChangeLog
+++ b/media-video/qx11grab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/qx11grab
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.8 2011/11/24 12:52:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/ChangeLog,v 1.9 2011/12/03 16:06:23 aballier Exp $
+
+  03 Dec 2011; Alexis Ballier <aballier@gentoo.org> qx11grab-0.2.2.ebuild,
+  +files/qx11grab-0.2.2-ffmpeg.patch:
+  fix build with ffmpeg 0.8, bug #378001
 
   24 Nov 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #290906

diff --git a/media-video/qx11grab/Manifest b/media-video/qx11grab/Manifest
index fe0fe2e82bab932245f7f38f555f412d806de92e..da06a64da5e095abda4e74928e5bde3ecd011d24 100644 (file)
--- a/media-video/qx11grab/Manifest
+++ b/media-video/qx11grab/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX qx11grab-0.2.1_rc4-as-needed.patch 764 RMD160 a8f7dca62866fcde97142ebf5c5deb2390f638ef SHA1 94378c1dcc527f1fa554bbc704211883fec915f1 SHA256 b9918d60d7497370141ebc7a02065c0bf6085b4fcb11bbb4788563f741718f46
+AUX qx11grab-0.2.2-ffmpeg.patch 1169 RMD160 72f45b698fc66a96bd2ba705a014406bbad5e2a2 SHA1 3d2c91c3515e6584e5146a5931ade4214b579f46 SHA256 1497b53aeed8607f99f403774615b76b340b42b124d1956a4251979ae4d2024d
 DIST qx11grab-0.2.1_rc4.tar.bz2 147299 RMD160 162dec4ea4a41033a9cc2a0b835202ef24cb8f44 SHA1 b14b6d3329a2578d466dbdb7b9c4e1ec243f4009 SHA256 06a4589fcb2c53496fe7b877cd91ebe70d658ed10e7bdbb1927a95d2f4747dc3
 DIST qx11grab-0.2.2.tar.bz2 153759 RMD160 69c295d8a9840f9dc84adf2695aa5b4a6fd9e0ac SHA1 531de1954c10041fa7dfb6011448b487041e65fe SHA256 b58659b8fba740e50a734d1de50bd643c04fa65337e2f14f78478acfea15dca4
 EBUILD qx11grab-0.2.1_rc4.ebuild 892 RMD160 4f040f355656eb1764c80db8fc44d26b81fc1c61 SHA1 76913b433471139b0fe1f6949c34ca7faea11c20 SHA256 dfc1ba350a1be19828b4ec2380b5839e8516bb529b47d7577c8aa36396a85844
-EBUILD qx11grab-0.2.2.ebuild 865 RMD160 9a1d50de4593387bb9384b4b14fb5d36cd0dda93 SHA1 502f741814aa36f9c1b62bec478cb2e5fc08320f SHA256 5e0d8f4a82ad5e88dc6e34286f125c2d5716c8cbfc1a70db9de6f425d37164ee
-MISC ChangeLog 1495 RMD160 caa3c1e6fd62f6e56e015caf32a5fb7d70270a19 SHA1 4d8a872c67feb8bd9b083811f9ea591b893d456b SHA256 73207c8b69ea77b8b0e0ac757154bf9715f95968bd02d6a5515b71952e3fa76c
+EBUILD qx11grab-0.2.2.ebuild 904 RMD160 c1bf5b8d98e2eaf2676a28485f216a3ff75b4508 SHA1 69872649989d3a1c28094114642a4bc3cc42d634 SHA256 0a2d1480d1cff792a6103d14678d2c3d93cccf2a65faac519a02fffcff6dd76b
+MISC ChangeLog 1653 RMD160 ab0739dbc2b14a188371d5405c993845ad7a62a4 SHA1 d47979285ecc27321a8d852dcae5ebb1ce1bc861 SHA256 ee965d66f899ae8086bf6d9cee771bbfa6cacb01f0b0c32254ab1e329405b82f
 MISC metadata.xml 206 RMD160 cf308c9bcfc7d65bbdc0d440db1ba1ff8444c397 SHA1 70f2489dffdfdacd3f17a429b4125e3f3beebdb7 SHA256 07a9435d849cc356574c9b0a46fd41b86c83258ab4dec70a6b3ce6840382566c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7OPhoACgkQCaWpQKGI+9S6YACfV/GkkWnj9/CUQWOn3cfnJc8W
-/jkAn1yC2spzvdQ9ZJKzqBzxWSeUvTzR
-=jYzb
+iEYEARECAAYFAk7aSQQACgkQvFcC4BYPU0oxlACcCAhfwJ3gKSKMJxXiulPmI9+T
+wigAmgKUu2bHnRPjflzH2lIMlx/NsnVJ
+=fCbv
 -----END PGP SIGNATURE-----

diff --git a/media-video/qx11grab/files/qx11grab-0.2.2-ffmpeg.patch b/media-video/qx11grab/files/qx11grab-0.2.2-ffmpeg.patch
new file mode 100644 (file)
index 0000000..9ed38c0
--- /dev/null
+++ b/media-video/qx11grab/files/qx11grab-0.2.2-ffmpeg.patch
@@ -0,0 +1,22 @@
+Index: qx11grab-0.2.2/src/tableeditor/tableeditor.cpp
+===================================================================
+--- qx11grab-0.2.2.orig/src/tableeditor/tableeditor.cpp
++++ qx11grab-0.2.2/src/tableeditor/tableeditor.cpp
+@@ -67,7 +67,7 @@ void TableEditor::findVideoCodecs()
+   AVCodec *codec;
+   for ( codec = av_codec_next ( 0 ); codec != NULL; codec = av_codec_next ( codec ) )
+   {
+-    if ( ( codec->type == CODEC_TYPE_VIDEO ) && ( codec->encode ) )
++    if ( ( codec->type == AVMEDIA_TYPE_VIDEO ) && ( codec->encode ) )
+     {
+       QString itemName = QString ( "%1 (%2)" ).arg ( codec->long_name, codec->name );
+       codecSelection->addItem ( itemName, QVariant ( codec->name ) );
+@@ -86,7 +86,7 @@ void TableEditor::findAudioCodecs()
+   AVCodec *codec;
+   for ( codec = av_codec_next ( 0 ); codec != NULL; codec = av_codec_next ( codec ) )
+   {
+-    if ( ( codec->type == CODEC_TYPE_AUDIO ) && ( codec->encode ) )
++    if ( ( codec->type == AVMEDIA_TYPE_AUDIO ) && ( codec->encode ) )
+     {
+       QString itemName = QString ( "%1 (%2)" ).arg ( codec->long_name, codec->name );
+       codecSelection->addItem ( itemName, QVariant ( codec->name ) );

diff --git a/media-video/qx11grab/qx11grab-0.2.2.ebuild b/media-video/qx11grab/qx11grab-0.2.2.ebuild
index 23298abcc709ee42df7850c964dd76f6338272b8..7ec757ef082fc0174e44e0946a73137296191d95 100644 (file)
--- a/media-video/qx11grab/qx11grab-0.2.2.ebuild
+++ b/media-video/qx11grab/qx11grab-0.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.2.2.ebuild,v 1.3 2011/04/03 19:04:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/qx11grab/qx11grab-0.2.2.ebuild,v 1.4 2011/12/03 16:06:23 aballier Exp $
 
 EAPI=2
 
@@ -33,4 +33,5 @@ src_prepare() {
                -e "s:share/qx11grab:share/doc/${PF}:" \
                -e '/COPYING/d' \
                CMakeLists.txt || die "sed failed"
+       epatch "${FILESDIR}/${P}-ffmpeg.patch"
 }