Hello community, here is the log from the commit of package camsource for openSUSE:Factory checked in at Thu Aug 4 10:32:23 CEST 2011.
-------- --- camsource/camsource.changes 2009-03-26 15:33:51.000000000 +0100 +++ /mounts/work_src_done/STABLE/camsource/camsource.changes 2011-07-07 11:35:47.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 7 09:28:09 UTC 2011 - [email protected] + +- Add camsource-v4l-2.6.38.patch: use new v4l interface + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- camsource-v4l-2.6.38.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ camsource.spec ++++++ --- /var/tmp/diff_new_pack.42oyu0/_old 2011-08-04 10:31:41.000000000 +0200 +++ /var/tmp/diff_new_pack.42oyu0/_new 2011-08-04 10:31:41.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package camsource (Version 0.7.0) +# spec file for package camsource # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,22 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: camsource -BuildRequires: libjpeg-devel libxml2-devel -Url: http://camsource.sourceforge.net -License: GPL v2 or later -Group: Amusements/Toys/Graphics -#Requires: xforms -AutoReqProv: on +BuildRequires: libjpeg-devel +BuildRequires: pkgconfig(libxml-2.0) +%if 0%{?suse_version} >= 1210 +BuildRequires: libv4l-devel >= 0.8.4 +%endif Version: 0.7.0 -Release: 200 +Release: 211 +License: GPLv2+ Summary: Camsource Grabs Images from a Video4Linux Device +Url: http://camsource.sourceforge.net +Group: Amusements/Toys/Graphics Source: camsource-%{version}.tar.gz -Patch: camsource-no_label_at_end.diff +Patch0: camsource-no_label_at_end.diff Patch1: camsource-no_implicit_decls.diff +Patch2: camsource-v4l-2.6.38.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,56 +40,49 @@ It is modular and has several plug-ins for modifying the image before displaying it via HTTP or FTP upload. - - -Authors: --------- - Richard Fuchs <[email protected]> - %package devel -License: GPL v2 or later +License: GPLv2+ Summary: Camsource Grabs Images from a Video4Linux Device Group: Amusements/Toys/Graphics -Provides: camsource:/usr/include/camsource/image.h Requires: camsource = %{version} -AutoReqProv: on +Provides: camsource:/usr/include/camsource/image.h %description devel Camsource grabs images from a video4linux device (webcam or TV card). It is modular and has several plug-ins for modifying the image before displaying it via HTTP or FTP upload. - - -Authors: --------- - Richard Fuchs <[email protected]> - %prep %setup -q -%patch +%patch0 %patch1 +%if 0%{?suse_version} >= 1210 +%patch2 -p1 +%endif %build export CFLAGS="%{optflags} -Wall" +%if 0%{?suse_version} >= 1210 +autoreconf -fi +%endif %configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/etc/camsource.conf.example +%make_install +rm -f %{buildroot}%{_sysconfdir}/camsource.conf.example %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files %defattr(-,root,root) %doc AUTHORS COPYING INSTALL ChangeLog README NEWS camsource.conf.example -/usr/bin/camsource -%_libdir/camsource +%{_bindir}/camsource +%{_libdir}/camsource %files devel %defattr(-,root,root) -/usr/include/camsource +%{_includedir}/camsource %changelog ++++++ camsource-v4l-2.6.38.patch ++++++ diff -ur camsource-0.7.0.orig/configure.ac camsource-0.7.0/configure.ac --- camsource-0.7.0.orig/configure.ac 2011-07-07 11:32:54.819089455 +0200 +++ camsource-0.7.0/configure.ac 2011-07-07 11:33:12.968089451 +0200 @@ -13,7 +13,7 @@ AC_C_BIGENDIAN AC_HEADER_STDC -AC_CHECK_HEADER(linux/videodev.h,, [AC_MSG_ERROR([Could not find linux/videodev.h])]) +AC_CHECK_HEADER(libv4l1-videodev.h,, [AC_MSG_ERROR([Could not find libv4l1-videodev.h])]) AC_CHECK_HEADER(jpeglib.h,, [AC_MSG_ERROR([Could not find jpeglib.h])]) AC_FUNC_MALLOC diff -ur camsource-0.7.0.orig/src/input_v4l.c camsource-0.7.0/src/input_v4l.c --- camsource-0.7.0.orig/src/input_v4l.c 2011-07-07 11:32:54.821089455 +0200 +++ camsource-0.7.0/src/input_v4l.c 2011-07-07 11:33:12.969089451 +0200 @@ -3,7 +3,7 @@ #include <string.h> #include <errno.h> #include <libxml/parser.h> -#include <linux/videodev.h> +#include <libv4l1-videodev.h> #include <fcntl.h> #include <sys/ioctl.h> #include <sys/mman.h> diff -ur camsource-0.7.0.orig/src/unpalette.c camsource-0.7.0/src/unpalette.c --- camsource-0.7.0.orig/src/unpalette.c 2011-07-07 11:33:02.801089454 +0200 +++ camsource-0.7.0/src/unpalette.c 2011-07-07 11:33:12.969089451 +0200 @@ -1,7 +1,7 @@ #include <stdio.h> #include <sys/types.h> #include <string.h> -#include <linux/videodev.h> +#include <libv4l1-videodev.h> #include "config.h" Only in camsource-0.7.0/src: unpalette.c.orig diff -ur camsource-0.7.0.orig/src/vloopback.c camsource-0.7.0/src/vloopback.c --- camsource-0.7.0.orig/src/vloopback.c 2011-07-07 11:32:54.821089455 +0200 +++ camsource-0.7.0/src/vloopback.c 2011-07-07 11:33:12.969089451 +0200 @@ -3,7 +3,7 @@ #include <stdio.h> #include <fcntl.h> #include <sys/ioctl.h> -#include <linux/videodev.h> +#include <libv4l1-videodev.h> #include <memory.h> #include "config.h" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
