rpm/libdc1394
SHA256
1
0
Fork 0
forked from pool/libdc1394
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdc1394?expand=0&rev=10

Browse Source
This commit is contained in:
OBS User unknown 2008-10-06 15:58:32 +00:00 committed by Git OBS Bridge
parent 7d23a51c6d
commit f8e59c432f
6 changed files with 96 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libdc1394-swab_fix.patch
View File

@ -1,5 +1,9 @@
--- libdc1394-2/dc1394/conversions.c ---
+++ libdc1394-2/dc1394/conversions.c libdc1394-2.0.2/dc1394/conversions.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/libdc1394-2.0.2/dc1394/conversions.c
+++ b/libdc1394-2.0.2/dc1394/conversions.c
@@ -22,11 +22,10 @@ @@ -22,11 +22,10 @@
#include <string.h> #include <string.h>

21
libdc1394.ac.patch
View File

@ -1,6 +1,11 @@
--- libdc1394-2/acinclude.m4 ---
+++ libdc1394-2/acinclude.m4 libdc1394-2.0.2/acinclude.m4 | 4 ++--
@@ -78,7 +78,7 @@ libdc1394-2.0.2/configure.in | 7 +------
2 files changed, 3 insertions(+), 8 deletions(-)
--- a/libdc1394-2.0.2/acinclude.m4
+++ b/libdc1394-2.0.2/acinclude.m4
@@ -78,7 +78,7 @@ AC_DEFUN([DX_REQUIRE_PROG], [
AC_PATH_TOOL([$1], [$2]) AC_PATH_TOOL([$1], [$2])
if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
@ -9,7 +14,7 @@
fi fi
]) ])
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@ test "$DX_FLAG_$1" = "$2" \
# ---------------------------------------------------------- # ----------------------------------------------------------
# Turn off the DX_CURRENT_FEATURE if the required feature is off. # Turn off the DX_CURRENT_FEATURE if the required feature is off.
AC_DEFUN([DX_CLEAR_DEPEND], [ AC_DEFUN([DX_CLEAR_DEPEND], [
@ -18,9 +23,9 @@
]) ])
# DX_FEATURE_ARG(FEATURE, DESCRIPTION, # DX_FEATURE_ARG(FEATURE, DESCRIPTION,
--- libdc1394-2/configure.in --- a/libdc1394-2.0.2/configure.in
+++ libdc1394-2/configure.in +++ b/libdc1394-2.0.2/configure.in
@@ -3,12 +3,6 @@ @@ -3,12 +3,6 @@ AC_PREREQ([2.6.0])
AC_INIT([libdc1394],[2.0.2],[libdc1394-devel@lists.sf.net]) AC_INIT([libdc1394],[2.0.2],[libdc1394-devel@lists.sf.net])
AC_CONFIG_SRCDIR([dc1394/control.c]) AC_CONFIG_SRCDIR([dc1394/control.c])
@ -33,7 +38,7 @@
# #
DX_HTML_FEATURE(OFF) DX_HTML_FEATURE(OFF)
DX_CHM_FEATURE(OFF) DX_CHM_FEATURE(OFF)
@@ -25,6 +19,7 @@ @@ -25,6 +19,7 @@ AM_INIT_AUTOMAKE([--warnings=all 1.9.6])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_PROG_CC AC_PROG_CC

