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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/camsource/camsource.changes 2011-10-03 09:14:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.camsource.new/camsource.changes 2013-01-20 07:45:59.000000000 +0100 @@ -1,0 +2,6 @@ +Sat Jan 19 13:08:56 UTC 2013 - [email protected] + +- 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.000000000 +0100 +++ /var/tmp/diff_new_pack.VmREjZ/_new 2013-01-20 07:46:01.000000000 +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(" call with a 'camsource [configfile]' call. Both arguments are\n"); printf(" optional.\n"); - printf(" %s -c [configfile]\n", argv[0]); + printf(" camsource -c [configfile]\n"); printf(" - Loads the specified (or default) config file, and dumps the\n"); printf(" capabilities for each specified grabbing device, then exits.\n"); - printf(" %s -h\n", argv[0]); + printf(" camsource -h\n"); printf(" - Shows this text.\n"); exit(0); } @@ -192,7 +192,7 @@ kill_camsource(struct stat *sp) fclose(fp); if (ret != 1) continue; - if (strcmp(buf, "(camsource)")) + if (strcmp(buf, "(camsource.bin)")) continue; if (sp) { snprintf(buf, sizeof(buf) - 1, "/proc/%s/fd", de->d_name); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
