Added an upstream patch to allow pwc-driven webcams to work again in Kopete. First part of fixing bug 187400.

Package-Manager: portage-2.1.3.3

5 files changed, 184 insertions, 8 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index c9618ce903a6..e1cac427a673 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.121 2007/08/10 14:42:39 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.122 2007/08/11 12:10:15 philantrop Exp $
+
+*kopete-3.5.7-r1 (11 Aug 2007)
+
+  11 Aug 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/kopete-3.5.7-videodevice.patch, +kopete-3.5.7-r1.ebuild:
+  Added an upstream patch to allow pwc-driven webcams to work again in Kopete.
+  Fixes bug 187400.
 
   10 Aug 2007; Christoph Mende <angelos@gentoo.org> kopete-3.5.7.ebuild:
   Stable on amd64 wrt bug #176297
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 533825499ae8..ed07440b236e 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -33,6 +33,10 @@ AUX kopete-3.5.6-utf8-fix.diff 1532 RMD160 7eabbddef392307c6e24e3e2e432f7502408b
 MD5 b990943453ed7b0a7225a008db14b9ac files/kopete-3.5.6-utf8-fix.diff 1532
 RMD160 7eabbddef392307c6e24e3e2e432f7502408bb79 files/kopete-3.5.6-utf8-fix.diff 1532
 SHA256 f143d51b6296f66c9d490aaa2de76dfdf8226380f4b4a2bb99a5032c39672727 files/kopete-3.5.6-utf8-fix.diff 1532
+AUX kopete-3.5.7-videodevice.patch 1288 RMD160 8ace50fd07d020985e89e217a2efe1ff7823eeaf SHA1 cd559add41285b21c67eebfbca4e47f4e3933ff0 SHA256 7a74fc97395e15318dda6b1660e54d0f80f914b941d52d3650a479e2d0688f3f
+MD5 419487dbf180926fbb9b5331670c71aa files/kopete-3.5.7-videodevice.patch 1288
+RMD160 8ace50fd07d020985e89e217a2efe1ff7823eeaf files/kopete-3.5.7-videodevice.patch 1288
+SHA256 7a74fc97395e15318dda6b1660e54d0f80f914b941d52d3650a479e2d0688f3f files/kopete-3.5.7-videodevice.patch 1288
 DIST kdenetwork-3.5-patchset-01.tar.bz2 2986 RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf SHA1 cacc9ad8137e5c9e44bda1faa05e26cf2450f4e6 SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b
 DIST kdenetwork-3.5.5.tar.bz2 9235564 RMD160 3e757d10ee5bf24b2ccf131e693fb614b9fdb9f4 SHA1 a95bac9de9770f551870fb73ce456d779ba36878 SHA256 c3f36e69bbd23902f2bdd9a1a8cda93b0436338ada422bb8ac6bc3d2bcd8e38f
 DIST kdenetwork-3.5.6.tar.bz2 9245468 RMD160 2f93badae14fab4d7911c74d2f427e85ca104827 SHA1 494c67139415e3b18a1d5d054d872e90b8289832 SHA256 786e6c25d5cba4ed1eeac947c5554d7fe57de593abf6551c58c178043b82475e
@@ -53,14 +57,18 @@ EBUILD kopete-3.5.6.ebuild 4011 RMD160 e2fcdd7320ccdb9e61d5299452eda787b17a37e9
 MD5 b0d48d6a9d62d7d5932debb8ece821ae kopete-3.5.6.ebuild 4011
 RMD160 e2fcdd7320ccdb9e61d5299452eda787b17a37e9 kopete-3.5.6.ebuild 4011
 SHA256 4beca63dfce6656996698fdaedb0146272d31255abb8cf21657e4e9f14682006 kopete-3.5.6.ebuild 4011
