pool/libdc1394
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2008-06-25 18:45:42 +00:00 committed by Git OBS Bridge
parent 1445d63760
commit 7d23a51c6d
8 changed files with 141 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libdc1394-2.0.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9e7729d2aba0a9b7c83a92e23035549a439d1f2b597dd88b69e53e35c1f791ac
size 378714

3
libdc1394-2.0.2.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:237458083e912463fcdb092f64229d1636ea19be7ab6bc846588466ece3836b9
size 415527

5
libdc1394-rpmlintrc Normal file
View File

@ -0,0 +1,5 @@
# This line is mandatory to access the configuration functions
from Config import *
addFilter("libdc1394.* package-with-huge-docs.*")
addFilter("libdc1394.* shlib-policy-missing-lib.*")

16
libdc1394-swab_fix.patch Normal file
View File

@ -0,0 +1,16 @@
--- libdc1394-2/dc1394/conversions.c
+++ libdc1394-2/dc1394/conversions.c
@@ -22,11 +22,10 @@
#include <string.h>
#include <stdlib.h>
+#define _XOPEN_SOURCE
+#include <unistd.h>
#include "conversions.h"
-// this should disappear...
-extern void swab();
-
/**********************************************************************
*
* CONVERSION FUNCTIONS TO YUV422

16
libdc1394.ac.patch
View File

@ -1,6 +1,6 @@
--- libdc1394-2/acinclude.m4
+++ libdc1394-2/acinclude.m4
@@ -78,7 +78,7 @@ AC_DEFUN([DX_REQUIRE_PROG], [
@@ -78,7 +78,7 @@
AC_PATH_TOOL([$1], [$2])
if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
@ -9,7 +9,7 @@
fi
])
@@ -101,7 +101,7 @@ test "$DX_FLAG_$1" = "$2" \
@@ -101,7 +101,7 @@
# ----------------------------------------------------------
# Turn off the DX_CURRENT_FEATURE if the required feature is off.
AC_DEFUN([DX_CLEAR_DEPEND], [
@ -20,8 +20,8 @@
# DX_FEATURE_ARG(FEATURE, DESCRIPTION,
--- libdc1394-2/configure.in
+++ libdc1394-2/configure.in
@@ -3,12 +3,6 @@ AC_PREREQ([2.6.0])
AC_INIT([libdc1394],[2.0.0],[libdc1394-devel@lists.sf.net])
@@ -3,12 +3,6 @@
AC_INIT([libdc1394],[2.0.2],[libdc1394-devel@lists.sf.net])
AC_CONFIG_SRCDIR([dc1394/control.c])
-case "$host" in
@ -33,11 +33,11 @@
#
DX_HTML_FEATURE(OFF)
DX_CHM_FEATURE(OFF)
@@ -27,6 +21,7 @@ AC_CONFIG_HEADERS([config.h])
@@ -25,6 +19,7 @@
AC_CONFIG_HEADERS([config.h])
AC_PROG_CC
+AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AM_PROG_CC_C_O
+AC_LIBTOOL_WIN32_DLL
# check if the 'restrict' prefix is supported
AC_C_RESTRICT

28
libdc1394.changes
View File

@ -1,3 +1,31 @@
-------------------------------------------------------------------
Thu Jun 19 14:19:30 CEST 2008 - pth@suse.de
- Include unistd.h to get prototype for swab.
- Update to 2.0.2. Changes since 2.0.0:
- New functions on all platforms:
dc1394_camera_get_node
dc1394_capture_is_frame_corrupt
- New function on Linux video1394 only:
dc1394_camera_get_linux_port
- New example program to capture PVN sequences.
- Bug fixes on Linux Juju:
- Better retry timeouts
- Fix manual isochronous channel allocation
- Bug fixes on Mac OS:
- Auto detection of bad or skipped packets (used for
dc1394_capture_is_frame_corrupt)
- Bug fixes on Linux video1394:
- Fix select() with multiple cameras on the same controller
- Handle EINTR return code properly in dc1394_capture_dequeue
- Better error detection if camera enumeration fails
- Documentation improvements
-- 2.0.1:
- Fixed broken dc1394/dc1394.h include file when compiling externally.
- Removed the "edge-sense" bayer demosaic algorithm out of patent concern.
-------------------------------------------------------------------
Fri Apr 11 16:13:18 CEST 2008 - schwab@suse.de

63
libdc1394.no-x11.patch
View File

@ -1,10 +1,5 @@
---
libdc1394-1.2.2/examples/Makefile.am | 2 +-
libdc1394-2.0.0/examples/Makefile.am | 3 ---
2 files changed, 1 insertion(+), 4 deletions(-)
--- a/libdc1394-1/examples/Makefile.am
+++ b/libdc1394-1/examples/Makefile.am
--- libdc1394-2.0.2/libdc1394-1/examples/Makefile.am
+++ libdc1394-2.0.2/libdc1394-1/examples/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
bin_PROGRAMS = dc1394_vloopback
@ -13,15 +8,47 @@
grab_gray_image_SOURCES = grab_gray_image.c
grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394
--- a/libdc1394-2/examples/Makefile.am
+++ b/libdc1394-2/examples/Makefile.am
@@ -8,9 +8,6 @@ B = dc1394_reset_bus
--- libdc1394-2.0.2/libdc1394-2/configure.in
+++ libdc1394-2.0.2/libdc1394-2/configure.in
@@ -71,20 +71,28 @@
if USE_LINUX
B += dc1394_vloopback
-if XVOK
-A += dc1394_multiview
-endif
endif
noinst_PROGRAMS = $(A)
# check for Xv extensions (necessary for examples/dc1394_multiview)
# imported from Coriander
+AC_ARG_ENABLE([xv],
+ AS_HELP_STRING([--disable-xv], [Disable the check for Xv extensions]),
+ [test_xv=yes], [test_xv=no])
+
AC_DEFUN([AC_CHECK_XV],[
- AC_SUBST(XV_CFLAGS)
- AC_SUBST(XV_LIBS)
- AC_MSG_CHECKING(for Xv extensions)
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <X11/Xlib.h>
- #include <X11/extensions/Xvlib.h>]], [[
- int main(void) { (void) XvGetPortAttribute(0, 0, 0, 0); return 0; }
- ]])],[xv=yes],[xv=no]);
- AC_MSG_RESULT($xv)
- if test x$xv = xyes; then
- XV_LIBS="-lXv -lXext"
- XV_CFLAGS=""
- AC_DEFINE(HAVE_XV,1,[defined if XV video overlay is available])
+ if test x$test_xv != "xno"; then
+ AC_SUBST(XV_CFLAGS)
+ AC_SUBST(XV_LIBS)
+ AC_MSG_CHECKING(for Xv extensions)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #include <X11/Xlib.h>
+ #include <X11/extensions/Xvlib.h>]], [[
+ int main(void) { (void) XvGetPortAttribute(0, 0, 0, 0); return 0; }
+ ]])],[xv=yes],[xv=no]);
+ AC_MSG_RESULT($xv)
+ if test x$xv = xyes; then
+ XV_LIBS="-lXv -lXext"
+ XV_CFLAGS=""
+ AC_DEFINE(HAVE_XV,1,[defined if XV video overlay is available])
+ fi
+ else
+ xv=no
fi
AM_CONDITIONAL(XVOK, test x$xv = xyes)
])

48
libdc1394.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package libdc1394 (Version 0)
# spec file for package libdc1394 (Version MACRO)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@ -13,20 +13,22 @@
Name: libdc1394
%define libdc1394_12_version 1.2.2
%define libdc1394_version 2.0.0
%define libdc1394_version 2.0.2
BuildRequires: libraw1394-devel
License: LGPL v2.1 or later
Group: Hardware/Camera
AutoReqProv: on
Version: %{libdc1394_version}
Release: 1
Release: 9
Url: http://sourceforge.net/projects/libdc1394/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: 1394-Based Digital Camera Control Library
Source1: libdc1394-%{libdc1394_12_version}.tar.bz2
Source2: libdc1394-%{libdc1394_version}.tar.bz2
Source3: %{name}-rpmlintrc
Patch0: libdc1394.no-x11.patch
Patch1: libdc1394.ac.patch
Patch2: libdc1394-swab_fix.patch
%description
This library provides functionality for controlling any camera that
@ -51,7 +53,7 @@ License: LGPL v2.1 or later
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
Version: %{libdc1394_12_version}
Release: 1
Release: 7
%description -n libdc1394_control12
This library provides functionality for controlling any camera that
@ -76,9 +78,9 @@ Authors:
%package -n libdc1394_control12-devel
License: LGPL v2.1 or later
Summary: 1394-Based Digital Camera Control Library
Group: Hardware/Camera
Group: Development/Libraries/C and C++
Version: %{libdc1394_12_version}
Release: 1
Release: 7
Requires: libdc1394_control12 = %{libdc1394_12_version} libraw1394-devel
%description -n libdc1394_control12-devel
@ -155,17 +157,15 @@ mv libdc1394-1* libdc1394-1
mv libdc1394-2* libdc1394-2
%patch0 -p1
%patch1
%patch2
%build
for i in libdc1394-1 libdc1394-2
do
cd $i
autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS" \
./configure \
--prefix=/usr \
--libdir=%_libdir \
--mandir=%_mandir
export CFLAGS="$RPM_OPT_FLAGS"
%{configure} --disable-xv
%{__make} %{?jobs:-j%jobs}
cd ..
done
@ -177,7 +177,7 @@ do
%{__make} DESTDIR=${RPM_BUILD_ROOT} install
cd ..
done
rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1*
%post -n libdc1394_control12 -p /sbin/ldconfig
@ -191,6 +191,7 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
%defattr(-,root,root)
%doc libdc1394-2/{AUTHORS,COPYING,ChangeLog,NEWS,README}
%_bindir/dc1394_reset_bus
%{_mandir}/man1/dc1394_reset_bus.1*
%files 22
%defattr(-,root,root)
@ -216,6 +217,29 @@ rm -f $RPM_BUILD_ROOT%_bindir/dc1394_vloopback
%_libdir/pkgconfig/*.pc
%changelog
* Thu Jun 19 2008 pth@suse.de
- Include unistd.h to get prototype for swab.
- Update to 2.0.2. Changes since 2.0.0:
- New functions on all platforms:
dc1394_camera_get_node
dc1394_capture_is_frame_corrupt
- New function on Linux video1394 only:
dc1394_camera_get_linux_port
- New example program to capture PVN sequences.
- Bug fixes on Linux Juju:
- Better retry timeouts
- Fix manual isochronous channel allocation
- Bug fixes on Mac OS:
- Auto detection of bad or skipped packets (used for
dc1394_capture_is_frame_corrupt)
- Bug fixes on Linux video1394:
- Fix select() with multiple cameras on the same controller
- Handle EINTR return code properly in dc1394_capture_dequeue
- Better error detection if camera enumeration fails
- Documentation improvements
-- 2.0.1:
- Fixed broken dc1394/dc1394.h include file when compiling externally.
- Removed the "edge-sense" bayer demosaic algorithm out of patent concern.
* Fri Apr 11 2008 schwab@suse.de
- Fix configure script.
* Thu Jan 24 2008 olh@suse.de