[libunicap] Upgrade to 0.9.12 (#635377)
Robert Scheck
robert at fedoraproject.org
Mon Oct 4 19:58:13 UTC 2010
commit 445d489d06ac85c3a510b7ed5590d862bf3c7925
Author: Robert Scheck <robert at fedoraproject.org>
Date: Mon Oct 4 21:58:09 2010 +0200
Upgrade to 0.9.12 (#635377)
.gitignore | 1 +
libunicap-0.9.12-includes.patch | 15 +++++++++++++++
libunicap.spec | 16 ++++++++++++++--
sources | 2 +-
4 files changed, 31 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd56e49..ed52407 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libunicap-0.9.8.tar.gz
+libunicap-0.9.12.tar.gz
diff --git a/libunicap-0.9.12-includes.patch b/libunicap-0.9.12-includes.patch
new file mode 100644
index 0000000..bfbbc7a
--- /dev/null
+++ b/libunicap-0.9.12-includes.patch
@@ -0,0 +1,15 @@
+Patch by Kamil Dudka <kdudka at redhat.com> for libunicap >= 0.9.12, to get it building on Red Hat
+Enterprise Linux 5 (or derivates); see https://bugzilla.redhat.com/show_bug.cgi?id=635377#c2 for
+more details.
+
+--- libunicap-0.9.12/cpi/v4l2cpi/buffermanager.c 2010-08-17 18:13:08.000000000 +0200
++++ libunicap-0.9.12/cpi/v4l2cpi/buffermanager.c.includes 2010-10-04 21:44:09.942065713 +0200
+@@ -1,5 +1,8 @@
+ #include "config.h"
+
++#include <sys/time.h>
++
++#include <linux/ioctl.h>
+ #include <linux/types.h>
+ #include <linux/videodev2.h>
+ #include <semaphore.h>
diff --git a/libunicap.spec b/libunicap.spec
index 33b43fc..a38f15c 100644
--- a/libunicap.spec
+++ b/libunicap.spec
@@ -6,19 +6,20 @@
Summary: Library to access different kinds of (video) capture devices
Name: libunicap
-Version: 0.9.8
+Version: 0.9.12
Release: 1%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://www.unicap-imaging.org/
Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz
Source1: %{name}-filter.sh
+Patch0: libunicap-0.9.12-includes.patch
BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4
%ifnarch s390 s390x
BuildRequires: libraw1394-devel >= 1.1.0
%endif
%if 0%{?rhel}%{?fedora} >= 6
-BuildRequires: libv4l-devel
+BuildRequires: libv4l-devel, libtool, automake, autoconf
%endif
Obsoletes: unicap <= 0.9.7-1
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +45,13 @@ API documentation of the library, too.
%prep
%setup -q
+%patch0 -p1 -b .includes
+
+# Needed to get rid of rpath
+%if 0%{?rhel}%{?fedora} >= 6
+libtoolize --force
+autoreconf --force --install
+%endif
%build
%if 0%{?rhel}%{?fedora} >= 6
@@ -71,6 +79,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f unicap.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
+%config %{_sysconfdir}/udev/rules.d/50-euvccam.rules
%{_libdir}/%{name}.so.*
%{_libdir}/unicap2
@@ -82,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/%{name}
%changelog
+* Mon Oct 04 2010 Robert Scheck <robert at fedoraproject.org> 0.9.12-1
+- Upgrade to 0.9.12 (#635377)
+
* Sun Feb 21 2010 Robert Scheck <robert at fedoraproject.org> 0.9.8-1
- Upgrade to 0.9.8 (#530702, #567109, #567110, #567111)
- Splitting of unicap into libunicap, libucil and libunicapgtk
diff --git a/sources b/sources
index 64cb656..db3b813 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48b97308fc8bb949f4ac34cbeaf1dbec libunicap-0.9.8.tar.gz
+353657b4da519251d4cc6dee5a232391 libunicap-0.9.12.tar.gz
More information about the scm-commits
mailing list