+EBUILD kopete-3.5.7-r1.ebuild 4138 RMD160 fab61ab344224fb7213cf55fd2ee0b139a60c0dc SHA1 1e6e764b172243f319aa44ca6716ea7b128c4d38 SHA256 cac6242c1508215c81e71c84ccc3fa64fe08a9e4deb53d812cdd22e400a55035
+MD5 ffd15e6916bbdd53c2778535501e9567 kopete-3.5.7-r1.ebuild 4138
+RMD160 fab61ab344224fb7213cf55fd2ee0b139a60c0dc kopete-3.5.7-r1.ebuild 4138
+SHA256 cac6242c1508215c81e71c84ccc3fa64fe08a9e4deb53d812cdd22e400a55035 kopete-3.5.7-r1.ebuild 4138
 EBUILD kopete-3.5.7.ebuild 4025 RMD160 63b29ce6cf1ad7da3e400eb5141c1274918309f1 SHA1 dc519a6214132745a343b23db5d43ffaaa3c1b4e SHA256 8a3d98c2988037f59765879b49e4ee6d09c219b11d934814f317fc6af38f7a48
 MD5 24553c448f9616bc13e94db3922eb526 kopete-3.5.7.ebuild 4025
 RMD160 63b29ce6cf1ad7da3e400eb5141c1274918309f1 kopete-3.5.7.ebuild 4025
 SHA256 8a3d98c2988037f59765879b49e4ee6d09c219b11d934814f317fc6af38f7a48 kopete-3.5.7.ebuild 4025
-MISC ChangeLog 17687 RMD160 a60561539f60d2ddc39f81fd4bd358ab021160b6 SHA1 40bfd06a40ee48fac2ab5cbb359a961235dfe33e SHA256 54a4997642449e985645d78bfa4ac4d991119b4cf9fa7583e0a1561de16b4f9a
-MD5 c6fd5a7bee972f6c1d72b8058698399d ChangeLog 17687
-RMD160 a60561539f60d2ddc39f81fd4bd358ab021160b6 ChangeLog 17687
-SHA256 54a4997642449e985645d78bfa4ac4d991119b4cf9fa7583e0a1561de16b4f9a ChangeLog 17687
+MISC ChangeLog 17943 RMD160 c044af9ab95dde747b28a287cf7ed266af178faf SHA1 3ec8e6d54394d9fe5cac17aa4b4921785ff71742 SHA256 06beb87c6e777b2cc9fde08f4918f549c445118ba3eec5e359e35122da6c6ac3
+MD5 1f66e730c4de97119286536c7139dcad ChangeLog 17943
+RMD160 c044af9ab95dde747b28a287cf7ed266af178faf ChangeLog 17943
+SHA256 06beb87c6e777b2cc9fde08f4918f549c445118ba3eec5e359e35122da6c6ac3 ChangeLog 17943
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -80,10 +88,13 @@ SHA256 ecaf8d329908f4d5793e6d91319908764cafce446759c0f51fe509f877cd8219 files/di
 MD5 f435a29213024913dd173e76822408e0 files/digest-kopete-3.5.7 533
 RMD160 eb1a8bff3d55a0e56642da2e55d5de1dea318fbb files/digest-kopete-3.5.7 533
 SHA256 a8b6c61efc9d4e1936c662475233e93b2b58951ede88b2e620c2598b519455c0 files/digest-kopete-3.5.7 533
