Backport patch from upstream to fix build with USE="v4l" and Linux 3.9, wrt bug #468844.

Package-Manager: portage-2.1.11.63/cvs/Linux x86_64
Manifest-Sign-Key: 0x675D0D2C

4 files changed, 44 insertions, 11 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 6f2b4e8aa85d..536a1913a12c 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.368 2013/05/08 20:46:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.369 2013/05/10 17:18:37 kensington Exp $
+
+  10 May 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/kopete-4.10.3-v4l.patch, kopete-4.10.3.ebuild:
+  Backport patch from upstream to fix build with USE="v4l" and Linux 3.9, wrt
+  bug #468844.
 
   08 May 2013; Johannes Huber <johu@gentoo.org> metadata.xml:
   Cleanup unused USE description.
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 45ce4afbab7f..96a2a628479c 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -2,20 +2,21 @@
 Hash: SHA256
 
 AUX kopete-4.10.1-nofatalwarn.patch 584 SHA256 3cc888ea27071355ce7fb9f117cc7d60e712a2cfe8e5bc2281627e84376c208a SHA512 e078025b6709f1daf5fc7f463f0eae7ddc9acfe6418f19c1b0797041162d43e693147ea3c1e266ec3deef9b6867686cac7109558be4122a47eae956673f77931 WHIRLPOOL 00b6421b8cc117cfba9175c6ec58938d26680d7e2c122793f88c995c959975daf76919da2cd6042f635ad312e01be306ac7ff73f72f58f7d8edcac26eab8e425
+AUX kopete-4.10.3-v4l.patch 1400 SHA256 0bd8befa2d488e461531d6e108305fb47e95612e78747913ed86b58923bf14a6 SHA512 c85dd97eb57cce4ab20c747d92013feda9a2f5d5ebf3e85f6e6480aee22eaf085a832b4321a6c803bacff38b7923d498e03d7e67fa73ee6d785b39b18fc23765 WHIRLPOOL c154bd9f91c65eee8188fab5fa1c2d380a6b477a45870cf276bd87769db7f7f9f514eff0b7fd69ff8058cfce93e7cde6e3276c50803876d97df22a53c096787a
 DIST kdenetwork-4.10.2.tar.xz 9052096 SHA256 88a6fea9b34ec30b1c289595cca71d184f7fe52bb7e3f14f77391d958ce4524e SHA512 e995bb6ef7bf5435bda18cde5b04e6ed98c1613d8c6a469732235282acfae6200db1f9f8b4c7f260f3fe99407e9015cc3a427f02a12a89f2ae1aee9503bcf56a WHIRLPOOL 8d4871816f05280aa0c9b2b4eb952eb9321e5acb96a7c3036449af7892bd5c3cabe33a592ab771d0b32f5a32530f95756ac2e5248d663525beb3dcc399563067
 DIST kdenetwork-4.10.3.tar.xz 9058180 SHA256 0f5e92d7920bc2d8a30985ca309b131384e3cb2f7b414962f394de36963be5f7 SHA512 4c62dbf3237279ed5dea155349e8fecbdada3ea2a166d524f9517cf18f7657f74361ef07fe554f8351d4e62dee8c951173b8e49f32f9176d18b21cba2a70759b WHIRLPOOL 1b65f31c70bdbff8cec95749f62290d30fe51a6e13470b802e0c43d93337491eb6326d4a87005e5ab213997ecb08e55fa5748b39e0cbc011c56974e25416623e
 EBUILD kopete-4.10.2.ebuild 4239 SHA256 b815d6dbb64202a4b724ea393a6b0d58b833f655f5048b96ad6e121d6f768eae SHA512 484da888e3a56c56adf2b20528b40c9d1effdde03422d4e7ba34fedd4597e12c4baa20319841d9ef7447acc63d740fff1c004f0fda2ebb545ed843725ff0f2fc WHIRLPOOL 02fb163d99d5c32537b97a5c74ab7364d6c1eb722665946a191c652b957f556125e7d38ddb47e10d2b10826fcf009d27eb9bd58f6e3acf78d89aa5033ef34b53
