diff --git a/libdc1394-2.0.2.tar.bz2 b/libdc1394-2.0.2.tar.bz2 deleted file mode 100644 index b0727d7..0000000 --- a/libdc1394-2.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:237458083e912463fcdb092f64229d1636ea19be7ab6bc846588466ece3836b9 -size 415527 diff --git a/libdc1394-2.1.2.tar.bz2 b/libdc1394-2.1.2.tar.bz2 new file mode 100644 index 0000000..5473442 --- /dev/null +++ b/libdc1394-2.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1caf80535bb56219f80c558429c79810c1f35bbcda6a9f5a64d610d18f5721fa +size 428685 diff --git a/libdc1394-swab_fix.patch b/libdc1394-swab_fix.patch index 79786e7..c0a28aa 100644 --- a/libdc1394-swab_fix.patch +++ b/libdc1394-swab_fix.patch @@ -2,8 +2,8 @@ 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 +--- a/libdc1394-2.1.2/dc1394/conversions.c ++++ b/libdc1394-2.1.2/dc1394/conversions.c @@ -22,11 +22,10 @@ #include diff --git a/libdc1394.ac.patch b/libdc1394.ac.patch index 5f294b2..86f30ff 100644 --- a/libdc1394.ac.patch +++ b/libdc1394.ac.patch @@ -1,33 +1,8 @@ ---- - libdc1394-2.0.2/acinclude.m4 | 4 ++-- - 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]) - if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then - AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION]) -- AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) -+ AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0) - fi - ]) +--- a/libdc1394-2.1.2/configure.in 2009-11-23 10:11:16.000000000 +0300 ++++ b/libdc1394-2.1.2/configure.in 2009-11-23 10:11:51.000000000 +0300 +@@ -5,12 +5,6 @@ -@@ -101,7 +101,7 @@ test "$DX_FLAG_$1" = "$2" \ - # ---------------------------------------------------------- - # Turn off the DX_CURRENT_FEATURE if the required feature is off. - AC_DEFUN([DX_CLEAR_DEPEND], [ --test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0) -+test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0) - ]) - - # DX_FEATURE_ARG(FEATURE, DESCRIPTION, ---- a/libdc1394-2.0.2/configure.in -+++ b/libdc1394-2.0.2/configure.in -@@ -3,12 +3,6 @@ AC_PREREQ([2.6.0]) - AC_INIT([libdc1394],[2.0.2],[libdc1394-devel@lists.sf.net]) - AC_CONFIG_SRCDIR([dc1394/control.c]) + AC_CANONICAL_SYSTEM -case "$host" in -*-*-cygwin* | *-*-mingw*) @@ -38,7 +13,7 @@ # DX_HTML_FEATURE(OFF) DX_CHM_FEATURE(OFF) -@@ -25,6 +19,7 @@ AM_INIT_AUTOMAKE([--warnings=all 1.9.6]) +@@ -27,6 +21,7 @@ AC_CONFIG_HEADERS([config.h]) AC_PROG_CC diff --git a/libdc1394.changes b/libdc1394.changes index 93bba00..411f2fd 100644 --- a/libdc1394.changes +++ b/libdc1394.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Sun Dec 27 19:06:15 MSK 2009 - matwey.kornilov@gmail.com + +- Update to 2.1.2. + - IIDC-over-USB support + - Bug fixes: + bayer conversion problem for 16bit over MONO16 + dc1394_deinterlace_stereo_frames (LP#360520) + - Bug fixes on Linux Juju: + missing frames with OHCI 1.0 + automatic iso allocation + timestamp support + broadcasting + +------------------------------------------------------------------- +Mon Nov 23 09:48:55 MSK 2009 - matwey.kornilov@gmail.com + +- Update to 2.0.3. Changes since 2.0.2: + - Bug fixes on MSW port + - Bug fixes: + dc1394_trigger_get_polarity + dc1394_deinterlace_stereo_frames + - Bug fixes on Linux Juju: + - alignment problem during reads + - Bug fixes on Mac OS: + - crash fix for Mac OS 10.4 + ------------------------------------------------------------------- Tue Jan 13 17:07:56 CET 2009 - crrodriguez@suse.de diff --git a/libdc1394.no-x11.patch b/libdc1394.no-x11.patch index 65132c0..e94c50b 100644 --- a/libdc1394.no-x11.patch +++ b/libdc1394.no-x11.patch @@ -13,10 +13,10 @@ grab_gray_image_SOURCES = grab_gray_image.c grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 ---- a/libdc1394-2.0.2/configure.in -+++ b/libdc1394-2.0.2/configure.in -@@ -71,20 +71,28 @@ AC_SUBST(dc1394platform) - +--- a/libdc1394-2.1.2/configure.in ++++ b/libdc1394-2.1.2/configure.in +@@ -79,21 +79,30 @@ + # check for Xv extensions (necessary for examples/dc1394_multiview) # imported from Coriander +AC_ARG_ENABLE([xv], @@ -24,20 +24,21 @@ + [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 -- #include ]], [[ -- 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 +- #include ]], [[ +- 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="" +- fi +- AM_CONDITIONAL(HAVE_XV, test x$xv = xyes) ++ if test x$test_xv != "xno"; then + AC_SUBST(XV_CFLAGS) + AC_SUBST(XV_LIBS) + AC_MSG_CHECKING(for Xv extensions) @@ -52,8 +53,10 @@ + 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) ++ else ++ xv=no ++ fi ++ AM_CONDITIONAL(HAVE_XV, test x$xv = xyes) ]) + AC_CHECK_XV + diff --git a/libdc1394.spec b/libdc1394.spec index aea0905..a527659 100644 --- a/libdc1394.spec +++ b/libdc1394.spec @@ -1,5 +1,5 @@ # -# spec file for package libdc1394 (Version MACRO) +# spec file for package libdc1394 (Version 2.1.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,13 +20,17 @@ Name: libdc1394 %define libdc1394_12_version 1.2.2 -%define libdc1394_version 2.0.2 +%define libdc1394_version 2.1.2 BuildRequires: libraw1394-devel -License: LGPL v2.1 or later +%if 0%{?suse_version} > 1100 +# no IIDC-over-USB support for openSUSE 11.0 +BuildRequires: libusb-1_0-devel pkg-config +%endif +License: LGPLv2.1+ Group: Hardware/Camera AutoReqProv: on Version: %{libdc1394_version} -Release: 11 +Release: 1 Url: http://sourceforge.net/projects/libdc1394/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: 1394-Based Digital Camera Control Library @@ -57,7 +61,7 @@ Authors: John Stanley %package -n libdc1394_control12 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera Version: %{libdc1394_12_version} @@ -84,7 +88,7 @@ Authors: John Stanley %package -n libdc1394_control12-devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Development/Libraries/C and C++ Version: %{libdc1394_12_version} @@ -112,7 +116,7 @@ Authors: John Stanley %package 22 -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera @@ -137,7 +141,7 @@ Authors: John Stanley %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ Requires: libdc1394-22 = %{libdc1394_version} @@ -182,13 +186,15 @@ doit libdc1394-%{libdc1394_version} %install doit() { if pushd "$1" ; then - %{__make} DESTDIR=${RPM_BUILD_ROOT} install + %{__make} DESTDIR=${RPM_BUILD_ROOT} install-strip popd fi } doit libdc1394-%{libdc1394_12_version} doit libdc1394-%{libdc1394_version} rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1* +rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1* +rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* %{__rm} -f %{buildroot}%{_libdir}/*.la %post -n libdc1394_control12 -p /sbin/ldconfig @@ -225,97 +231,3 @@ rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394 %_libdir/pkgconfig/*.pc %changelog -* Tue Jan 13 2009 crrodriguez@suse.de -- remove static libraries and "la" files -* Mon Oct 06 2008 olh@suse.de -- fix ordered comparison of pointer with integer zero (bnc#431916) -* 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 -- remove buildrequires for xorg-x11-devel -* Tue Jan 15 2008 olh@suse.de -- libdc1394-devel requires libdc1394-22 -* Mon Jan 14 2008 olh@suse.de -- update to 2.0.0 final - rename libdc1394-20 to libdc1394-22 due to SONAME change -* Thu Aug 16 2007 olh@suse.de -- libdc1394_control12-devel needs libraw1394-devel -* Thu Aug 16 2007 olh@suse.de -- remove inclusion of code which is labeled as GPL (298152) - removes topology.h, cooked1394_read() and others - remove dc1394_vloopback binary -* Sun Aug 05 2007 olh@suse.de -- split libdc1394-20 package which contains only libraries - split libdc1394_control12 and libdc1394_control12-devel - upgrade to 1.2.2, color filter fix -* Fri Jul 13 2007 olh@suse.de -- update to 2.0.0-rc7 - API fixes -* Tue Aug 15 2006 olh@suse.de -- update to 2.0.0-rc3 (#198102) - all new API -- keep old library version until every app is converted -* Wed Jul 19 2006 olh@suse.de -- update to 1.2.1 - replaced camera version detection in dc1394_is_camera() by a - proper call to dc1394_get_sw_version(). - fixed compilation warnings due to mixed signedness in the whole code. - fixed a serious bug in the camera detection. - updated TRIGGER_MODE_NUM definition -* Wed Jan 25 2006 mls@suse.de -- converted neededforbuild to BuildRequires -* Fri Oct 21 2005 olh@suse.de -- correct usage of CLK_TCK -- update to current cvs - fixed memory leak in capture functions (dma device name not freed) - fixed trigger capabilities detection (Markus Niebel) - fixed some confusion between raw1394_new_handle and dc1394_create_handle - (Thanks to Thorondor) -* Mon Sep 26 2005 mls@suse.de -- make devel package require base package -* Tue Jul 05 2005 olh@suse.de -- go back to version 1, version 2 still needs some time -* Fri Jul 01 2005 olh@suse.de -- update to version 2.0.0-pre3 -* Fri Jul 01 2005 olh@suse.de -- update to version 1.1.0 -* Thu Jan 13 2005 olh@suse.de -- update to version 1.0.0, cvs status 2004-11-12 -* Tue Jan 11 2005 olh@suse.de -- update to version 1.0.0 -* Mon Mar 08 2004 lmuelle@suse.de -- update to version 0.9.3 -- create devel sub package -* Wed Jan 07 2004 lmuelle@suse.de -- update to version 0.9.2 -* Mon Jul 28 2003 adrian@suse.de -- fix lib filename suffix -* Fri Jul 25 2003 adrian@suse.de -- update to version 0.9.1 -- use BuildRoot -- add %%run_ldconfig -* Fri Sep 27 2002 uli@suse.de -- initial package