+MD5 f435a29213024913dd173e76822408e0 files/digest-kopete-3.5.7-r1 533
+RMD160 eb1a8bff3d55a0e56642da2e55d5de1dea318fbb files/digest-kopete-3.5.7-r1 533
+SHA256 a8b6c61efc9d4e1936c662475233e93b2b58951ede88b2e620c2598b519455c0 files/digest-kopete-3.5.7-r1 533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGvHllKhnDs22gwa8RAsmfAKDtJH0C2pla5g3Z8e5KtDWeZMW3bgCgpdsl
-bhHfhx3+IkeK6d/5M74C2zU=
-=cK6p
+iD8DBQFGvacuCkvF58q80IkRAgPYAJ4szbqT7glw6uY6elJqtRlh43DLfQCcCOBU
+lWgKM69TNOUCVG2FZqndrJQ=
+=TAFR
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/digest-kopete-3.5.7-r1 b/kde-base/kopete/files/digest-kopete-3.5.7-r1
new file mode 100644
index 000000000000..ac045c99a7b9
--- /dev/null
+++ b/kde-base/kopete/files/digest-kopete-3.5.7-r1
@@ -0,0 +1,6 @@
+MD5 07d313f91154d3c2f4620b921277fdc8 kdenetwork-3.5-patchset-01.tar.bz2 2986
+RMD160 288113734e7767a7526f4b9311c1985ac8aa91bf kdenetwork-3.5-patchset-01.tar.bz2 2986
+SHA256 0bbde1adaa4e8fff02c1f1fd6ceb66ec9af14dd19ff64567ab0fd03926d7d05b kdenetwork-3.5-patchset-01.tar.bz2 2986
+MD5 d7f2a05a7e304b33128123c3f67ea636 kdenetwork-3.5.7.tar.bz2 9370098
+RMD160 85b2780b411f91afb7e2dd6670500c9046b8b591 kdenetwork-3.5.7.tar.bz2 9370098
+SHA256 979d93802693a76e2e4fc0f7bdd4c44bde48296f842619a2b59100d94346d596 kdenetwork-3.5.7.tar.bz2 9370098
diff --git a/kde-base/kopete/files/kopete-3.5.7-videodevice.patch b/kde-base/kopete/files/kopete-3.5.7-videodevice.patch
new file mode 100644
index 000000000000..50cb8a0f2d7b
--- /dev/null
+++ b/kde-base/kopete/files/kopete-3.5.7-videodevice.patch
@@ -0,0 +1,22 @@
+--- branches/KDE/3.5/kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	2006/08/17 13:37:13	573903
++++ branches/KDE/3.5/kdenetwork/kopete/libkopete/avdevice/videodevice.cpp	2007/06/09 01:27:58	673109
+@@ -1604,7 +1604,8 @@
+ 				case VIDEO_PALETTE_RGB32	: return PIXELFORMAT_RGB32;	break;
+ 				case VIDEO_PALETTE_YUYV		: return PIXELFORMAT_YUYV;	break;
+ 				case VIDEO_PALETTE_UYVY		: return PIXELFORMAT_UYVY;	break;
+-				case VIDEO_PALETTE_YUV420	: return PIXELFORMAT_YUV420P;	break;
++				case VIDEO_PALETTE_YUV420	:
++				case VIDEO_PALETTE_YUV420P	: return PIXELFORMAT_YUV420P;	break;
+ 				case VIDEO_PALETTE_YUV422P	: return PIXELFORMAT_YUV422P;	break;
+ 			}
+ 			break;
+@@ -1758,7 +1759,8 @@
+ 				case VIDEO_PALETTE_RGB32	: returnvalue = pixelFormatName(PIXELFORMAT_RGB32);	break;
+ 				case VIDEO_PALETTE_YUYV		: returnvalue = pixelFormatName(PIXELFORMAT_YUYV);	break;
+ 				case VIDEO_PALETTE_UYVY		: returnvalue = pixelFormatName(PIXELFORMAT_UYVY);	break;
+-				case VIDEO_PALETTE_YUV420	: returnvalue = pixelFormatName(PIXELFORMAT_YUV420P);	break;
++				case VIDEO_PALETTE_YUV420	:
++				case VIDEO_PALETTE_YUV420P	: returnvalue = pixelFormatName(PIXELFORMAT_YUV420P);	break;
+ 				case VIDEO_PALETTE_YUV422P	: returnvalue = pixelFormatName(PIXELFORMAT_YUV422P);	break;
+ 			}
+ 			break;
diff --git a/kde-base/kopete/kopete-3.5.7-r1.ebuild b/kde-base/kopete/kopete-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..ee352fe40a0e
--- /dev/null
+++ b/kde-base/kopete/kopete-3.5.7-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.7-r1.ebuild,v 1.1 2007/08/11 12:10:15 philantrop Exp $
+
+KMNAME=kdenetwork
+MAXKDEVER=$PV
+KM_DEPRANGE="3.5.0 $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdenetwork-3.5-patchset-01.tar.bz2"
+
+DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://kopete.kde.org/"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="jingle sametime ssl xscreensaver slp kernel_linux latex crypt
+		winpopup sms irc yahoo gadu groupwise netmeeting statistics autoreplace
+		connectionstatus contactnotes translator webpresence texteffect highlight
+		alias autoreplace history nowlistening addbookmarks kdehiddenvisibility"
+
+# The kernel_linux? ( ) conditional dependencies are for webcams, not supported
+# on other kernels AFAIK
+BOTH_DEPEND="dev-libs/libxslt
+	dev-libs/libxml2
+	net-dns/libidn
+	>=dev-libs/glib-2
+	app-crypt/qca
+	sametime? ( =net-libs/meanwhile-1.0* )
+	jingle? (
+		>=media-libs/speex-1.1.6
+		dev-libs/expat
+		~net-libs/ortp-0.7.1 )
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	kernel_linux? ( virtual/opengl )
+	sms? ( app-mobilephone/gsmlib )"
+
+RDEPEND="${BOTH_DEPEND}
+	ssl? ( app-crypt/qca-tls )
+	!kde-base/kdenetwork
+	latex? ( virtual/tetex
+		media-gfx/imagemagick )
+	crypt? ( app-crypt/gnupg )"
+#	gnomemeeting is deprecated and ekiga is not yet ~ppc64
+#	only needed for calling
+#	netmeeting? ( net-im/gnomemeeting )"
+
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	x11-proto/videoproto
+	kernel_linux? ( x11-libs/libXv )
+	xscreensaver? ( x11-proto/scrnsaverproto )"
+
+pkg_setup() {
+	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "To support Video4Linux webcams in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with OpenGL support."
+		eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+	fi
+}
+
+kopete_disable() {
+	einfo "Disabling $2 $1"
+	sed -i -e "s/$2//" "${S}/kopete/$1s/Makefile.am"
+}
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	epatch "${FILESDIR}/kopete-0.12_alpha1-xscreensaver.patch"
+
+	epatch "${FILESDIR}/${PN}-3.5.5-icqfix.patch"
+
+	epatch "${FILESDIR}/kdenetwork-3.5.5-linux-headers-2.6.18.patch"
+
+	# Fixes bug 187400, pwc-driven webcams broken.
+	epatch "${FILESDIR}/${PN}-3.5.7-videodevice.patch"
+
+	use latex || kopete_disable plugin latex
+	use crypt || kopete_disable plugin cryptography
+	use netmeeting || kopete_disable plugin netmeeting
+	use statistics || kopete_disable plugin statistics
+	use autoreplace || kopete_disable plugin autoreplace
+	use connectionstatus || kopete_disable plugin connectionstatus
+	use contactnotes || kopete_disable plugin contactnotes
+	use translator || kopete_disable plugin translator
+	use webpresence || kopete_disable plugin webpresence
+	use texteffect || kopete_disable plugin texteffect
+	use highlight || kopete_disable plugin highlight
+	use alias || kopete_disable plugin alias
+	use addbookmarks || kopete_disable plugin addbookmarks
+	use history || kopete_disable plugin history
+	use nowlistening || kopete_disable plugin nowlistening
+
+	use winpopup || kopete_disable protocol winpopup
+	use gadu || kopete_disable protocol '\$(GADU)'
+	use irc || kopete_disable protocol irc
+	use groupwise || kopete_disable protocol groupwise
+	use yahoo || kopete_disable protocol yahoo
+
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
+	# Maybe we can enable it in the future.
+	local myconf="$(use_enable jingle)
+		$(use_enable sametime sametime-plugin)
+		--without-xmms --without-external-libgadu
+		$(use_with xscreensaver) $(use_enable sms smsgsm)
+		$(use_enable debug testbed)"
+
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	rm -f "${D}${KDEDIR}"/bin/{stun,relay}server
+}
+
+pkg_postinst() {
+	kde_pkg_postinst
+
+	elog "If you would like to use Off-The-Record encryption, emerge net-im/kopete-otr."
+}