[kvirc] fix deprecated v4l interfaces in 3.9 kernel
nucleo
nucleo at fedoraproject.org
Tue Apr 23 23:26:22 UTC 2013
commit 2938fa0e4165730a4df6e6e0b11d2ca4007ef5ce
Author: nucleo <nucleo at fedoraproject.org>
Date: Wed Apr 24 02:26:17 2013 +0300
fix deprecated v4l interfaces in 3.9 kernel
kvirc-4.2.0-v4l_deprecations.patch | 15 +++++++++++++++
kvirc.spec | 10 +++++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/kvirc-4.2.0-v4l_deprecations.patch b/kvirc-4.2.0-v4l_deprecations.patch
new file mode 100644
index 0000000..64a234f
--- /dev/null
+++ b/kvirc-4.2.0-v4l_deprecations.patch
@@ -0,0 +1,15 @@
+--- kvirc-4.2.0/src/kvilib/ext/avdevice/videodevice.cpp 2012-01-13 15:53:32.000000000 +0200
++++ kvirc-4.2.0/src/kvilib/ext/avdevice/videodevice.cpp 2013-04-24 01:41:48.262331119 +0300
+@@ -3089,8 +3089,12 @@
+ case V4L2_CID_GAIN: return __tr("Gain");
+ case V4L2_CID_HFLIP: return __tr("Horizontal Flip");
+ case V4L2_CID_VFLIP: return __tr("Vertical Flip");
++#ifdef V4L2_CID_HCENTER // since kernel-3.9.0
+ case V4L2_CID_HCENTER: return __tr("Horizontal Center");
++#endif
++#ifdef V4L2_CID_VCENTER // since kernel-3.9.0
+ case V4L2_CID_VCENTER: return __tr("Vertical Center");
++#endif
+ #ifdef V4L2_CID_POWER_LINE_FREQUENCY // since kernel 2.6.25
+ case V4L2_CID_POWER_LINE_FREQUENCY: return __tr("Power Line Frequency");
+ case V4L2_CID_HUE_AUTO: return __tr("Automatic Hue");
diff --git a/kvirc.spec b/kvirc.spec
index 475ac9b..9204316 100644
--- a/kvirc.spec
+++ b/kvirc.spec
@@ -1,6 +1,6 @@
Name: kvirc
Version: 4.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Free portable IRC client
Group: Applications/Internet
License: GPLv2+ with exceptions
@@ -8,6 +8,7 @@ URL: http://kvirc.net/
Source0: ftp://ftp.kvirc.de/pub/kvirc/%{version}/source/%{name}-%{version}.tar.bz2
# backport epel fixes from revisions 6199,6201-6205 (thanks to Pragma)
Patch0: kvirc-4.2.0-epel.patch
+Patch1: kvirc-4.2.0-v4l_deprecations.patch
BuildRequires: kdelibs4-devel audiofile-devel glib2-devel
BuildRequires: python-devel perl-ExtUtils-Embed dbus-devel
BuildRequires: cmake desktop-file-utils gettext doxygen graphviz
@@ -28,6 +29,10 @@ many IRC addicted developers around the world.
%setup -q
%patch0 -p1
+%if 0%{?fedora} > 18
+%patch1 -p1
+%endif
+
%build
%{cmake} \
-DCMAKE_SKIP_RPATH=ON \
@@ -130,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%exclude %{_datadir}/%{name}/4.2/doc/README
%changelog
+* Wed Apr 24 2013 Alexey Kurov <nucleo at fedoraproject.org> - 4.2.0-7
+- fix deprecated v4l interfaces in 3.9 kernel
+
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
More information about the scm-commits
mailing list