Date: Monday, March 18, 2013 @ 10:11:19 Author: jgc Revision: 180145 Remove obsolete patches
Deleted: libdc1394/trunk/rename-usb_init.patch libdc1394/trunk/videodev-compile-fix.patch ----------------------------+ rename-usb_init.patch | 53 ------------------------------------------- videodev-compile-fix.patch | 41 --------------------------------- 2 files changed, 94 deletions(-) Deleted: rename-usb_init.patch =================================================================== --- rename-usb_init.patch 2013-03-18 09:10:25 UTC (rev 180144) +++ rename-usb_init.patch 2013-03-18 09:11:19 UTC (rev 180145) @@ -1,53 +0,0 @@ -From 13b85d2d23548682b617ddc1196f5560a27998bd Mon Sep 17 00:00:00 2001 -From: Damien Douxchamps <d...@douxchamps.net> -Date: Sun, 21 Aug 2011 16:03:22 +0900 -Subject: [PATCH] fix usb_init function name conflict - ---- - libdc1394/dc1394/control.c | 2 +- - libdc1394/dc1394/internal.h | 2 +- - libdc1394/dc1394/usb/control.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c -index c62e0e2..f250f6a 100644 ---- a/libdc1394/dc1394/control.c -+++ b/libdc1394/dc1394/control.c -@@ -1955,7 +1955,7 @@ dc1394_new (void) - windows_init (d); - #endif - #ifdef HAVE_LIBUSB -- usb_init (d); -+ dc1394_usb_init (d); - #endif - - int i; -diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h -index b4d295a..c59e5d3 100644 ---- a/libdc1394/dc1394/internal.h -+++ b/libdc1394/dc1394/internal.h -@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d); - 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 --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c -index 6509452..19a21a6 100644 ---- a/libdc1394/dc1394/usb/control.c -+++ b/libdc1394/dc1394/usb/control.c -@@ -378,7 +378,7 @@ usb_dispatch = { - }; - - void --usb_init(dc1394_t * d) -+dc1394_usb_init(dc1394_t * d) - { - register_platform (d, &usb_dispatch, "usb"); - } --- -1.7.4.1 - Deleted: videodev-compile-fix.patch =================================================================== --- videodev-compile-fix.patch 2013-03-18 09:10:25 UTC (rev 180144) +++ videodev-compile-fix.patch 2013-03-18 09:11:19 UTC (rev 180145) @@ -1,41 +0,0 @@ -From 2ee7e7f98dd6225b40d5cd570c240504be7bc86a Mon Sep 17 00:00:00 2001 -From: David Moore <david.mo...@gmail.com> -Date: Sun, 27 Mar 2011 22:48:15 -0700 -Subject: [PATCH] Conditionally compile dc1394_vloopback only when linux/videodev.h exists - ---- - libdc1394/configure.in | 3 +++ - libdc1394/examples/Makefile.am | 2 ++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/libdc1394/configure.in b/libdc1394/configure.in -index 69babab..bdddc9b 100644 ---- a/libdc1394/configure.in -+++ b/libdc1394/configure.in -@@ -75,6 +75,9 @@ AM_CONDITIONAL(HAVE_WINDOWS, test x$have_windows = xtrue) - 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) -diff --git a/libdc1394/examples/Makefile.am b/libdc1394/examples/Makefile.am -index fcebf18..035612e 100644 ---- a/libdc1394/examples/Makefile.am -+++ b/libdc1394/examples/Makefile.am -@@ -8,7 +8,9 @@ A = grab_gray_image grab_partial_image grab_color_image \ - B = dc1394_reset_bus - - if HAVE_LINUX -+if HAVE_VIDEODEV - B += dc1394_vloopback -+endif - if HAVE_XV - A += dc1394_multiview - endif --- -1.7.4.1 -