From 61060ba47a95af08ad30c7e8fda8049092e9d77e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 18 Feb 2008 17:34:14 +0000 Subject: [PATCH 01/12] Initialize branch EL-5 for unicap --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 29c17c79ef4cd79c6451f974b4ded0379d59e90c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 18 Feb 2008 22:14:31 +0000 Subject: [PATCH 02/12] Initial import of unicap --- .cvsignore | 1 + sources | 1 + unicap-0.2.19-libdir.patch | 87 ++++++++++++++++++++++++++++++++++++++ unicap.spec | 85 +++++++++++++++++++++++++++++++++++++ 4 files changed, 174 insertions(+) create mode 100644 unicap-0.2.19-libdir.patch create mode 100644 unicap.spec diff --git a/.cvsignore b/.cvsignore index e69de29..0c9f421 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +unicap-0.2.19.tar.gz diff --git a/sources b/sources index e69de29..9d69924 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0ab0a533f5c1ff3a24853d2564ffb14f unicap-0.2.19.tar.gz diff --git a/unicap-0.2.19-libdir.patch b/unicap-0.2.19-libdir.patch new file mode 100644 index 0000000..e65f7b5 --- /dev/null +++ b/unicap-0.2.19-libdir.patch @@ -0,0 +1,87 @@ +Patch by Ralf Corsepius for unicap >= 0.2.19, which causes the use +of /usr/lib64 on 64 bit architectures. And without this patch, /usr/lib is always used. + +--- unicap-0.2.19/cpi/dcam/Makefile.am 2007-08-02 22:29:53.000000000 +0200 ++++ unicap-0.2.19/cpi/dcam/Makefile.am.libdir 2008-02-05 11:35:57.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libdcam.la + else +-lib_LTLIBRARIES = libdcam.la ++libcpi_LTLIBRARIES = libdcam.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + libdcam_la_CPPFLAGS = -D@LIBRAW1394_VERSION@ + +--- unicap-0.2.19/cpi/thing/Makefile.am 2006-04-16 22:02:55.000000000 +0200 ++++ unicap-0.2.19/cpi/thing/Makefile.am.libdir 2008-02-05 11:36:58.000000000 +0100 +@@ -1,9 +1,9 @@ + MAINTAINERCLEANFILES = Makefile.in + INCLUDES = -I../include -I../../include + +-lib_LTLIBRARIES = libthing.la ++libcpi_LTLIBRARIES = libthing.la + +-libdir = $(prefix)/lib/unicap/cpi ++libcpidir = $(libdir)/unicap/cpi + + + libthing_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ +--- unicap-0.2.19/cpi/v4l/Makefile.am 2007-08-02 22:30:32.000000000 +0200 ++++ unicap-0.2.19/cpi/v4l/Makefile.am.libdir 2008-02-05 11:37:23.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libv4l.la + else +-lib_LTLIBRARIES = libv4l.la ++libcpi_LTLIBRARIES = libv4l.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + + libv4l_la_LDFLAGS = +--- unicap-0.2.19/cpi/v4l2/Makefile.am 2008-02-02 16:07:46.000000000 +0100 ++++ unicap-0.2.19/cpi/v4l2/Makefile.am.libdir 2008-02-05 11:36:25.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libv4l2.la + else +-lib_LTLIBRARIES = libv4l2.la ++libcpi_LTLIBRARIES = libv4l2.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + + libv4l2_la_LDFLAGS = +--- unicap-0.2.19/cpi/vid21394/Makefile.am 2007-08-02 22:29:34.000000000 +0200 ++++ unicap-0.2.19/cpi/vid21394/Makefile.am.libdir 2008-02-05 11:38:19.000000000 +0100 +@@ -4,10 +4,10 @@ + if ENABLE_STATIC_CPI + noinst_LTLIBRARIES = libvid21394.la + else +-lib_LTLIBRARIES = libvid21394.la ++libcpi_LTLIBRARIES = libvid21394.la + endif + +-libdir = $(prefix)/lib/unicap$(pkg_version)/cpi ++libcpidir = $(libdir)/unicap$(pkg_version)/cpi + + libvid21394_la_LDFLAGS = + +--- unicap-0.2.19/libunicapgtk/Makefile.am 2007-08-30 07:55:42.000000000 +0200 ++++ unicap-0.2.19/libunicapgtk/Makefile.am.libdir 2008-02-05 11:39:08.000000000 +0100 +@@ -1,6 +1,6 @@ + MAINTAINERCLEANFILES = Makefile.in + INCLUDES = -I../include -I../libucil @GTK_PACKAGE_CFLAGS@ +-AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(prefix)/lib/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" ++AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(libdir)/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" + + if BUILD_UNICAPGTK + UNICAPGTK_LIB=libunicapgtk.la diff --git a/unicap.spec b/unicap.spec new file mode 100644 index 0000000..98fccd1 --- /dev/null +++ b/unicap.spec @@ -0,0 +1,85 @@ +Summary: Library to access different kinds of (video) capture devices +Name: unicap +Version: 0.2.19 +Release: 3%{?dist} +License: GPLv2+ +Group: System Environment/Libraries +URL: http://www.unicap-imaging.org/ +Source: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +Patch: unicap-0.2.19-libdir.patch +BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext +BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel +BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 +BuildRequires: libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel +BuildRequires: automake, libtool +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +Unicap provides a uniform interface to video capture devices. It allows +applications to use any supported video capture device via a single API. +The included ucil library provides easy to use functions to render text +and graphic overlays onto video images. + +%package devel +Summary: Development files for the unicap library +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +The unicap-devel package includes header files and libraries necessary for +for developing programs which use the unicap, unicapgtk and ucil library. It +contains the API documentation of the library, too. + +%prep +%setup -q +%patch -p1 -b .libdir +aclocal -I m4 +autoconf +automake -a + +%build +%configure --disable-rpath --enable-gtk-doc + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +# Don't install any static .a and libtool .la files +rm -f $RPM_BUILD_ROOT%{_libdir}/{,unicap2/cpi/}*.{a,la} + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%files -f %{name}.lang +%defattr(-,root,root) +%doc AUTHORS ChangeLog COPYING README +%{_libdir}/*.so.* +%dir %{_libdir}/unicap2 +%dir %{_libdir}/unicap2/cpi +%{_libdir}/unicap2/cpi/*.so.* + +%files devel +%defattr(-,root,root) +%doc examples +%{_libdir}/*.so +%{_libdir}/unicap2/cpi/*.so +%{_libdir}/pkgconfig/*.pc +%{_includedir}/%{name} +%{_datadir}/gtk-doc/html/* + +%changelog +* Sat Feb 16 2008 Robert Scheck 0.2.19-3 +- Added patch to correct libdir paths (thanks to Ralf Corsepius) + +* Mon Feb 04 2008 Robert Scheck 0.2.19-2 +- Changes to match with Fedora Packaging Guidelines (#431381) + +* Mon Feb 04 2008 Robert Scheck 0.2.19-1 +- Upgrade to 0.2.19 +- Initial spec file for Fedora and Red Hat Enterprise Linux From a87d353e8670281fb8e775160edbfe64177bfaae Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 17 May 2008 21:12:47 +0000 Subject: [PATCH 03/12] Upgrade to 0.2.22 (#446021) --- .cvsignore | 2 +- sources | 2 +- unicap-0.2.19-libdir.patch | 87 -------------------------------------- unicap-0.2.22-ia64.patch | 22 ++++++++++ unicap.spec | 11 +++-- 5 files changed, 31 insertions(+), 93 deletions(-) delete mode 100644 unicap-0.2.19-libdir.patch create mode 100644 unicap-0.2.22-ia64.patch diff --git a/.cvsignore b/.cvsignore index 0c9f421..ac9e7f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.19.tar.gz +unicap-0.2.22.tar.gz diff --git a/sources b/sources index 9d69924..be4951f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ab0a533f5c1ff3a24853d2564ffb14f unicap-0.2.19.tar.gz +52c9feb759227a9cfac95f2f68635dab unicap-0.2.22.tar.gz diff --git a/unicap-0.2.19-libdir.patch b/unicap-0.2.19-libdir.patch deleted file mode 100644 index e65f7b5..0000000 --- a/unicap-0.2.19-libdir.patch +++ /dev/null @@ -1,87 +0,0 @@ -Patch by Ralf Corsepius for unicap >= 0.2.19, which causes the use -of /usr/lib64 on 64 bit architectures. And without this patch, /usr/lib is always used. - ---- unicap-0.2.19/cpi/dcam/Makefile.am 2007-08-02 22:29:53.000000000 +0200 -+++ unicap-0.2.19/cpi/dcam/Makefile.am.libdir 2008-02-05 11:35:57.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libdcam.la - else --lib_LTLIBRARIES = libdcam.la -+libcpi_LTLIBRARIES = libdcam.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - libdcam_la_CPPFLAGS = -D@LIBRAW1394_VERSION@ - ---- unicap-0.2.19/cpi/thing/Makefile.am 2006-04-16 22:02:55.000000000 +0200 -+++ unicap-0.2.19/cpi/thing/Makefile.am.libdir 2008-02-05 11:36:58.000000000 +0100 -@@ -1,9 +1,9 @@ - MAINTAINERCLEANFILES = Makefile.in - INCLUDES = -I../include -I../../include - --lib_LTLIBRARIES = libthing.la -+libcpi_LTLIBRARIES = libthing.la - --libdir = $(prefix)/lib/unicap/cpi -+libcpidir = $(libdir)/unicap/cpi - - - libthing_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ ---- unicap-0.2.19/cpi/v4l/Makefile.am 2007-08-02 22:30:32.000000000 +0200 -+++ unicap-0.2.19/cpi/v4l/Makefile.am.libdir 2008-02-05 11:37:23.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libv4l.la - else --lib_LTLIBRARIES = libv4l.la -+libcpi_LTLIBRARIES = libv4l.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - - libv4l_la_LDFLAGS = ---- unicap-0.2.19/cpi/v4l2/Makefile.am 2008-02-02 16:07:46.000000000 +0100 -+++ unicap-0.2.19/cpi/v4l2/Makefile.am.libdir 2008-02-05 11:36:25.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libv4l2.la - else --lib_LTLIBRARIES = libv4l2.la -+libcpi_LTLIBRARIES = libv4l2.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - - libv4l2_la_LDFLAGS = ---- unicap-0.2.19/cpi/vid21394/Makefile.am 2007-08-02 22:29:34.000000000 +0200 -+++ unicap-0.2.19/cpi/vid21394/Makefile.am.libdir 2008-02-05 11:38:19.000000000 +0100 -@@ -4,10 +4,10 @@ - if ENABLE_STATIC_CPI - noinst_LTLIBRARIES = libvid21394.la - else --lib_LTLIBRARIES = libvid21394.la -+libcpi_LTLIBRARIES = libvid21394.la - endif - --libdir = $(prefix)/lib/unicap$(pkg_version)/cpi -+libcpidir = $(libdir)/unicap$(pkg_version)/cpi - - libvid21394_la_LDFLAGS = - ---- unicap-0.2.19/libunicapgtk/Makefile.am 2007-08-30 07:55:42.000000000 +0200 -+++ unicap-0.2.19/libunicapgtk/Makefile.am.libdir 2008-02-05 11:39:08.000000000 +0100 -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - INCLUDES = -I../include -I../libucil @GTK_PACKAGE_CFLAGS@ --AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(prefix)/lib/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" -+AM_CPPFLAGS = $(GTK_CPPFLAGS) -DSYSCONFDIR="\"$(sysconfdir)\"" -DBACKENDDIR="\"$(libdir)/unicap$(pkg_version)/backends\"" -DPKG_VERSION="\"@lt_major@\"" - - if BUILD_UNICAPGTK - UNICAPGTK_LIB=libunicapgtk.la diff --git a/unicap-0.2.22-ia64.patch b/unicap-0.2.22-ia64.patch new file mode 100644 index 0000000..207ab28 --- /dev/null +++ b/unicap-0.2.22-ia64.patch @@ -0,0 +1,22 @@ +Patch by Yi Zhan for unicap >= 0.2.19, which causes a working make without segmentation +fault on IA64 (Itanium 2). See https://bugzilla.redhat.com/show_bug.cgi?id=446021 for further information. + +--- unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types 2008-02-02 15:20:55.000000000 +0000 ++++ unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types.ia64 2008-05-12 05:24:27.000000000 +0000 +@@ -1,4 +1,5 @@ + #include ++#include + + unicapgtk_video_display_get_type + unicapgtk_device_property_get_type +--- unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am 2007-07-06 05:40:51.000000000 +0000 ++++ unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am.ia64 2008-05-12 05:25:13.000000000 +0000 +@@ -67,7 +67,7 @@ + # signals and properties. + # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) + # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) +-INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) ++INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libunicapgtk -I$(top_srcdir)/include + GTKDOC_LIBS=`pkg-config --libs gtk+-2.0` -L$(top_builddir)/libunicapgtk/.libs/ -lunicapgtk + + # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/unicap.spec b/unicap.spec index 98fccd1..c6944a7 100644 --- a/unicap.spec +++ b/unicap.spec @@ -1,12 +1,12 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.19 -Release: 3%{?dist} +Version: 0.2.22 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ Source: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz -Patch: unicap-0.2.19-libdir.patch +Patch: unicap-0.2.22-ia64.patch BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 @@ -32,7 +32,7 @@ contains the API documentation of the library, too. %prep %setup -q -%patch -p1 -b .libdir +%patch -p1 -b .ia64 aclocal -I m4 autoconf automake -a @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sat May 17 2008 Robert Scheck 0.2.22-1 +- Upgrade to 0.2.22 (#446021) + * Sat Feb 16 2008 Robert Scheck 0.2.19-3 - Added patch to correct libdir paths (thanks to Ralf Corsepius) From 8c58fc63f97aec2757b1f6f2f18492a347701d51 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 15:55:21 +0000 Subject: [PATCH 04/12] - Upgrade to 0.2.23 - Corrected packaging of cpi/*.so files (thanks to Arne Caspari) --- .cvsignore | 2 +- sources | 2 +- unicap-0.2.22-ia64.patch | 22 ---------------------- unicap.spec | 16 ++++++---------- 4 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 unicap-0.2.22-ia64.patch diff --git a/.cvsignore b/.cvsignore index ac9e7f7..4841f31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.22.tar.gz +unicap-0.2.23.tar.gz diff --git a/sources b/sources index be4951f..6f65583 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52c9feb759227a9cfac95f2f68635dab unicap-0.2.22.tar.gz +e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz diff --git a/unicap-0.2.22-ia64.patch b/unicap-0.2.22-ia64.patch deleted file mode 100644 index 207ab28..0000000 --- a/unicap-0.2.22-ia64.patch +++ /dev/null @@ -1,22 +0,0 @@ -Patch by Yi Zhan for unicap >= 0.2.19, which causes a working make without segmentation -fault on IA64 (Itanium 2). See https://bugzilla.redhat.com/show_bug.cgi?id=446021 for further information. - ---- unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types 2008-02-02 15:20:55.000000000 +0000 -+++ unicap-0.2.22/doc/reference/libunicapgtk/libunicapgtk.types.ia64 2008-05-12 05:24:27.000000000 +0000 -@@ -1,4 +1,5 @@ - #include -+#include - - unicapgtk_video_display_get_type - unicapgtk_device_property_get_type ---- unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am 2007-07-06 05:40:51.000000000 +0000 -+++ unicap-0.2.22/doc/reference/libunicapgtk/Makefile.am.ia64 2008-05-12 05:25:13.000000000 +0000 -@@ -67,7 +67,7 @@ - # signals and properties. - # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) - # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) --INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) -+INCLUDES=`pkg-config --cflags gtk+-2.0` -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libunicapgtk -I$(top_srcdir)/include - GTKDOC_LIBS=`pkg-config --libs gtk+-2.0` -L$(top_builddir)/libunicapgtk/.libs/ -lunicapgtk - - # This includes the standard gtk-doc make rules, copied by gtkdocize. diff --git a/unicap.spec b/unicap.spec index c6944a7..5a628f6 100644 --- a/unicap.spec +++ b/unicap.spec @@ -1,6 +1,6 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.22 +Version: 0.2.23 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -11,7 +11,6 @@ BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 BuildRequires: libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel -BuildRequires: automake, libtool BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -32,10 +31,6 @@ contains the API documentation of the library, too. %prep %setup -q -%patch -p1 -b .ia64 -aclocal -I m4 -autoconf -automake -a %build %configure --disable-rpath --enable-gtk-doc @@ -60,20 +55,21 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README %{_libdir}/*.so.* -%dir %{_libdir}/unicap2 -%dir %{_libdir}/unicap2/cpi -%{_libdir}/unicap2/cpi/*.so.* +%{_libdir}/unicap2 %files devel %defattr(-,root,root) %doc examples %{_libdir}/*.so -%{_libdir}/unicap2/cpi/*.so %{_libdir}/pkgconfig/*.pc %{_includedir}/%{name} %{_datadir}/gtk-doc/html/* %changelog +* Mon May 19 2008 Robert Scheck 0.2.23-1 +- Upgrade to 0.2.23 +- Corrected packaging of cpi/*.so files (thanks to Arne Caspari) + * Sat May 17 2008 Robert Scheck 0.2.22-1 - Upgrade to 0.2.22 (#446021) From 38012c836cca621f0ee90c79169d58acce448181 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 19 May 2008 16:07:34 +0000 Subject: [PATCH 05/12] Removed the already removed patch from spec file --- unicap.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/unicap.spec b/unicap.spec index 5a628f6..f34b0ad 100644 --- a/unicap.spec +++ b/unicap.spec @@ -6,7 +6,6 @@ License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ Source: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz -Patch: unicap-0.2.22-ia64.patch BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 From a47ef5a968afa248d9c93bddb0e33b8e5e512c71 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 27 Jul 2008 16:15:05 +0000 Subject: [PATCH 06/12] Upgrade to 0.2.24 --- .cvsignore | 2 +- sources | 2 +- unicap.spec | 8 +++++++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4841f31..980f82e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.23.tar.gz +unicap-0.2.24.tar.gz diff --git a/sources b/sources index 6f65583..547e0c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz +852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz diff --git a/unicap.spec b/unicap.spec index f34b0ad..29b4d6b 100644 --- a/unicap.spec +++ b/unicap.spec @@ -1,6 +1,6 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.23 +Version: 0.2.24 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -65,6 +65,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun Jul 27 2008 Robert Scheck 0.2.24-1 +- Upgrade to 0.2.24 + +* Wed Jul 22 2008 Robert Scheck 0.2.23-2 +- Rebuild for libraw1394 2.0.0 + * Mon May 19 2008 Robert Scheck 0.2.23-1 - Upgrade to 0.2.23 - Corrected packaging of cpi/*.so files (thanks to Arne Caspari) From d483083b1a6f163bc275215e640e7d10c2bc61ed Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 9 Aug 2008 11:29:32 +0000 Subject: [PATCH 07/12] Filter the unicap plugins which overlap with libv4l libraries --- .cvsignore | 2 +- sources | 2 +- unicap-filter.sh | 4 ++++ unicap.spec | 17 ++++++++++++----- 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 unicap-filter.sh diff --git a/.cvsignore b/.cvsignore index 980f82e..4841f31 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.24.tar.gz +unicap-0.2.23.tar.gz diff --git a/sources b/sources index 547e0c4..6f65583 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz +e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz diff --git a/unicap-filter.sh b/unicap-filter.sh new file mode 100644 index 0000000..16860e6 --- /dev/null +++ b/unicap-filter.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# The original script name has been passed as the first argument: +"$@" | sed -e '/^libdcam.so/d' -e '/^libv4l.so/d' -e '/^libv4l2.so/d' -e '/^libvid21394.so/d' diff --git a/unicap.spec b/unicap.spec index 29b4d6b..1a040f4 100644 --- a/unicap.spec +++ b/unicap.spec @@ -1,11 +1,18 @@ +%define _use_internal_dependency_generator 0 +%{expand:%%define prev__find_provides %{__find_provides}} +%define __find_provides sh %{SOURCE1} %{prev__find_provides} +%{expand:%%define prev__find_requires %{__find_requires}} +%define __find_requires sh %{SOURCE1} %{prev__find_requires} + Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.24 -Release: 1%{?dist} +Version: 0.2.23 +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.unicap-imaging.org/ -Source: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +Source0: http://www.unicap-imaging.org/downloads/%{name}-%{version}.tar.gz +Source1: unicap-filter.sh BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 @@ -65,8 +72,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog -* Sun Jul 27 2008 Robert Scheck 0.2.24-1 -- Upgrade to 0.2.24 +* Tue Aug 05 2008 Robert Scheck 0.2.23-3 +- Filter the unicap plugins which overlap with libv4l libraries * Wed Jul 22 2008 Robert Scheck 0.2.23-2 - Rebuild for libraw1394 2.0.0 From fef02614588a0eb1ebb8822d63d703c32f5b6929 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 13 Oct 2008 22:36:55 +0000 Subject: [PATCH 08/12] Upgrade to 0.2.24 --- .cvsignore | 2 +- sources | 2 +- unicap.spec | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4841f31..980f82e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.23.tar.gz +unicap-0.2.24.tar.gz diff --git a/sources b/sources index 6f65583..547e0c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e82bc6cdd58383051ad942fb6fde8d35 unicap-0.2.23.tar.gz +852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz diff --git a/unicap.spec b/unicap.spec index 1a040f4..2b7cbd6 100644 --- a/unicap.spec +++ b/unicap.spec @@ -6,14 +6,14 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.23 -Release: 3%{?dist} +Version: 0.2.24 +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: unicap-filter.sh -BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext +BuildRequires: intltool, /usr/bin/perl, perl(XML::Parser), gettext, gtk-doc >= 1.4 BuildRequires: glib2-devel, gtk2-devel, pango-devel, libtheora-devel, libXv-devel BuildRequires: libpng-devel, libX11-devel, libICE-devel, libraw1394-devel >= 1.1.0 BuildRequires: libogg-devel, libvorbis-devel, libXext-devel, alsa-lib-devel @@ -72,6 +72,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Mon Oct 23 2008 Robert Scheck 0.2.24-1 +- Upgrade to 0.2.24 + +* Sat Aug 09 2008 Robert Scheck 0.2.23-4 +- Rebuild to get missing dependencies back (#443015, #458527) + * Tue Aug 05 2008 Robert Scheck 0.2.23-3 - Filter the unicap plugins which overlap with libv4l libraries From 09b2b338e15147da2b3b1be55238a21d3d2f0dfe Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 19 Oct 2008 14:20:33 +0000 Subject: [PATCH 09/12] Upgrade to 0.9.3 (#466825, thanks to Hans de Goede) --- .cvsignore | 2 +- sources | 2 +- unicap.spec | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 980f82e..3da85a9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.2.24.tar.gz +unicap-0.9.3.tar.gz diff --git a/sources b/sources index 547e0c4..a9728c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -852302dc0e632e3b489de20bc82d50ac unicap-0.2.24.tar.gz +69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz diff --git a/unicap.spec b/unicap.spec index 2b7cbd6..52edd31 100644 --- a/unicap.spec +++ b/unicap.spec @@ -6,7 +6,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.2.24 +Version: 0.9.3 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -72,8 +72,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog -* Mon Oct 23 2008 Robert Scheck 0.2.24-1 -- Upgrade to 0.2.24 +* Mon Oct 13 2008 Robert Scheck 0.9.3-1 +- Upgrade to 0.9.3 (#466825, thanks to Hans de Goede) * Sat Aug 09 2008 Robert Scheck 0.2.23-4 - Rebuild to get missing dependencies back (#443015, #458527) From 0524046581c22200a32041dc96b504971dce1d27 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 3 May 2009 12:13:38 +0000 Subject: [PATCH 10/12] Upgrade to 0.9.5 --- .cvsignore | 2 +- sources | 2 +- unicap.spec | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3da85a9..bb8ad2f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -unicap-0.9.3.tar.gz +unicap-0.9.5.tar.gz diff --git a/sources b/sources index a9728c9..6ae23c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -69db7c7dacb58c303d44f3b6598653ee unicap-0.9.3.tar.gz +1d64005afac1ec9d75a1637d7f1aa91e unicap-0.9.5.tar.gz diff --git a/unicap.spec b/unicap.spec index 52edd31..539d7a3 100644 --- a/unicap.spec +++ b/unicap.spec @@ -6,7 +6,7 @@ Summary: Library to access different kinds of (video) capture devices Name: unicap -Version: 0.9.3 +Version: 0.9.5 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -72,8 +72,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/* %changelog +* Sun May 03 2009 Robert Scheck 0.9.5-1 +- Upgrade to 0.9.5 + +* Mon Feb 23 2009 Robert Scheck 0.9.3-2 +- Rebuild against gcc 4.4 and rpm 4.6 + * Mon Oct 13 2008 Robert Scheck 0.9.3-1 - Upgrade to 0.9.3 (#466825, thanks to Hans de Goede) +- Enabled libv4l support for the new gspca kernel driver * Sat Aug 09 2008 Robert Scheck 0.2.23-4 - Rebuild to get missing dependencies back (#443015, #458527) From 5a1b95c3a016bcaef36059418096716f46f82c60 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:30 +0000 Subject: [PATCH 11/12] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 20fec0d..383f3ff 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: unicap -# $Id$ +# $Id: Makefile,v 1.1 2008/02/18 17:33:39 kevin Exp $ NAME := unicap SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 2f7cc72f285b634a06eaffad9d06ea2b80497e63 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:42:35 +0000 Subject: [PATCH 12/12] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 383f3ff..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: unicap -# $Id: Makefile,v 1.1 2008/02/18 17:33:39 kevin Exp $ -NAME := unicap -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5