-EBUILD kopete-4.10.3.ebuild 4245 SHA256 df7140864b92eef0828c4f53da20e925efb3d52fb4a45fc29bf60a7c9d4b8ef8 SHA512 39e5ca5df710dce5d2d0be8872d183e822af69b05610df99e3b37b11882a4edb775908cfae64776b6dd4dda992cb0e0dd6b311625ac0f8d52d10e1f0009ab12c WHIRLPOOL 3bf0072a0036f1ada258c131d4d95e8b98419dbf6312fbdead6e123f13c67dd0a14a9f1d9e6ac4c355ee9b74f10d35d5a377a880e14230815d59a61cbce9c0dd
-MISC ChangeLog 51683 SHA256 7497324a84fa8836c75776ec7c39e126003df5f67b065f22b287a6165ef198f1 SHA512 79b99bc07220f3b5f22b863458640bfa2197111473e02b88673cd55fcb215848fcc33079729e4c47c24a94b36e76873d98f2fa3cf321e85ef902081ccee8c54f WHIRLPOOL 68368f73e2edd92330a0d06aed3d2839597b779f7d71e031ff4648f40758a0bf5119d3c809b10e4233e3e00da29624ec42e35260538b5faeb0606361585bc085
+EBUILD kopete-4.10.3.ebuild 4293 SHA256 defc7a751950f83cf562a0a31148256fe1de8d704ec3b2e4dfaebe7c97cc3f5e SHA512 c8ea82c7677caa2b21aa0d1e8fb97c21f36461f9deb0f19115354ab212a1f2917b7343dae8349f21da9107fe542a2329a705d9dd5889c6613cfa5d7eb361681d WHIRLPOOL 13bdd981e5c601d11da2d26a26b8b3e40667ce275a06751700ed63e80eab1c891e3a0b9082c751129cb929ccdbf6ba562499c4dbccc5275d0fa2701c6c4c10b5
+MISC ChangeLog 51895 SHA256 4dd82b3097c7adac02ae52d72b89e77b3b646296322d04889d9fa562c822846c SHA512 0ff0e45b3562492b469b137382c26fa2e739fc3e1e0ce3496c41aa90ecc5c853b3806ad7161d90cb31f94932b955d03d7d7828a06a771c21ba5e7884d333e485 WHIRLPOOL e175576f15217e9d1266f8731fb27784181eb895be0fada1b794e4729f6b64d6eea8699e16facac360c65f17e5ba350c9a06ac88504e3dca3503682f494e90a1
 MISC metadata.xml 2449 SHA256 2373b4b12a5db6aed29c91a5a9c114250692ac02691b3ec919dda89ceeb3fa0b SHA512 087fd456daee8ce857b321d32a572838fb5c32137c051ff9f1a8df9cded0dbcbc3517a784347e9231ecc41069d8ef5242efd08def865489bb434e99ddaf0db88 WHIRLPOOL dfe45c7f2a1821f5636ea1dc88e38cd47b9f4b6d4831c60cb68f4ce52eea03435e46fc128bf8af36e5f7de5598408989f9ae419dec62cc096f15f1717a67cb61
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRirmTAAoJEO+t9ga+3I3a390IALdjlFoh7RhCc7uG/1UULhID
-Iu6wgFBgpinFtmAHGWBtbhNbQoFZRWvZln1lYUbr5WRYe9AKdsIjj6XtUsNlcNyf
-74uqg4x79w6ttrR584Ixi6QuUF6qnOIJoZjXXZv8bAJNd0+V5WyNovjAHFMUsak4
-bOnf+dnYI/iu0MN4Fd3deDqh0wgGL6kPfe7Ll064FaXjIuTtrBw0D5ysah+Wqy/I
-KH8X2jaa4+6DLjWHh+qqsqmJZn4vjcIwot9ZEZ/FBtpzkYyhFmv5VQvrstBM6OgB
-qyRyDMK+PSxTORnF+okX+Z/HPg5YVX/OviYZGaGC+pSTmhVWiJaFuzzt0DJtf8o=
-=AyRJ
+iQEcBAEBCAAGBQJRjSuvAAoJEMbwO6tnXQ0sYZUIAIUKJzwJW0wf2JLrVjjegsIs
+DeoMtHV+nXDY1CVGoLda1w4zcRrjQTQTMutVUbBNrcJjdpwXoqUlAfAYG0Io68Xb
+nZxNhlDlEGbJ/+LWUpUUqouLP6/+oBua0UB+qtnPlqprmHz6zNi2/qP6iVUxJZE+
+0qSCFWqCfrK4PmKJMq3b5EYNPuVbDKAxjc1izIzUF2m6+jiIEyyxDiOV3W71mfMr
+ZMIqeF636/hdIZZFS8iiJy0gT7R61CH7Awyqcf1fkDVZFNoELPV4XPOuW6/sW+MR
+B/1xc9kFWYRKeQyNpyztcNQKogUlJTMhzPbZjWC1vSEIb3J8bahPEPYJScepqyA=
+=qomT
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/files/kopete-4.10.3-v4l.patch b/kde-base/kopete/files/kopete-4.10.3-v4l.patch
new file mode 100644
index 000000000000..d48cb4506bfc
--- /dev/null
+++ b/kde-base/kopete/files/kopete-4.10.3-v4l.patch
@@ -0,0 +1,25 @@
+Index: libkopete/avdevice/videodevice.cpp
+===================================================================
+--- kopete/libkopete/avdevice/videodevice.cpp	(revision 1353128)
++++ kopete/libkopete/avdevice/videodevice.cpp	(working copy)
+@@ -3050,7 +3050,9 @@
+ 		case V4L2_CID_AUDIO_TREBLE: 		return I18N_NOOP("Treble");
+ 		case V4L2_CID_AUDIO_MUTE: 		return I18N_NOOP("Mute");
+ 		case V4L2_CID_AUDIO_LOUDNESS: 		return I18N_NOOP("Loudness");
++#ifdef V4L2_CID_BLACK_LEVEL		// deprecated, likely to be removed soon
+ 		case V4L2_CID_BLACK_LEVEL:		return I18N_NOOP("Black Level");
++#endif
+ 		case V4L2_CID_AUTO_WHITE_BALANCE:	return I18N_NOOP("Automatic White Balance");
+ 		case V4L2_CID_DO_WHITE_BALANCE:		return I18N_NOOP("Do White Balance");
+ 		case V4L2_CID_RED_BALANCE:		return I18N_NOOP("Red Balance");
+@@ -3061,8 +3063,10 @@
+ 		case V4L2_CID_GAIN:			return I18N_NOOP("Gain");
+ 		case V4L2_CID_HFLIP:			return I18N_NOOP("Horizontal Flip");
+ 		case V4L2_CID_VFLIP:			return I18N_NOOP("Vertical Flip");
++#ifdef V4L2_CID_HCENTER			// removed in kernel 3.9
+ 		case V4L2_CID_HCENTER:			return I18N_NOOP("Horizontal Center");
+ 		case V4L2_CID_VCENTER:			return I18N_NOOP("Vertical Center");
++#endif
+ #ifdef V4L2_CID_POWER_LINE_FREQUENCY	// since kernel 2.6.25
+ 		case V4L2_CID_POWER_LINE_FREQUENCY:	return I18N_NOOP("Power Line Frequency");
+ 		case V4L2_CID_HUE_AUTO:			return I18N_NOOP("Automatic Hue");
diff --git a/kde-base/kopete/kopete-4.10.3.ebuild b/kde-base/kopete/kopete-4.10.3.ebuild
index be72edb52240..23bd00548941 100644
--- a/kde-base/kopete/kopete-4.10.3.ebuild
+++ b/kde-base/kopete/kopete-4.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.10.3.ebuild,v 1.1 2013/05/06 20:18:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.10.3.ebuild,v 1.2 2013/05/10 17:18:37 kensington Exp $
 
 EAPI=5
 
@@ -109,6 +109,8 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
+PATCHES=( "${FILESDIR}/${P}-v4l.patch" )
+
 src_prepare() {
 	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
 		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"