commit camsource for openSUSE:Factory
Hello community,
here is the log from the commit of package camsource for openSUSE:Factory
checked in at 2020-02-09 20:48:43
Comparing /work/SRC/openSUSE:Factory/camsource (Old)
and /work/SRC/openSUSE:Factory/.camsource.new.26092 (New)
Package is "camsource"
Sun Feb 9 20:48:43 2020 rev:24 rq:772316 version:0.7.1
Changes:
--- /work/SRC/openSUSE:Factory/camsource/camsource.changes 2015-07-14
17:44:49.0 +0200
+++ /work/SRC/openSUSE:Factory/.camsource.new.26092/camsource.changes
2020-02-09 20:48:47.854888044 +0100
@@ -1,0 +2,15 @@
+Fri Feb 7 21:07:50 UTC 2020 - David Mair
+
+- The camsource v4l1 module has logic errors opening the video
+ device that incorrectly perform a channel set when a grab window
+ set (frame size, fps, etc) is intended. The error handling from
+ the invalid channel set causes the configuration frame size and
+ fps settings to be discarded and replaced with the current
+ settings active on the video device. The result is that running a
+ v4l(1/2) application on a given camera before using camsource on
+ the same camera means camsource has the grab window attributes
+ from the other application not the one specified in camsource
+ configuration
+- camsource-v4l-conf-video_window-overwrite.patch
+
+---
New:
camsource-v4l-conf-video_window-overwrite.patch
Other differences:
--
++ camsource.spec ++
--- /var/tmp/diff_new_pack.B80dh1/_old 2020-02-09 20:48:48.742888551 +0100
+++ /var/tmp/diff_new_pack.B80dh1/_new 2020-02-09 20:48:48.746888554 +0100
@@ -1,7 +1,7 @@
#
# spec file for package camsource
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -26,12 +26,13 @@
Version:0.7.1
Release:0
Summary:Camsource Grabs Images from a Video4Linux Device
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: Amusements/Toys/Graphics
-Url:http://camsource.sourceforge.net
+URL:http://camsource.sourceforge.net
Source: camsource-%{version}.tar.gz
Source1:camsource-rpmlintrc
Patch0: camsource-no_implicit_decls.diff
+Patch1: camsource-v4l-conf-video_window-overwrite.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -53,6 +54,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
chmod ugo+x configure
%build
++ camsource-v4l-conf-video_window-overwrite.patch ++
>From 03bfd892ee6a6454d92b10d1afd1f86fa0910fba Mon Sep 17 00:00:00 2001
From: David Mair
Date: Fri, 7 Feb 2020 13:39:12 -0700
Subject: [PATCH] opendev() in input_v4l.c functional execution is not
implemented as described by the output messages it can display. One result
is that it reads the configuration width and height settings and prepares
them as the video source settings. But, it makes two unrelated attempts to
set the video device source channel and if the second one succeeds it reads
the current device grab window settings into the same structure it used to
load the configuration, overwriting and losing the configuration. It then
sets the grab window using the value it just got from the same device, i.e.
redundant set device grab window to current grab window. It has the effect
that if:
* Another video application is used before running camsource
- for the device camsource will use
- Uses frame resolution different from that in the camsource configuration
* Then the other application exited
* camsource started
The frame resolution used by camsource will be that set by the other
application and not that in the camsource configuration.
When reading what can be output to the console from the second set channel
it says the "set grab window failed: Trying _again_ without the
fps option" and performs a "set grab window" operation as the supposed
"again" of a set video channel operation (when a full set video channel was
already performed earlier in the code anyway).
I modified the logic to operate as the messaging describes:
* Perform a "get grab window" before loading the configuration
* Load the configuration over the get grab window result
* Perform a "set grab window" with the fps option
* If that "set grab window" fails:
- Perform a
commit camsource for openSUSE:Factory
Hello community,
here is the log from the commit of package camsource for openSUSE:Factory
checked in at 2015-07-14 17:43:42
Comparing /work/SRC/openSUSE:Factory/camsource (Old)
and /work/SRC/openSUSE:Factory/.camsource.new (New)
Package is camsource
Changes:
--- /work/SRC/openSUSE:Factory/camsource/camsource.changes 2015-04-18
10:40:48.0 +0200
+++ /work/SRC/openSUSE:Factory/.camsource.new/camsource.changes 2015-07-14
17:44:49.0 +0200
@@ -1,0 +2,7 @@
+Tue Jul 7 14:38:20 UTC 2015 - meiss...@suse.com
+
+- updated to final 0.7.1 version
+ - new automatic gamma correction
+- camsource-no_implicit_decls.diff: refreshed
+
+---
New:
camsource-rpmlintrc
Other differences:
--
++ camsource.spec ++
--- /var/tmp/diff_new_pack.XR0ixV/_old 2015-07-14 17:44:50.0 +0200
+++ /var/tmp/diff_new_pack.XR0ixV/_new 2015-07-14 17:44:50.0 +0200
@@ -30,7 +30,8 @@
Group: Amusements/Toys/Graphics
Url:http://camsource.sourceforge.net
Source: camsource-%{version}.tar.gz
-Patch1: camsource-no_implicit_decls.diff
+Source1:camsource-rpmlintrc
+Patch0: camsource-no_implicit_decls.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -40,7 +41,7 @@
%package devel
Summary:Camsource Grabs Images from a Video4Linux Device
-Group: Amusements/Toys/Graphics
+Group: Development/Libraries/C and C++
Requires: camsource = %{version}
Provides: camsource:/usr/include/camsource/image.h
@@ -51,7 +52,7 @@
%prep
%setup -q
-%patch1
+%patch0 -p1
chmod ugo+x configure
%build
++ camsource-0.7.1.tar.gz ++
6409 lines of diff (skipped)
++ camsource-no_implicit_decls.diff ++
--- /var/tmp/diff_new_pack.XR0ixV/_old 2015-07-14 17:44:50.0 +0200
+++ /var/tmp/diff_new_pack.XR0ixV/_new 2015-07-14 17:44:50.0 +0200
@@ -1,121 +1,10 @@
-Index: src/flip.c
+Index: camsource-0.7.1/src/rotate.c
===
src/flip.c.orig
-+++ src/flip.c
+--- camsource-0.7.1.orig/src/rotate.c
camsource-0.7.1/src/rotate.c
@@ -1,4 +1,5 @@
#include stdlib.h
+#include string.h
#include libxml/parser.h
-
- #include config.h
-Index: src/image.c
-===
src/image.c.orig
-+++ src/image.c
-@@ -1,7 +1,7 @@
- #include stdlib.h
-+#include string.h
-
- #include config.h
--
- #include image.h
-
- void
-Index: src/jpeg.c
-===
src/jpeg.c.orig
-+++ src/jpeg.c
-@@ -2,6 +2,8 @@
- #include stdio.h
- #include stdlib.h
- #include jpeglib.h
-+#include string.h
-+
- #undef HAVE_STDLIB_H
- #include libxml/parser.h
-
-Index: src/motiondetect.c
-===
src/motiondetect.c.orig
-+++ src/motiondetect.c
-@@ -1,4 +1,5 @@
- #include stdlib.h
-+#include string.h
- #include libxml/parser.h
-
- #include config.h
-Index: src/regrab.c
-===
src/regrab.c.orig
-+++ src/regrab.c
-@@ -1,4 +1,5 @@
- #include stdlib.h
-+#include string.h
- #include libxml/parser.h
-
- #include config.h
-Index: src/resize.c
-===
src/resize.c.orig
-+++ src/resize.c
-@@ -1,4 +1,5 @@
- #include stdio.h
-+#include string.h
- #include libxml/parser.h
-
- #include config.h
-Index: src/rotate.c
-===
src/rotate.c.orig
-+++ src/rotate.c
-@@ -1,4 +1,5 @@
- #include stdlib.h
-+#include string.h
- #include libxml/parser.h
-
- #include config.h
-Index: src/unpalette.c
-===
src/unpalette.c.orig
-+++ src/unpalette.c
-@@ -1,5 +1,6 @@
- #include stdio.h
- #include sys/types.h
-+#include string.h
- #include libv4l1.h
-
- #include config.h
-Index: src/xmlhelp.c
-===
src/xmlhelp.c.orig
-+++ src/xmlhelp.c
-@@ -1,4 +1,5 @@
- #include stdlib.h
-+#include string.h
- #include libxml/parser.h
-
- #include config.h
-Index: src/saturate.c
-===
src/saturate.c.orig
-+++ src/saturate.c
-@@ -23,6 +23,7 @@
- /* saturate.c, Ursprung flip.c Dateien aus pencam2-0.67 */
-
- #include stdlib.h
-+#include string.h
- #include libxml/parser.h
-
- #include config.h
-Index: src/sharpen.c
-===
commit camsource for openSUSE:Factory
Hello community,
here is the log from the commit of package camsource for openSUSE:Factory
checked in at 2015-04-18 10:40:47
Comparing /work/SRC/openSUSE:Factory/camsource (Old)
and /work/SRC/openSUSE:Factory/.camsource.new (New)
Package is camsource
Changes:
--- /work/SRC/openSUSE:Factory/camsource/camsource.changes 2013-01-22
18:17:22.0 +0100
+++ /work/SRC/openSUSE:Factory/.camsource.new/camsource.changes 2015-04-18
10:40:48.0 +0200
@@ -1,0 +2,16 @@
+Mon Dec 1 12:46:50 UTC 2014 - meiss...@suse.com
+
+- updated to 0.7.1
+ - Upgrade the internal v4l driver connection to v4l2
+ - Now able to build correkt Makefile, no manuel action in this case
+required.
+ - Now runs under Raspbian Wheezy in Raspberry PI!
+ - Added function Browser Refresh, configurable via camsource.conf
+ - Add function sharpen (source pencam-2-0.67, via The Gimp),
+configuarable via camsource.conf
+ - Add function saturate (same source), configurable via
+camsource.conf
+- dropped camsource-v4l1.patch: upstream
+- dropped camsource-no_label_at_end.diff: upstream
+
+---
Old:
camsource-0.7.0.tar.gz
camsource-no_label_at_end.diff
camsource-v4l1.patch
New:
camsource-0.7.1.tar.gz
Other differences:
--
++ camsource.spec ++
--- /var/tmp/diff_new_pack.zV044M/_old 2015-04-18 10:40:49.0 +0200
+++ /var/tmp/diff_new_pack.zV044M/_new 2015-04-18 10:40:49.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package camsource
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,19 +23,14 @@
%if 0%{?suse_version} = 1210
BuildRequires: libv4l-devel = 0.8.4
%endif
-Version:0.7.0
+Version:0.7.1
Release:0
Summary:Camsource Grabs Images from a Video4Linux Device
License:GPL-2.0+
Group: Amusements/Toys/Graphics
Url:http://camsource.sourceforge.net
Source: camsource-%{version}.tar.gz
-Patch0: camsource-no_label_at_end.diff
Patch1: camsource-no_implicit_decls.diff
-%if 0%{?suse_version} = 1210
-# PATCH-FIX-UPSTREAM camsource-v4l1.patch [bnc#714439]
-Patch2: camsource-v4l1.patch
-%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -56,17 +51,11 @@
%prep
%setup -q
-%patch0
%patch1
-%if 0%{?suse_version} = 1210
-%patch2 -p1
-%endif
+chmod ugo+x configure
%build
export CFLAGS=%{optflags} -Wall
-%if 0%{?suse_version} = 1210
-autoreconf -fi
-%endif
%configure --disable-static --with-pic
make %{?_smp_mflags}
@@ -76,7 +65,7 @@
%files
%defattr(-,root,root)
-%doc AUTHORS COPYING INSTALL ChangeLog README NEWS camsource.conf.example
+%doc COPYING INSTALL ChangeLog camsource.conf.example
%{_bindir}/camsource
%{_libdir}/camsource
%config(noreplace) %{_sysconfdir}/camsource.conf
++ camsource-0.7.0.tar.gz - camsource-0.7.1.tar.gz ++
116467 lines of diff (skipped)
++ camsource-no_implicit_decls.diff ++
--- /var/tmp/diff_new_pack.zV044M/_old 2015-04-18 10:40:49.0 +0200
+++ /var/tmp/diff_new_pack.zV044M/_new 2015-04-18 10:40:49.0 +0200
@@ -1,4 +1,6 @@
src/flip.c
+Index: src/flip.c
+===
+--- src/flip.c.orig
+++ src/flip.c
@@ -1,4 +1,5 @@
#include stdlib.h
@@ -6,7 +8,9 @@
#include libxml/parser.h
#include config.h
src/image.c
+Index: src/image.c
+===
+--- src/image.c.orig
+++ src/image.c
@@ -1,7 +1,7 @@
#include stdlib.h
@@ -17,7 +21,9 @@
#include image.h
void
src/jpeg.c
+Index: src/jpeg.c
+===
+--- src/jpeg.c.orig
+++ src/jpeg.c
@@ -2,6 +2,8 @@
#include stdio.h
@@ -28,7 +34,9 @@
#undef HAVE_STDLIB_H
#include libxml/parser.h
src/motiondetect.c
+Index: src/motiondetect.c
+===
+--- src/motiondetect.c.orig
+++ src/motiondetect.c
@@ -1,4 +1,5 @@
#include stdlib.h
@@ -36,7 +44,9 @@
#include libxml/parser.h
#include config.h
src/regrab.c
+Index: src/regrab.c
+===
+--- src/regrab.c.orig
+++ src/regrab.c
@@ -1,4 +1,5 @@
#include stdlib.h
@@ -44,7 +54,9 @@
#include libxml/parser.h
#include config.h
src/resize.c
+Index: src/resize.c
commit camsource for openSUSE:Factory
Hello community,
here is the log from the commit of package camsource for openSUSE:Factory
checked in at 2013-01-22 18:17:20
Comparing /work/SRC/openSUSE:Factory/camsource (Old)
and /work/SRC/openSUSE:Factory/.camsource.new (New)
Package is camsource, Maintainer is meiss...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/camsource/camsource.changes 2013-01-20
07:45:59.0 +0100
+++ /work/SRC/openSUSE:Factory/.camsource.new/camsource.changes 2013-01-22
18:17:22.0 +0100
@@ -1,0 +2,9 @@
+Tue Jan 22 08:39:54 UTC 2013 - matwey.korni...@gmail.com
+
+- An alternative fix for bnc#714439, we don't need any wrappers while
+ we can recompile apps from the sources
+- Add camsource-v4l1.patch
+- Drop camsource-v4l-2.6.38.patch
+- Drop camsource-rename.patch
+
+---
Old:
camsource-rename.patch
camsource-v4l-2.6.38.patch
New:
camsource-v4l1.patch
Other differences:
--
++ camsource.spec ++
--- /var/tmp/diff_new_pack.aRWiJT/_old 2013-01-22 18:17:24.0 +0100
+++ /var/tmp/diff_new_pack.aRWiJT/_new 2013-01-22 18:17:24.0 +0100
@@ -22,7 +22,6 @@
BuildRequires: pkgconfig(libxml-2.0)
%if 0%{?suse_version} = 1210
BuildRequires: libv4l-devel = 0.8.4
-Requires: libv4l = 0.8.4
%endif
Version:0.7.0
Release:0
@@ -33,9 +32,9 @@
Source: camsource-%{version}.tar.gz
Patch0: camsource-no_label_at_end.diff
Patch1: camsource-no_implicit_decls.diff
-Patch2: camsource-v4l-2.6.38.patch
%if 0%{?suse_version} = 1210
-Patch3: camsource-rename.patch
+# PATCH-FIX-UPSTREAM camsource-v4l1.patch [bnc#714439]
+Patch2: camsource-v4l1.patch
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -61,7 +60,6 @@
%patch1
%if 0%{?suse_version} = 1210
%patch2 -p1
-%patch3
%endif
%build
@@ -75,22 +73,11 @@
%install
%make_install
mv %{buildroot}%{_sysconfdir}/camsource.conf.example
%{buildroot}%{_sysconfdir}/camsource.conf
-%if 0%{?suse_version} = 1210
-mv %{buildroot}%{_bindir}/camsource %{buildroot}%{_bindir}/camsource.bin
-echo '#!/bin/bash
-export LD_PRELOAD=%{_libdir}/libv4l/v4l1compat.so
-exec %{_bindir}/camsource.bin $@
-' %{buildroot}%{_bindir}/camsource
-chmod --reference=%{buildroot}%{_bindir}/camsource.bin
%{buildroot}%{_bindir}/camsource
-%endif
%files
%defattr(-,root,root)
%doc AUTHORS COPYING INSTALL ChangeLog README NEWS camsource.conf.example
%{_bindir}/camsource
-%if 0%{?suse_version} = 1210
-%{_bindir}/camsource.bin
-%endif
%{_libdir}/camsource
%config(noreplace) %{_sysconfdir}/camsource.conf
++ camsource-v4l-2.6.38.patch - camsource-v4l1.patch ++
--- /work/SRC/openSUSE:Factory/camsource/camsource-v4l-2.6.38.patch
2011-09-23 01:53:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.camsource.new/camsource-v4l1.patch
2013-01-22 18:17:22.0 +0100
@@ -1,49 +1,264 @@
-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
+--- camsource-0.7.0/configure.ac 2003-05-01 14:27:00.0 +0400
camsource-0.7.0.new/configure.ac 2013-01-19 13:23:29.628830443 +0400
@@ -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(libv4l1.h,, [AC_MSG_ERROR([Could not find libv4l1.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.c2011-07-07 11:33:12.969089451 +0200
+@@ -25,6 +25,7 @@
+ AC_CHECK_SIZEOF(long)
+
+ # Libs for main prog
++AC_CHECK_LIB(v4l1, v4l1_open,, [AC_MSG_ERROR([Could not find libv4l1])])
+ AC_CHECK_LIB(dl, dlopen,, [AC_MSG_ERROR([Could not find dynamic link lib])])
+ AC_CHECK_LIB(pthread, pthread_create,, [AC_MSG_ERROR([Could not find posix
thread lib])])
+
+--- camsource-0.7.0/src/input_v4l.c2003-04-21 01:53:35.0 +0400
camsource-0.7.0.new/src/input_v4l.c2013-01-19 13:38:53.060346764
+0400
@@ -3,7 +3,7 @@
#include string.h
#include errno.h
#include libxml/parser.h
-#include linux/videodev.h
-+#include libv4l1-videodev.h
++#include libv4l1.h
#include fcntl.h
#include sys/ioctl.h
#include sys/mman.h
-diff -ur camsource-0.7.0.orig/src/unpalette.c
commit camsource for openSUSE:Factory
Hello community,
here is the log from the commit of package camsource for openSUSE:Factory
checked in at 2013-01-20 07:45:57
Comparing /work/SRC/openSUSE:Factory/camsource (Old)
and /work/SRC/openSUSE:Factory/.camsource.new (New)
Package is camsource, Maintainer is meiss...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/camsource/camsource.changes 2011-10-03
09:14:00.0 +0200
+++ /work/SRC/openSUSE:Factory/.camsource.new/camsource.changes 2013-01-20
07:45:59.0 +0100
@@ -1,0 +2,6 @@
+Sat Jan 19 13:08:56 UTC 2013 - mhruse...@suse.com
+
+- used example as a default configuration file
+- added wrapper around libv4l to make it work again (bnc#714439)
+
+---
New:
camsource-rename.patch
Other differences:
--
++ camsource.spec ++
--- /var/tmp/diff_new_pack.VmREjZ/_old 2013-01-20 07:46:01.0 +0100
+++ /var/tmp/diff_new_pack.VmREjZ/_new 2013-01-20 07:46:01.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package camsource
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -16,24 +16,27 @@
#
-
Name: camsource
BuildRequires: libjpeg-devel
-BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: libtool
+BuildRequires: pkgconfig(libxml-2.0)
%if 0%{?suse_version} = 1210
BuildRequires: libv4l-devel = 0.8.4
+Requires: libv4l = 0.8.4
%endif
Version:0.7.0
-Release:211
-License:GPL-2.0+
+Release:0
Summary:Camsource Grabs Images from a Video4Linux Device
-Url:http://camsource.sourceforge.net
+License:GPL-2.0+
Group: Amusements/Toys/Graphics
+Url:http://camsource.sourceforge.net
Source: camsource-%{version}.tar.gz
Patch0: camsource-no_label_at_end.diff
Patch1: camsource-no_implicit_decls.diff
Patch2: camsource-v4l-2.6.38.patch
+%if 0%{?suse_version} = 1210
+Patch3: camsource-rename.patch
+%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -42,7 +45,6 @@
displaying it via HTTP or FTP upload.
%package devel
-License:GPL-2.0+
Summary:Camsource Grabs Images from a Video4Linux Device
Group: Amusements/Toys/Graphics
Requires: camsource = %{version}
@@ -59,6 +61,7 @@
%patch1
%if 0%{?suse_version} = 1210
%patch2 -p1
+%patch3
%endif
%build
@@ -71,13 +74,25 @@
%install
%make_install
-rm -f %{buildroot}%{_sysconfdir}/camsource.conf.example
+mv %{buildroot}%{_sysconfdir}/camsource.conf.example
%{buildroot}%{_sysconfdir}/camsource.conf
+%if 0%{?suse_version} = 1210
+mv %{buildroot}%{_bindir}/camsource %{buildroot}%{_bindir}/camsource.bin
+echo '#!/bin/bash
+export LD_PRELOAD=%{_libdir}/libv4l/v4l1compat.so
+exec %{_bindir}/camsource.bin $@
+' %{buildroot}%{_bindir}/camsource
+chmod --reference=%{buildroot}%{_bindir}/camsource.bin
%{buildroot}%{_bindir}/camsource
+%endif
%files
%defattr(-,root,root)
%doc AUTHORS COPYING INSTALL ChangeLog README NEWS camsource.conf.example
%{_bindir}/camsource
+%if 0%{?suse_version} = 1210
+%{_bindir}/camsource.bin
+%endif
%{_libdir}/camsource
+%config(noreplace) %{_sysconfdir}/camsource.conf
%files devel
%defattr(-,root,root)
++ camsource-rename.patch ++
Index: src/main.c
===
--- src/main.c.orig
+++ src/main.c
@@ -64,20 +64,20 @@ main(int argc, char **argv)
else {
printf(Camsource version VERSION \n);
printf(Usage:\n);
- printf( %s [configfile]\n, argv[0]);
+ printf( camsource [configfile]\n);
printf( - Starts camsource, optionally with a
certain config file.\n);
- printf( %s {-k | -s} [device]\n, argv[0]);
+ printf( camsource {-k | -s} [device]\n);
printf( - Shuts down (kills) the camsource
instance which has the given\n);
printf( video device opened. If no device is
given, kills all camsource\n);
printf( instances.\n);
- printf( %s -r [device] [configfile]\n, argv[0]);
+ printf( camsource -r [device] [configfile]\n);
printf( - Restarts camsource. This flag combines
a 'camsource -k [device]'\n);
printf(
commit camsource for openSUSE:Factory
Hello community,
here is the log from the commit of package camsource for openSUSE:Factory
checked in at 2011-12-06 18:02:29
Comparing /work/SRC/openSUSE:Factory/camsource (Old)
and /work/SRC/openSUSE:Factory/.camsource.new (New)
Package is camsource, Maintainer is meiss...@suse.com
Changes:
Other differences:
--
++ camsource.spec ++
--- /var/tmp/diff_new_pack.5WnirQ/_old 2011-12-06 18:04:21.0 +0100
+++ /var/tmp/diff_new_pack.5WnirQ/_new 2011-12-06 18:04:21.0 +0100
@@ -26,7 +26,7 @@
%endif
Version:0.7.0
Release:211
-License:GPLv2+
+License:GPL-2.0+
Summary:Camsource Grabs Images from a Video4Linux Device
Url:http://camsource.sourceforge.net
Group: Amusements/Toys/Graphics
@@ -42,7 +42,7 @@
displaying it via HTTP or FTP upload.
%package devel
-License:GPLv2+
+License:GPL-2.0+
Summary:Camsource Grabs Images from a Video4Linux Device
Group: Amusements/Toys/Graphics
Requires: camsource = %{version}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit camsource for openSUSE:Factory
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.0 +0100
+++ /mounts/work_src_done/STABLE/camsource/camsource.changes2011-07-07
11:35:47.0 +0200
@@ -1,0 +2,5 @@
+Thu Jul 7 09:28:09 UTC 2011 - idon...@novell.com
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.42oyu0/_new 2011-08-04 10:31:41.0 +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 d...@gmx.at
-
%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 d...@gmx.at
-
%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.ac2011-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.c2011-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
