Hello community, here is the log from the commit of package libdc1394 for openSUSE:Factory checked in at 2011-11-18 15:45:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdc1394 (Old) and /work/SRC/openSUSE:Factory/.libdc1394.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdc1394", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libdc1394/libdc1394.changes 2011-11-14 12:00:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdc1394.new/libdc1394.changes 2011-11-18 15:46:13.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 17 22:31:02 MSK 2011 - [email protected] +- Update to 2.1.4. + - Allow image buffers to be editable by client apps on Linux juju + - Correct error in downsample bayer function + - Rename poorly named externally-visible symbol usb_init + (meanwhile libdc1394-visibility.patch is still kept) +------------------------------------------------------------------- Old: ---- libdc1394-2.1.3.tar.bz2 New: ---- libdc1394-2.1.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdc1394.spec ++++++ --- /var/tmp/diff_new_pack.RkfVPV/_old 2011-11-18 15:46:18.000000000 +0100 +++ /var/tmp/diff_new_pack.RkfVPV/_new 2011-11-18 15:46:18.000000000 +0100 @@ -21,7 +21,7 @@ Name: libdc1394 %define libdc1394_12_version 1.2.2 -%define libdc1394_version 2.1.3 +%define libdc1394_version 2.1.4 BuildRequires: libraw1394-devel BuildRequires: libtool %if 0%{?suse_version} > 1100 ++++++ libdc1394-2.1.3.tar.bz2 -> libdc1394-2.1.4.tar.bz2 ++++++ ++++ 69031 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/ChangeLog new/libdc1394-2.1.4/ChangeLog --- old/libdc1394-2.1.3/ChangeLog 2011-01-03 05:09:14.000000000 +0100 +++ new/libdc1394-2.1.4/ChangeLog 2011-11-16 07:49:48.000000000 +0100 @@ -1,3 +1,17 @@ +2011-11-15 David Moore <[email protected]> + * Update NEWS and version for release 2.1.4. + +2011-08-28 Damien Douxchamps http://damien.douxchamps.net/ + * Add PROT_WRITE for DMA buffers under juju. + +2011-08-21 Damien Douxchamps http://damien.douxchamps.net/ + * Fix SF patch 3298986 (downsample bayer function error) + * Fix usb_init function name (-> dc1394_usb_init) + * Fix missing "#ifdef __cplusplus". (SF patch 2655785) + +2011-03-27 David Moore <[email protected]> + * Conditionally compile dc1394_vloopback only when linux/video.h exists + 2011-01-02 David Moore <[email protected]> * dc1394/conversions.h: Fix typo in DC1394_STEREO_METHOD_MIN * Update NEWS, README, AUTHORS and version for release 2.1.3. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/NEWS new/libdc1394-2.1.4/NEWS --- old/libdc1394-2.1.3/NEWS 2011-01-03 05:04:36.000000000 +0100 +++ new/libdc1394-2.1.4/NEWS 2011-11-16 07:48:45.000000000 +0100 @@ -1,6 +1,13 @@ Release information and news: ----------------------------- +-- 2.1.4 + - Bug fixes: + - Allow image buffers to be editable by client apps on Linux juju + - Correct error in downsample bayer function + - Rename poorly named externally-visible symbol usb_init + - Fix misc. compilation errors + -- 2.1.3: - Bug fixes: - Fix for usb writes larger than 1 quadlet diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/config.h.in new/libdc1394-2.1.4/config.h.in --- old/libdc1394-2.1.3/config.h.in 2011-01-03 05:13:46.000000000 +0100 +++ new/libdc1394-2.1.4/config.h.in 2011-11-16 07:51:09.000000000 +0100 @@ -51,6 +51,9 @@ /* Define to 1 if you have the <sys/mman.h> header file. */ #undef HAVE_SYS_MMAN_H +/* Define to 1 if you have the <sys/param.h> header file. */ +#undef HAVE_SYS_PARAM_H + /* Define to 1 if you have the <sys/stat.h> header file. */ #undef HAVE_SYS_STAT_H @@ -63,6 +66,10 @@ /* Defined if compiled for Windows */ #undef HAVE_WINDOWS +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#undef LT_OBJDIR + /* Define to 1 if your C compiler doesn't accept -c and -o together. */ #undef NO_MINUS_C_MINUS_O @@ -81,6 +88,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION @@ -97,13 +107,14 @@ nothing if this is not supported. Do not define if restrict is supported directly. */ #undef restrict -/* Work around a bug in Sun C++: it does not support _Restrict, even - though the corresponding Sun C compiler does, which causes - "#define restrict _Restrict" in the previous line. Perhaps some future - version of Sun C++ will work with _Restrict; if so, it'll probably - define __RESTRICT, just as Sun C does. */ +/* Work around a bug in Sun C++: it does not support _Restrict or + __restrict__, even though the corresponding Sun C compiler ends up with + "#define restrict _Restrict" or "#define restrict __restrict__" in the + previous line. Perhaps some future version of Sun C++ will work with + restrict; if so, hopefully it defines __RESTRICT like Sun C does. */ #if defined __SUNPRO_CC && !defined __RESTRICT # define _Restrict +# define __restrict__ #endif /* Define to `unsigned int' if <sys/types.h> does not define. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/configure.in new/libdc1394-2.1.4/configure.in --- old/libdc1394-2.1.3/configure.in 2011-01-03 05:12:36.000000000 +0100 +++ new/libdc1394-2.1.4/configure.in 2011-11-16 07:43:33.000000000 +0100 @@ -1,6 +1,6 @@ # process this file with autoconf to get a configure script AC_PREREQ([2.6.0]) -AC_INIT([libdc1394],[2.1.3],[[email protected]]) +AC_INIT([libdc1394],[2.1.4],[[email protected]]) AC_CONFIG_SRCDIR([dc1394/control.c]) AC_CANONICAL_SYSTEM @@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_LIBRAW1394, test x$libraw1394 = xtrue) AM_CONDITIONAL(HAVE_LIBUSB, test "x$LIBUSB_LIBS" != "x") +AC_CHECK_HEADER([linux/videodev.h], [have_videodev=true]) +AM_CONDITIONAL(HAVE_VIDEODEV, test x$have_videodev = xtrue) + AC_ARG_ENABLE([examples], [AS_HELP_STRING([--disable-examples], [don't build example programs])], [build_examples=$enableval], [build_examples=true]) AM_CONDITIONAL(MAKE_EXAMPLES, test x$build_examples = xtrue) @@ -117,7 +120,7 @@ dnl 4. If the interface has removed or changed elements, set AGE to 0. dnl --------------------------------------------------------------------------- lt_current=23 -lt_revision=5 +lt_revision=6 lt_age=1 AC_SUBST(lt_current) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/dc1394/bayer.c new/libdc1394-2.1.4/dc1394/bayer.c --- old/libdc1394-2.1.3/dc1394/bayer.c 2009-05-25 08:49:17.000000000 +0200 +++ new/libdc1394-2.1.4/dc1394/bayer.c 2011-11-16 07:11:04.000000000 +0100 @@ -536,7 +536,7 @@ for (j = 0; j < sx; j += 2) { tmp = ((bayer[i + j] + bayer[i + sx + j + 1]) >> 1); CLIP(tmp, outG[((i >> 2) + (j >> 1)) * 3]); - tmp = bayer[i + sx + j + 1]; + tmp = bayer[i + j + 1]; CLIP(tmp, outR[((i >> 2) + (j >> 1)) * 3]); tmp = bayer[i + sx + j]; CLIP(tmp, outB[((i >> 2) + (j >> 1)) * 3]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/dc1394/control.c new/libdc1394-2.1.4/dc1394/control.c --- old/libdc1394-2.1.3/dc1394/control.c 2009-06-11 05:28:14.000000000 +0200 +++ new/libdc1394-2.1.4/dc1394/control.c 2011-11-16 07:11:04.000000000 +0100 @@ -1955,7 +1955,7 @@ windows_init (d); #endif #ifdef HAVE_LIBUSB - usb_init (d); + dc1394_usb_init (d); #endif int i; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/dc1394/internal.h new/libdc1394-2.1.4/dc1394/internal.h --- old/libdc1394-2.1.3/dc1394/internal.h 2009-05-25 08:49:17.000000000 +0200 +++ new/libdc1394-2.1.4/dc1394/internal.h 2011-11-16 07:11:04.000000000 +0100 @@ -74,7 +74,7 @@ void linux_init(dc1394_t *d); void macosx_init(dc1394_t *d); void windows_init(dc1394_t *d); -void usb_init(dc1394_t *d); +void dc1394_usb_init(dc1394_t *d); void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch, const char * name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/dc1394/juju/capture.c new/libdc1394-2.1.4/dc1394/juju/capture.c --- old/libdc1394-2.1.3/dc1394/juju/capture.c 2009-05-26 08:29:02.000000000 +0200 +++ new/libdc1394-2.1.4/dc1394/juju/capture.c 2011-11-16 07:11:04.000000000 +0100 @@ -190,7 +190,7 @@ craw->current = -1; craw->buffer_size = proto.total_bytes * num_dma_buffers; craw->buffer = - mmap(NULL, craw->buffer_size, PROT_READ, MAP_SHARED, craw->iso_fd, 0); + mmap(NULL, craw->buffer_size, PROT_READ | PROT_WRITE , MAP_SHARED, craw->iso_fd, 0); err = DC1394_IOCTL_FAILURE; if (craw->buffer == MAP_FAILED) goto error_fd; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/dc1394/macosx/capture.h new/libdc1394-2.1.4/dc1394/macosx/capture.h --- old/libdc1394-2.1.3/dc1394/macosx/capture.h 2009-05-25 08:49:17.000000000 +0200 +++ new/libdc1394-2.1.4/dc1394/macosx/capture.h 2011-11-16 07:11:04.000000000 +0100 @@ -23,6 +23,10 @@ #ifndef __DC1394_CAPTURE_MACOSX_H__ #define __DC1394_CAPTURE_MACOSX_H__ +#ifdef __cplusplus +extern "C" { +#endif + typedef void (*dc1394capture_callback_t)(dc1394camera_t *, void *); int @@ -32,4 +36,8 @@ dc1394_capture_set_callback (dc1394camera_t * camera, dc1394capture_callback_t callback, void * user_data); +#ifdef __cplusplus +} +#endif + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/dc1394/usb/control.c new/libdc1394-2.1.4/dc1394/usb/control.c --- old/libdc1394-2.1.3/dc1394/usb/control.c 2009-09-19 20:40:21.000000000 +0200 +++ new/libdc1394-2.1.4/dc1394/usb/control.c 2011-11-16 07:11:04.000000000 +0100 @@ -378,7 +378,7 @@ }; void -usb_init(dc1394_t * d) +dc1394_usb_init(dc1394_t * d) { register_platform (d, &usb_dispatch, "usb"); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libdc1394-2.1.3/examples/Makefile.am new/libdc1394-2.1.4/examples/Makefile.am --- old/libdc1394-2.1.3/examples/Makefile.am 2009-05-25 08:49:17.000000000 +0200 +++ new/libdc1394-2.1.4/examples/Makefile.am 2011-03-28 07:39:58.000000000 +0200 @@ -8,7 +8,9 @@ B = dc1394_reset_bus if HAVE_LINUX +if HAVE_VIDEODEV B += dc1394_vloopback +endif if HAVE_XV A += dc1394_multiview endif ++++++ libdc1394-swab_fix.patch ++++++ --- /var/tmp/diff_new_pack.RkfVPV/_old 2011-11-18 15:46:18.000000000 +0100 +++ /var/tmp/diff_new_pack.RkfVPV/_new 2011-11-18 15:46:18.000000000 +0100 @@ -2,8 +2,8 @@ libdc1394-2.0.2/dc1394/conversions.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---- a/libdc1394-2.1.3/dc1394/conversions.c -+++ b/libdc1394-2.1.3/dc1394/conversions.c +--- a/libdc1394-2.1.4/dc1394/conversions.c ++++ b/libdc1394-2.1.4/dc1394/conversions.c @@ -22,11 +22,10 @@ #include <string.h> ++++++ libdc1394-v4l-2.6.38.patch ++++++ --- /var/tmp/diff_new_pack.RkfVPV/_old 2011-11-18 15:46:18.000000000 +0100 +++ /var/tmp/diff_new_pack.RkfVPV/_new 2011-11-18 15:46:18.000000000 +0100 @@ -1,5 +1,5 @@ ---- libdc1394-2.1.3/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200 -+++ libdc1394-2.1.3/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200 +--- libdc1394-2.1.4/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200 ++++ libdc1394-2.1.4/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200 @@ -46,7 +46,7 @@ #include <signal.h> #define _LINUX_TIME_H ++++++ libdc1394-visibility.patch ++++++ --- /var/tmp/diff_new_pack.RkfVPV/_old 2011-11-18 15:46:18.000000000 +0100 +++ /var/tmp/diff_new_pack.RkfVPV/_new 2011-11-18 15:46:18.000000000 +0100 @@ -1,7 +1,7 @@ -diff -urN libdc1394-2.1.3.orig/configure.in libdc1394-2.1.3/configure.in ---- libdc1394-2.1.3.orig/configure.in 2011-08-29 09:58:17.271211906 +0200 -+++ libdc1394-2.1.3/configure.in 2011-08-29 10:01:52.563014990 +0200 -@@ -107,6 +107,23 @@ +diff -urN libdc1394-2.1.4.orig/configure.in libdc1394-2.1.4/configure.in +--- libdc1394-2.1.4.orig/configure.in 2011-08-29 09:58:17.271211906 +0200 ++++ libdc1394-2.1.4/configure.in 2011-08-29 10:01:52.563014990 +0200 +@@ -114,6 +114,23 @@ AC_FUNC_MMAP @@ -25,9 +25,9 @@ dnl --------------------------------------------------------------------------- dnl When making a release: dnl 1. If the library source code has changed at all since the last release, -diff -urN libdc1394-2.1.3.orig/dc1394/bayer.c libdc1394-2.1.3/dc1394/bayer.c ---- libdc1394-2.1.3.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200 -+++ libdc1394-2.1.3/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/bayer.c libdc1394-2.1.4/dc1394/bayer.c +--- libdc1394-2.1.4.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200 ++++ libdc1394-2.1.4/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> @@ -234,9 +234,9 @@ dc1394_debayer_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394bayer_method_t method) { if ((method<DC1394_BAYER_METHOD_MIN)||(method>DC1394_BAYER_METHOD_MAX)) -diff -urN libdc1394-2.1.3.orig/dc1394/capture.c libdc1394-2.1.3/dc1394/capture.c ---- libdc1394-2.1.3.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.1.3/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/capture.c libdc1394-2.1.4/dc1394/capture.c +--- libdc1394-2.1.4.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.1.4/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200 @@ -23,8 +23,9 @@ #include "control.h" #include "platform.h" @@ -293,9 +293,9 @@ dc1394_capture_is_frame_corrupt (dc1394camera_t * camera, dc1394video_frame_t * frame) { -diff -urN libdc1394-2.1.3.orig/dc1394/control.c libdc1394-2.1.3/dc1394/control.c ---- libdc1394-2.1.3.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.1.3/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/control.c libdc1394-2.1.4/dc1394/control.c +--- libdc1394-2.1.4.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.1.4/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200 @@ -27,8 +27,9 @@ #include "internal.h" @@ -1009,9 +1009,9 @@ dc1394_camera_free(dc1394camera_t *camera) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -diff -urN libdc1394-2.1.3.orig/dc1394/conversions.c libdc1394-2.1.3/dc1394/conversions.c ---- libdc1394-2.1.3.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200 -+++ libdc1394-2.1.3/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/conversions.c libdc1394-2.1.4/dc1394/conversions.c +--- libdc1394-2.1.4.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200 ++++ libdc1394-2.1.4/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200 @@ -25,6 +25,7 @@ #define _XOPEN_SOURCE #include <unistd.h> @@ -1218,9 +1218,9 @@ dc1394_deinterlace_stereo_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394stereo_method_t method) { dc1394error_t err; -diff -urN libdc1394-2.1.3.orig/dc1394/enumeration.c libdc1394-2.1.3/dc1394/enumeration.c ---- libdc1394-2.1.3.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.1.3/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/enumeration.c libdc1394-2.1.4/dc1394/enumeration.c +--- libdc1394-2.1.4.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.1.4/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200 @@ -27,6 +27,7 @@ #include "internal.h" #include "platform.h" @@ -1265,9 +1265,9 @@ dc1394_camera_free_list (dc1394camera_list_t *list) { if (list) -diff -urN libdc1394-2.1.3.orig/dc1394/format7.c libdc1394-2.1.3/dc1394/format7.c ---- libdc1394-2.1.3.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.1.3/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/format7.c libdc1394-2.1.4/dc1394/format7.c +--- libdc1394-2.1.4.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.1.4/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200 @@ -34,6 +34,7 @@ #include "utils.h" #include "config.h" @@ -1555,9 +1555,9 @@ dc1394_format7_get_roi(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t *color_coding, -diff -urN libdc1394-2.1.3.orig/dc1394/juju/control.c libdc1394-2.1.3/dc1394/juju/control.c ---- libdc1394-2.1.3.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.1.3/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/juju/control.c libdc1394-2.1.4/dc1394/juju/control.c +--- libdc1394-2.1.4.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.1.4/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200 @@ -35,6 +35,7 @@ #include "platform.h" #include "internal.h" @@ -1593,9 +1593,9 @@ juju_init(dc1394_t * d) { register_platform (d, &juju_dispatch, "juju"); -diff -urN libdc1394-2.1.3.orig/dc1394/linux/capture.c libdc1394-2.1.3/dc1394/linux/capture.c ---- libdc1394-2.1.3.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.1.3/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/linux/capture.c libdc1394-2.1.4/dc1394/linux/capture.c +--- libdc1394-2.1.4.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.1.4/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200 @@ -43,13 +43,14 @@ #include "kernel-video1394.h" #include "linux.h" @@ -1666,9 +1666,9 @@ dc1394_linux_capture_get_fileno (platform_camera_t * craw) { return craw->capture.dma_fd; -diff -urN libdc1394-2.1.3.orig/dc1394/linux/control.c libdc1394-2.1.3/dc1394/linux/control.c ---- libdc1394-2.1.3.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.1.3/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/linux/control.c libdc1394-2.1.4/dc1394/linux/control.c +--- libdc1394-2.1.4.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.1.4/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200 @@ -40,6 +40,7 @@ #include "linux.h" #include "offsets.h" @@ -1686,9 +1686,9 @@ linux_init(dc1394_t * d) { register_platform (d, &linux_dispatch, "linux"); -diff -urN libdc1394-2.1.3.orig/dc1394/log.c libdc1394-2.1.3/dc1394/log.c ---- libdc1394-2.1.3.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200 -+++ libdc1394-2.1.3/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/log.c libdc1394-2.1.4/dc1394/log.c +--- libdc1394-2.1.4.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200 ++++ libdc1394-2.1.4/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200 @@ -24,6 +24,7 @@ #include "log.h" #include <stdarg.h> @@ -1742,9 +1742,9 @@ { char string[1024]; if (system_debuglog_handler != NULL) { -diff -urN libdc1394-2.1.3.orig/dc1394/register.c libdc1394-2.1.3/dc1394/register.c ---- libdc1394-2.1.3.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200 -+++ libdc1394-2.1.3/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/register.c libdc1394-2.1.4/dc1394/register.c +--- libdc1394-2.1.4.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200 ++++ libdc1394-2.1.4/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200 @@ -27,6 +27,7 @@ #include "register.h" #include "utils.h" @@ -1913,9 +1913,9 @@ dc1394_set_strobe_register(dc1394camera_t *camera, uint64_t offset, uint32_t value) { -diff -urN libdc1394-2.1.3.orig/dc1394/usb/capture.c libdc1394-2.1.3/dc1394/usb/capture.c ---- libdc1394-2.1.3.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.1.3/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/usb/capture.c libdc1394-2.1.4/dc1394/usb/capture.c +--- libdc1394-2.1.4.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.1.4/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200 @@ -28,6 +28,7 @@ #include <unistd.h> @@ -1978,9 +1978,9 @@ dc1394_usb_capture_is_frame_corrupt (platform_camera_t * craw, dc1394video_frame_t * frame) { -diff -urN libdc1394-2.1.3.orig/dc1394/usb/control.c libdc1394-2.1.3/dc1394/usb/control.c ---- libdc1394-2.1.3.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.1.3/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/usb/control.c libdc1394-2.1.4/dc1394/usb/control.c +--- libdc1394-2.1.4.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.1.4/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200 @@ -29,7 +29,7 @@ #include "platform.h" #include "internal.h" @@ -1996,12 +1996,12 @@ -void +DLL_LOCAL void - usb_init(dc1394_t * d) + dc1394_usb_init(dc1394_t * d) { register_platform (d, &usb_dispatch, "usb"); -diff -urN libdc1394-2.1.3.orig/dc1394/utils.c libdc1394-2.1.3/dc1394/utils.c ---- libdc1394-2.1.3.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200 -+++ libdc1394-2.1.3/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/utils.c libdc1394-2.1.4/dc1394/utils.c +--- libdc1394-2.1.4.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200 ++++ libdc1394-2.1.4/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200 @@ -21,6 +21,7 @@ */ @@ -2112,9 +2112,9 @@ dc1394_checksum_crc16 (const uint8_t* buffer, uint32_t buffer_size) { uint32_t i, j, c, bit; -diff -urN libdc1394-2.1.3.orig/dc1394/vendor/avt.c libdc1394-2.1.3/dc1394/vendor/avt.c ---- libdc1394-2.1.3.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.1.3/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/vendor/avt.c libdc1394-2.1.4/dc1394/vendor/avt.c +--- libdc1394-2.1.4.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.1.4/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> @@ -2609,9 +2609,9 @@ { dc1394error_t err; uint32_t curval; -diff -urN libdc1394-2.1.3.orig/dc1394/vendor/basler.c libdc1394-2.1.3/dc1394/vendor/basler.c ---- libdc1394-2.1.3.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.1.3/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/vendor/basler.c libdc1394-2.1.4/dc1394/vendor/basler.c +--- libdc1394-2.1.4.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.1.4/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200 @@ -30,6 +30,7 @@ #include "../control.h" #include "basler.h" @@ -2719,9 +2719,9 @@ { dc1394basler_sff_t chunk; dc1394bool_t found = DC1394_FALSE; -diff -urN libdc1394-2.1.3.orig/dc1394/visibility.h libdc1394-2.1.3/dc1394/visibility.h ---- libdc1394-2.1.3.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100 -+++ libdc1394-2.1.3/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200 +diff -urN libdc1394-2.1.4.orig/dc1394/visibility.h libdc1394-2.1.4/dc1394/visibility.h +--- libdc1394-2.1.4.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100 ++++ libdc1394-2.1.4/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200 @@ -0,0 +1,31 @@ + +#ifndef __DC1394_VISIBILITY_H__ ++++++ libdc1394.ac.patch ++++++ --- /var/tmp/diff_new_pack.RkfVPV/_old 2011-11-18 15:46:18.000000000 +0100 +++ /var/tmp/diff_new_pack.RkfVPV/_new 2011-11-18 15:46:18.000000000 +0100 @@ -1,5 +1,5 @@ ---- a/libdc1394-2.1.3/configure.in 2009-11-23 10:11:16.000000000 +0300 -+++ b/libdc1394-2.1.3/configure.in 2009-11-23 10:11:51.000000000 +0300 +--- a/libdc1394-2.1.4/configure.in 2009-11-23 10:11:16.000000000 +0300 ++++ b/libdc1394-2.1.4/configure.in 2009-11-23 10:11:51.000000000 +0300 @@ -5,12 +5,6 @@ AC_CANONICAL_SYSTEM ++++++ libdc1394.no-x11.patch ++++++ --- /var/tmp/diff_new_pack.RkfVPV/_old 2011-11-18 15:46:18.000000000 +0100 +++ /var/tmp/diff_new_pack.RkfVPV/_new 2011-11-18 15:46:18.000000000 +0100 @@ -13,9 +13,9 @@ grab_gray_image_SOURCES = grab_gray_image.c grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 ---- a/libdc1394-2.1.3/configure.in -+++ b/libdc1394-2.1.3/configure.in -@@ -76,21 +76,30 @@ +--- a/libdc1394-2.1.4/configure.in ++++ b/libdc1394-2.1.4/configure.in +@@ -84,21 +84,30 @@ # check for Xv extensions (necessary for examples/dc1394_multiview) # imported from Coriander -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
