| 1 |
dilfridge 11/09/06 20:51:31 |
| 2 |
|
| 3 |
Added: libdc1394-usbinit.patch |
| 4 |
Log: |
| 5 |
Non-maintainer fix: add upstream patch to avoid usb_init symbol conflict, bug 380287 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.13/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-libs/libdc1394/files/libdc1394-usbinit.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libdc1394/files/libdc1394-usbinit.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libdc1394/files/libdc1394-usbinit.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: libdc1394-usbinit.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/libdc1394/dc1394/control.c b/libdc1394/dc1394/control.c |
| 18 |
index c62e0e2..f250f6a 100644 |
| 19 |
--- a/libdc1394/dc1394/control.c |
| 20 |
+++ b/libdc1394/dc1394/control.c |
| 21 |
@@ -1955,7 +1955,7 @@ dc1394_new (void) |
| 22 |
windows_init (d); |
| 23 |
#endif |
| 24 |
#ifdef HAVE_LIBUSB |
| 25 |
- usb_init (d); |
| 26 |
+ dc1394_usb_init (d); |
| 27 |
#endif |
| 28 |
|
| 29 |
int i; |
| 30 |
diff --git a/libdc1394/dc1394/internal.h b/libdc1394/dc1394/internal.h |
| 31 |
index b4d295a..c59e5d3 100644 |
| 32 |
--- a/libdc1394/dc1394/internal.h |
| 33 |
+++ b/libdc1394/dc1394/internal.h |
| 34 |
@@ -74,7 +74,7 @@ void juju_init(dc1394_t *d); |
| 35 |
void linux_init(dc1394_t *d); |
| 36 |
void macosx_init(dc1394_t *d); |
| 37 |
void windows_init(dc1394_t *d); |
| 38 |
-void usb_init(dc1394_t *d); |
| 39 |
+void dc1394_usb_init(dc1394_t *d); |
| 40 |
|
| 41 |
void register_platform (dc1394_t * d, const platform_dispatch_t * dispatch, |
| 42 |
const char * name); |
| 43 |
diff --git a/libdc1394/dc1394/usb/control.c b/libdc1394/dc1394/usb/control.c |
| 44 |
index 6509452..19a21a6 100644 |
| 45 |
--- a/libdc1394/dc1394/usb/control.c |
| 46 |
+++ b/libdc1394/dc1394/usb/control.c |
| 47 |
@@ -378,7 +378,7 @@ usb_dispatch = { |
| 48 |
}; |
| 49 |
|
| 50 |
void |
| 51 |
-usb_init(dc1394_t * d) |
| 52 |
+dc1394_usb_init(dc1394_t * d) |
| 53 |
{ |
| 54 |
register_platform (d, &usb_dispatch, "usb"); |
| 55 |
} |
Archives