diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2007-01-31 15:53:38 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2007-01-31 15:53:38 +0000 |
| commit | 201fa01ff1ad04c76bde61decb5e3c2d8ca3beaa (patch) | |
| tree | 1dfbcd3f3dc5342c24de7adaf0693a2f19a8c254 /media-libs/libgphoto2/files | |
| parent | Sign Manfiest (diff) | |
| download | gentoo-2-201fa01ff1ad04c76bde61decb5e3c2d8ca3beaa.tar.gz gentoo-2-201fa01ff1ad04c76bde61decb5e3c2d8ca3beaa.tar.bz2 gentoo-2-201fa01ff1ad04c76bde61decb5e3c2d8ca3beaa.zip | |
Fix for generating udev rules properly. Rather then recursive it just changes the device. Also don't accidentally match on VendorID=0.
(Portage version: 2.1.2-r5)
Diffstat (limited to 'media-libs/libgphoto2/files')
| -rw-r--r-- | media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 | 3 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff | 29 |
2 files changed, 32 insertions, 0 deletions
diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 new file mode 100644 index 000000000000..770cf01bd000 --- /dev/null +++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.3.1-r2 @@ -0,0 +1,3 @@ +MD5 37f85e34e5b6031ddf6cac8b8782ac4f libgphoto2-2.3.1.tar.bz2 3230934 +RMD160 ab678a5006a89ef1fe9f052dac1f9738961cc3a8 libgphoto2-2.3.1.tar.bz2 3230934 +SHA256 b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727 libgphoto2-2.3.1.tar.bz2 3230934 diff --git a/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff b/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff new file mode 100644 index 000000000000..675855877d7c --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.3.1-udev-rules-fix.diff @@ -0,0 +1,29 @@ +diff -Nur libgphoto2-2.3.1/packaging/generic/print-camera-list.c libgphoto2-2.3.1-udev-fix/packaging/generic/print-camera-list.c +--- libgphoto2-2.3.1/packaging/generic/print-camera-list.c 2006-12-24 10:16:19.000000000 -0500 ++++ libgphoto2-2.3.1-udev-fix/packaging/generic/print-camera-list.c 2007-01-31 10:39:12.000000000 -0500 +@@ -299,7 +299,7 @@ + /* Note: 2 lines because we need to use || ... having them on the same + * line would mean &&. + */ +- printf ("SUBSYSTEM!=\"usb*\", GOTO=\"libgphoto2_rules_end\"\n"); ++ printf ("SUBSYSTEM!=\"usb_device\", GOTO=\"libgphoto2_rules_end\"\n"); + printf ("ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n\n"); + return 0; + } +@@ -479,9 +479,14 @@ + else + fprintf(stderr,"unhandled interface match flags %x\n", flags); + } +- } else { +- printf ("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ", ++ } else if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID) { ++ ++ printf ("ATTR{idVendor}==\"%04x\", ATTR{idProduct}==\"%04x\", ", + a->usb_vendor, a->usb_product); ++ } else { ++ fprintf(stderr, "Attempted to output rule for Camera: \"%s\" , Vendor: \"%04x\" , Product: \"%04x\"", ++ a->model, a->usb_vendor, a->usb_product); ++ return 0; + } + if ((*params->argv)[1] == NULL) { + const char *hotplug_script = ((*params->argv)[0] != NULL) |