summaryrefslogtreecommitdiff
path: root/libraries/libdc1394/libdc1394-usbinit.patch
diff options
context:
space:
mode:
authorLarry Hajali <larryhaja[at]gmail[dot]com>2011-10-18 17:17:19 -0500
committerNiels Horn <niels.horn@slackbuilds.org>2011-10-22 10:17:08 -0200
commit158369f3643f5813aed50a87b87c9fb546f410b0 (patch)
tree5d198d98e1760e70e62e00d6a36dcda0f4108834 /libraries/libdc1394/libdc1394-usbinit.patch
parent3adb386c508261fcdb6d21cdf6cc9664c24648ee (diff)
downloadslackbuilds-158369f3643f5813aed50a87b87c9fb546f410b0.tar.gz
libraries/libdc1394: Updated for version 2.1.3.
Signed-off-by: Erik Hanson <erik@slackbuilds.org>
Diffstat (limited to 'libraries/libdc1394/libdc1394-usbinit.patch')
-rw-r--r--libraries/libdc1394/libdc1394-usbinit.patch39
1 files changed, 39 insertions, 0 deletions
diff --git a/libraries/libdc1394/libdc1394-usbinit.patch b/libraries/libdc1394/libdc1394-usbinit.patch
new file mode 100644
index 0000000000..e94d25355a
--- /dev/null
+++ b/libraries/libdc1394/libdc1394-usbinit.patch
@@ -0,0 +1,39 @@
+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");
+ }