Fix building with >=x11-proto/xextproto-7.1.1 wrt #296561, thanks to Andrew Savchenko for patch.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

4 files changed, 26 insertions, 18 deletions

diff --git a/x11-misc/xvidcap/ChangeLog b/x11-misc/xvidcap/ChangeLog
index 07bcd009db14..484c17264697 100644
--- a/x11-misc/xvidcap/ChangeLog
+++ b/x11-misc/xvidcap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xvidcap
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.48 2009/03/11 22:43:18 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/ChangeLog,v 1.49 2010/02/02 18:45:37 ssuominen Exp $
+
+  02 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> xvidcap-1.1.7.ebuild,
+  +files/xvidcap-1.1.7-shmproto.patch:
+  Fix building with >=x11-proto/xextproto-7.1.1 wrt #296561, thanks to
+  Andrew Savchenko for patch.
 
   11 Mar 2009; Alexis Ballier <aballier@gentoo.org>
   +files/xvidcap-1.1.7-avutil.patch, xvidcap-1.1.7.ebuild:
diff --git a/x11-misc/xvidcap/Manifest b/x11-misc/xvidcap/Manifest
index 9700214150d5..cee00cd2bca6 100644
--- a/x11-misc/xvidcap/Manifest
+++ b/x11-misc/xvidcap/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX xvidcap-1.1.7-avutil.patch 634 RMD160 f550512be618431df655c12439ecf96eff5c458c SHA1 b8f1e7a31452b446ef8d1c2ef33e10b5e98011ab SHA256 5f143452c4f3c4c1ecba72707195caa8bf64ccfabf9d362b31b67021bc4ba0a7
 AUX xvidcap-1.1.7-ffmpeg-headers.patch 1657 RMD160 4e016f3c5dbdbad5885afa647b24bb612ea6896b SHA1 b10df1e4eef15d3311ddefa3b27d1c0311e29c10 SHA256 7536d5f166948aa5ffeb05b6f84ae732fa9978554fea7aa751d1826c046e220e
 AUX xvidcap-1.1.7-ffmpeg-trellis.patch 878 RMD160 c8ecffe12a8f9c7fd140250c2dd5371e09bba76a SHA1 0d1f7576b8098c2d20b95a62ec98563b9b8de0ec SHA256 e856b43cd95ee28a5101d9ed14bb05097e8c61f0eb4ce29307428eef1900bb0f
+AUX xvidcap-1.1.7-shmproto.patch 388 RMD160 dc676259150f06cea2945a178b7044815164cc95 SHA1 3c0fbfa79683900c943555162791d99336be5c0f SHA256 48ad3624dddc1bfb32a7b4f11d93347b9158c4af94816f132ba02d14ac21d782
 DIST xvidcap-1.1.7.tar.gz 4789924 RMD160 782f0f8b4693bb3e96fdf06de71b2f6832b246e0 SHA1 ccdf8ac85c76b202dbf46074df6b3844faf127d1 SHA256 154622801e8d5e91b834e7707e9e1cc65cf20d0161f6e0323bc3bf0efd85195d
-EBUILD xvidcap-1.1.7.ebuild 1605 RMD160 1e8705b45cefc6fa300e3148bf08670bd9c8a8ee SHA1 6c91fe36135f65ac6a927e386fa3eec98b3dce06 SHA256 b380866d4e350678eb26f754c6f4f5958a07f210206c3ef3dc0222664feb7356
-MISC ChangeLog 7817 RMD160 6af0efc6d918634da0ddf3a3cdf6dba46965c197 SHA1 e632192f61f5504e5a83b17d6b3af53116eac155 SHA256 a6dd7983e46d7df3183342ec42eb16b844a9b450b49759e744695c20adfae5bb
+EBUILD xvidcap-1.1.7.ebuild 1675 RMD160 16d250ec0f2f33af5f78f309b245822a91df4e4d SHA1 bd61a41e607ff4922f4d14c98498ad1b9bd46aa9 SHA256 c4a68f1f84be40264ae7d2817a533686b7dafbedd3fe7b4a23858e878b1935d8
+MISC ChangeLog 8035 RMD160 6249ef10221b9d62469702045d5b944e4c881b81 SHA1 898375bd2c6b6e7ad87e6f4afd5a3d3a9d6b2613 SHA256 884f8bcfb1911173ee0755530713d8d82618a29ea82944905b98d61754c49553
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAkm4PowACgkQvFcC4BYPU0rEWgCgwMuVfKXwbFammUm49Q7Fpawm
-wKUAoKVAQcc7vjOl8a6HiKkSWIwyQYi9
-=fF4y
------END PGP SIGNATURE-----
diff --git a/x11-misc/xvidcap/files/xvidcap-1.1.7-shmproto.patch b/x11-misc/xvidcap/files/xvidcap-1.1.7-shmproto.patch
new file mode 100644
index 000000000000..b65da0ee7ce1
--- /dev/null
+++ b/x11-misc/xvidcap/files/xvidcap-1.1.7-shmproto.patch
@@ -0,0 +1,11 @@
+--- xvidcap-1.1.7/src/capture.c.orig	2008-05-26 02:01:53.000000000 +0400
++++ xvidcap-1.1.7/src/capture.c	2009-12-12 00:12:31.368260518 +0300
+@@ -65,7 +65,7 @@
+ #include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <X11/extensions/XShm.h>
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #ifndef SOLARIS
+ #include <X11/extensions/extutil.h>
+ #endif     // SOLARIS
diff --git a/x11-misc/xvidcap/xvidcap-1.1.7.ebuild b/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
index 7bd77f3089e4..18a45039bad2 100644
--- a/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
+++ b/x11-misc/xvidcap/xvidcap-1.1.7.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7.ebuild,v 1.2 2009/03/11 22:43:18 aballier Exp $
-
-GCONF_DEBUG="no"
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xvidcap/xvidcap-1.1.7.ebuild,v 1.3 2010/02/02 18:45:37 ssuominen Exp $
 
+GCONF_DEBUG=no
 inherit eutils autotools gnome2
 
 MY_P=${P/_rc/rc}
@@ -22,6 +21,7 @@ RDEPEND=">=x11-libs/gtk+-2.6
 	mp3? ( media-sound/lame )
 	theora? ( media-libs/libtheora )"
 DEPEND="${RDEPEND}
+	>=x11-proto/xextproto-7.1.1 
 	dev-util/pkgconfig
 	dev-util/intltool
 	virtual/libintl
@@ -32,6 +32,7 @@ DEPEND="${RDEPEND}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-shmproto.patch
 	epatch "${FILESDIR}"/${P}-ffmpeg-headers.patch
 	# bug 242680
 	epatch "${FILESDIR}"/${P}-ffmpeg-trellis.patch