Fix building with linux-headers >= 2.6.38 wrt #359599.

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

4 files changed, 39 insertions, 19 deletions

diff --git a/media-video/camorama/ChangeLog b/media-video/camorama/ChangeLog
index 0bdb735dd0ac..a806a6e285fb 100644
--- a/media-video/camorama/ChangeLog
+++ b/media-video/camorama/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/camorama
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.20 2010/04/08 16:29:48 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/ChangeLog,v 1.21 2011/03/20 10:25:16 ssuominen Exp $
+
+  20 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> camorama-0.19-r2.ebuild,
+  +files/camorama-0.19-no-more-videodev_h.patch:
+  Fix building with linux-headers >= 2.6.38 wrt #359599.
 
 *camorama-0.19-r2 (08 Apr 2010)
 
diff --git a/media-video/camorama/Manifest b/media-video/camorama/Manifest
index a705e03744ac..d8f8424b1d48 100644
--- a/media-video/camorama/Manifest
+++ b/media-video/camorama/Manifest
@@ -1,8 +1,9 @@
 AUX camorama-0.19-fixes.patch 3930 RMD160 306b7cb8c413fea5fac55d7e8c264ca81b8b7141 SHA1 b2ef5b11c6b7e9e183b20c19841937212f5775ed SHA256 ac9fa437d928e77b299e8a2b24b28ce5b0d91a619a9bc2bbfebdd32c7edf3839
 AUX camorama-0.19-gconf.patch 1541 RMD160 51f36bfbd32b8830ac0b775112fec439f95a9861 SHA1 de4123c27f47f8c3cc1899514fa52782cccec84e SHA256 4ac3b70bf976ce8b03b71a4ef3d7984a8a9da7058b7a3f189eb7149bf2f12185
 AUX camorama-0.19-libv4l.patch 7007 RMD160 6f8f833ed87ccb7df6f43b8c007222a1f11748ed SHA1 072138ecbaacb4c3f9f23d0d331872396a3b5629 SHA256 921c4428edcac808e3d5d8b383cf8b9878026c0aecd7594a5efc4563179edba3
+AUX camorama-0.19-no-more-videodev_h.patch 369 RMD160 da0e083ca55722e8376eaa33fe9c7f635740a441 SHA1 860da76bf60f5784357342edd4ded0e3050ed6e4 SHA256 5f34a9601f1199a9c2c20fb5d50c0d0eba4bbab7b264a5d5ac953ec29e21ab96
 DIST camorama-0.19.tar.bz2 277169 RMD160 c8a491dd2c75b2e4b98b115a628af0008f5c4804 SHA1 ce04cd2d4abe265b19a365a515f225111dcfb969 SHA256 948c24f96c77f550881102c2c6ca818ba00ffb7a48216ae21ae75eb55d351970
 EBUILD camorama-0.19-r1.ebuild 838 RMD160 def3c0a7b34a99416cc362a8d56cface09c8e18d SHA1 ea70332c90b19b8716022b8d5664d22b011bd849 SHA256 99ceab80805b46711f0fcd27ce1a350457ef7429ae4fe3352d3c3446e8091cd0
-EBUILD camorama-0.19-r2.ebuild 899 RMD160 74968ce6bed9c7323889032dc3eadd001be66fe0 SHA1 a86319626d84c04c14aec76f23dbd846d749ebb4 SHA256 e0710991df768f280ca2535c4bd168882011a3d687b0083e59a0eea73f5ca97c
-MISC ChangeLog 2889 RMD160 e7ef22164f85af717f3b953f234f057d8a97b5b8 SHA1 a81688525f59f4694888c7fef090dab936f2aedd SHA256 92b149ec9d8419ecf7b622b7cbaa46673f9fef0e6ed1721248dc40488f3176cc
+EBUILD camorama-0.19-r2.ebuild 951 RMD160 b9e4b510fd1323781e46a5e903abb5cfe5160593 SHA1 ef60a5116c8b2514b1fb0f2e5ca51d18cd5b2c4e SHA256 a525eb2995d9ab7a16797fefc83f765339a4bb26fdead23c90ac4f240b85bf07
+MISC ChangeLog 3075 RMD160 ffba7564d92e4e38287fb7b5dcf76b840c26d873 SHA1 ae464394df2a5ee794a6044d0e90ff3a0dce8ec7 SHA256 d15c66b1c9183d0df1901e0294ae6be1d9d25772d0f0d15838f81258c2a08ee0
 MISC metadata.xml 224 RMD160 a894a47c3ba494f6e918fe6ebc70da6877385457 SHA1 d53ccf04d9b49b1152b19604732fa1c842a70cb6 SHA256 888efa552a0159d0de6ea80ae3d38ab453c12fcc62a0ede08e26ddc35fc1ed2d
diff --git a/media-video/camorama/camorama-0.19-r2.ebuild b/media-video/camorama/camorama-0.19-r2.ebuild
index 3ee64e247d26..6491dfbeaacd 100644
--- a/media-video/camorama/camorama-0.19-r2.ebuild
+++ b/media-video/camorama/camorama-0.19-r2.ebuild
@@ -1,39 +1,40 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r2.ebuild,v 1.1 2010/04/08 16:29:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/camorama/camorama-0.19-r2.ebuild,v 1.2 2011/03/20 10:25:16 ssuominen Exp $
 
 EAPI=2
 inherit eutils gnome2
 
-DESCRIPTION="a webcam application featuring various image filters."
-HOMEPAGE="http://camorama.fixedgear.org"
+DESCRIPTION="A webcam application featuring various image filters"
+HOMEPAGE="http://git.gnome.org/browse/camorama/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
+RDEPEND=">=gnome-base/gconf-2
 	>=gnome-base/libglade-2
-	media-libs/libv4l"
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	media-libs/libv4l
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
+	dev-util/intltool
 	dev-util/pkgconfig
-	dev-util/intltool"
-
-SCROLLKEEPER_UPDATE="0"
+	sys-devel/gettext"
 
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-schemas-install"
+	SCROLLKEEPER_UPDATE="0"
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gconf.patch \
+	epatch \
+		"${FILESDIR}"/${P}-gconf.patch \
 		"${FILESDIR}"/${P}-fixes.patch \
-		"${FILESDIR}"/${P}-libv4l.patch
+		"${FILESDIR}"/${P}-libv4l.patch \
+		"${FILESDIR}"/${P}-no-more-videodev_h.patch
 
 	gnome2_src_prepare
 }
diff --git a/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch b/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
new file mode 100644
index 000000000000..84c8f68ba72b
--- /dev/null
+++ b/media-video/camorama/files/camorama-0.19-no-more-videodev_h.patch
@@ -0,0 +1,14 @@
+http://pkgs.fedoraproject.org/gitweb/?p=camorama.git;a=blob_plain;f=camorama-0.19-no-more-videodev_h.patch;hb=HEAD
+
+--- src/v4l.h
++++ src/v4l.h
+@@ -12,8 +12,7 @@
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <gtk/gtk.h>
+-#include <linux/types.h>
+-#include <linux/videodev.h>
++#include <libv4l1.h>
+ #include <signal.h>
+ #include <png.h>
+ #include <glade/glade.h>