[kdenetwork] kopete FTBFS against recent kernels, uses deprecated v4l interfaces (#946924)
Rex Dieter
rdieter at fedoraproject.org
Mon Apr 1 11:47:02 UTC 2013
commit b77cc3b35e8e2ff0228db297817cbaacf1305767
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Mon Apr 1 06:46:47 2013 -0500
kopete FTBFS against recent kernels, uses deprecated v4l interfaces (#946924)
kdenetwork-4.10.2-v4l_deprecations.patch | 16 ++++++++++++++++
kdenetwork.spec | 5 +++++
2 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/kdenetwork-4.10.2-v4l_deprecations.patch b/kdenetwork-4.10.2-v4l_deprecations.patch
new file mode 100644
index 0000000..09a167c
--- /dev/null
+++ b/kdenetwork-4.10.2-v4l_deprecations.patch
@@ -0,0 +1,16 @@
+diff -up kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp.v4l_deprecations kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp
+--- kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp.v4l_deprecations 2013-02-28 23:22:39.148721688 -0600
++++ kdenetwork-4.10.2/kopete/libkopete/avdevice/videodevice.cpp 2013-04-01 06:43:55.506441943 -0500
+@@ -3061,8 +3061,12 @@ const char *VideoDevice::getUnifiedV4L2S
+ 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 // since kernel-3.9.0
+ case V4L2_CID_HCENTER: return I18N_NOOP("Horizontal Center");
++#endif
++#ifdef V4L2_CID_VCENTER // since kernel-3.9.0
+ 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/kdenetwork.spec b/kdenetwork.spec
index 9031c42..99f1580 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -32,6 +32,9 @@ Patch4: kdenetwork-4.10.0-kopete_system_iris.patch
## upstreamable patches
Patch50: kdenetwork-4.9.5-libjingle_openssl.patch
+# kernel-3.9.0 v4l deprecations
+# see http://bugzilla.redhat.com/946924
+Patch51: kdenetwork-4.10.2-v4l_deprecations.patch
## upstream patches
@@ -234,6 +237,7 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
%patch3 -p1 -b .fix-for-g++47
%patch4 -p1 -b .kopete_system_iris
%patch50 -p1 -b .libjingle_openssl
+%patch51 -p1 -b .v4l_deprecations
%build
@@ -511,6 +515,7 @@ fi
%changelog
* Sun Mar 31 2013 Rex Dieter <rdieter at fedoraproject.org> - 7:4.10.2-1
- 4.10.2
+- kopete FTBFS against recent kernels, uses deprecated v4l interfaces (#946924)
* Thu Mar 07 2013 Rex Dieter <rdieter at fedoraproject.org> 7:4.10.1-2
- KGet 4.10 deletes home (kde#316086)
More information about the scm-commits
mailing list