5
libdc1394.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 6 10:15:29 CEST 2008 - olh@suse.de
- fix ordered comparison of pointer with integer zero (bnc#431916)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 19 14:19:30 CEST 2008 - pth@suse.de Thu Jun 19 14:19:30 CEST 2008 - pth@suse.de

15
libdc1394.no-x11.patch
View File

@ -1,5 +1,10 @@
--- libdc1394-2.0.2/libdc1394-1/examples/Makefile.am ---
+++ libdc1394-2.0.2/libdc1394-1/examples/Makefile.am libdc1394-1.2.2/examples/Makefile.am | 2 +-
libdc1394-2.0.2/configure.in | 34 +++++++++++++++++++++-------------
2 files changed, 22 insertions(+), 14 deletions(-)
--- a/libdc1394-1.2.2/examples/Makefile.am
+++ b/libdc1394-1.2.2/examples/Makefile.am
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dc1394_vloopback bin_PROGRAMS = dc1394_vloopback
@ -8,9 +13,9 @@
grab_gray_image_SOURCES = grab_gray_image.c grab_gray_image_SOURCES = grab_gray_image.c
grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
--- libdc1394-2.0.2/libdc1394-2/configure.in --- a/libdc1394-2.0.2/configure.in
+++ libdc1394-2.0.2/libdc1394-2/configure.in +++ b/libdc1394-2.0.2/configure.in
@@ -71,20 +71,28 @@ @@ -71,20 +71,28 @@ AC_SUBST(dc1394platform)
# check for Xv extensions (necessary for examples/dc1394_multiview) # check for Xv extensions (necessary for examples/dc1394_multiview)
# imported from Coriander # imported from Coriander

24
libdc1394.raw1394_set_iso_handler.patch Normal file
View File

@ -0,0 +1,24 @@
Bug 431916 - libdc1394-2.0.0-7: ordered comparison of pointer with integer zero
dc1394_capture.c:441: warning: ordered comparison of pointer with integer zero
---
libdc1394-1.2.2/libdc1394/dc1394_capture.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/libdc1394-1.2.2/libdc1394/dc1394_capture.c
+++ b/libdc1394-1.2.2/libdc1394/dc1394_capture.c
@@ -438,11 +438,11 @@ dc1394_multi_capture(raw1394handle_t han
_dc1394_buffer[cams[i].channel]= cams[i].capture_buffer;
if (raw1394_set_iso_handler(handle,cams[i].channel,
- _dc1394_video_iso_handler) < 0)
+ _dc1394_video_iso_handler) == (iso_handler_t)-1)
{
/* error handling- for some reason something didn't work,
so we have to reset everything....*/
- printf("(%s:%d) error!\n",__FILE__, __LINE__);
+ printf("(%s:%s:%d) error while calling raw1394_set_iso_handler!\n",__FILE__, __func__, __LINE__);
for (j= i - 1; j > -1; j--)
{

63
libdc1394.spec
View File

@ -2,9 +2,16 @@
# spec file for package libdc1394 (Version MACRO) # spec file for package libdc1394 (Version MACRO)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
# #
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# 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 http://bugs.opensuse.org/
# #
@ -19,7 +26,7 @@ License: LGPL v2.1 or later
Group: Hardware/Camera Group: Hardware/Camera
AutoReqProv: on AutoReqProv: on
Version: %{libdc1394_version} Version: %{libdc1394_version}
Release: 9 Release: 10
Url: http://sourceforge.net/projects/libdc1394/ Url: http://sourceforge.net/projects/libdc1394/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
@ -29,6 +36,7 @@ Source3: %{name}-rpmlintrc
Patch0: libdc1394.no-x11.patch Patch0: libdc1394.no-x11.patch
Patch1: libdc1394.ac.patch Patch1: libdc1394.ac.patch
Patch2: libdc1394-swab_fix.patch Patch2: libdc1394-swab_fix.patch
Patch3: libdc1394.raw1394_set_iso_handler.patch
%description %description
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
@ -53,7 +61,7 @@ License: LGPL v2.1 or later
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera Group: Hardware/Camera
Version: %{libdc1394_12_version} Version: %{libdc1394_12_version}
Release: 7 Release: 8
%description -n libdc1394_control12 %description -n libdc1394_control12
This library provides functionality for controlling any camera that This library provides functionality for controlling any camera that
@ -80,7 +88,7 @@ License: LGPL v2.1 or later
Summary: 1394-Based Digital Camera Control Library Summary: 1394-Based Digital Camera Control Library
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Version: %{libdc1394_12_version} Version: %{libdc1394_12_version}
Release: 7 Release: 8
Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel
%description -n libdc1394_control12-devel %description -n libdc1394_control12-devel
@ -153,30 +161,33 @@ Authors:
%prep %prep
%setup -q -T -c -a 1 -a 2 %setup -q -T -c -a 1 -a 2
mv libdc1394-1* libdc1394-1
mv libdc1394-2* libdc1394-2
%patch0 -p1 %patch0 -p1
%patch1 %patch1 -p1
%patch2 %patch2 -p1
%patch3 -p1
%build %build
for i in libdc1394-1 libdc1394-2 doit() {
do if pushd "$1" ; then
cd $i autoreconf --force --install
autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS"
export CFLAGS="$RPM_OPT_FLAGS" %{configure} --disable-xv
%{configure} --disable-xv %{__make} %{?jobs:-j%jobs}
%{__make} %{?jobs:-j%jobs} popd
cd .. fi
done }
doit libdc1394-%{libdc1394_12_version}
doit libdc1394-%{libdc1394_version}
%install %install
for i in libdc1394-1 libdc1394-2 doit() {
do if pushd "$1" ; then
cd $i %{__make} DESTDIR=${RPM_BUILD_ROOT} install
%{__make} DESTDIR=${RPM_BUILD_ROOT} install popd
cd .. fi
done }
doit libdc1394-%{libdc1394_12_version}
doit libdc1394-%{libdc1394_version}
rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1* rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1*
%post -n libdc1394_control12 -p /sbin/ldconfig %post -n libdc1394_control12 -p /sbin/ldconfig
@ -189,7 +200,7 @@ rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README} %doc libdc1394-%{libdc1394_version}/{AUTHORS,COPYING,ChangeLog,NEWS,README}
%_bindir/dc1394_reset_bus %_bindir/dc1394_reset_bus
%{_mandir}/man1/dc1394_reset_bus.1* %{_mandir}/man1/dc1394_reset_bus.1*
@ -217,6 +228,8 @@ rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394
%_libdir/pkgconfig/*.pc %_libdir/pkgconfig/*.pc
%changelog %changelog
* Mon Oct 06 2008 olh@suse.de
- fix ordered comparison of pointer with integer zero (bnc#431916)
* Thu Jun 19 2008 pth@suse.de * Thu Jun 19 2008 pth@suse.de
- Include unistd.h to get prototype for swab. - Include unistd.h to get prototype for swab.
- Update to 2.0.2. Changes since 2.0.0: - Update to 2.0.2. Changes since 2.0.0: