| 1 |
eva 08/03/30 22:25:39 |
| 2 |
|
| 3 |
Modified: ChangeLog libgphoto2-2.4.1.ebuild |
| 4 |
Log: |
| 5 |
add some logic to workaround bug #172830 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.116 media-libs/libgphoto2/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.116&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/ChangeLog?rev=1.116&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/ChangeLog?r1=1.115&r2=1.116 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v |
| 18 |
retrieving revision 1.115 |
| 19 |
retrieving revision 1.116 |
| 20 |
diff -u -r1.115 -r1.116 |
| 21 |
--- ChangeLog 30 Mar 2008 21:16:36 -0000 1.115 |
| 22 |
+++ ChangeLog 30 Mar 2008 22:25:38 -0000 1.116 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for media-libs/libgphoto2 |
| 25 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.115 2008/03/30 21:16:36 eva Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.116 2008/03/30 22:25:38 eva Exp $ |
| 28 |
+ |
| 29 |
+ 30 Mar 2008; Gilles Dartiguelongue <eva@g.o> |
| 30 |
+ libgphoto2-2.4.1.ebuild: |
| 31 |
+ add some logic to workaround bug #172830 |
| 32 |
|
| 33 |
*libgphoto2-2.4.1 (30 Mar 2008) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 media-libs/libgphoto2/libgphoto2-2.4.1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: libgphoto2-2.4.1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- libgphoto2-2.4.1.ebuild 30 Mar 2008 21:16:36 -0000 1.1 |
| 51 |
+++ libgphoto2-2.4.1.ebuild 30 Mar 2008 22:25:38 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild,v 1.1 2008/03/30 21:16:36 eva Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.1.ebuild,v 1.2 2008/03/30 22:25:38 eva Exp $ |
| 57 |
|
| 58 |
# TODO |
| 59 |
# 1. Track upstream bug --disable-docs does not work. |
| 60 |
@@ -123,34 +123,36 @@ |
| 61 |
|
| 62 |
HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" |
| 63 |
UDEV_RULES="/etc/udev/rules.d/70-libgphoto2.rules" |
| 64 |
+ CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list" |
| 65 |
|
| 66 |
- if [ -x "${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list ]; then |
| 67 |
+ if [ -x "${D}"${CAM_LIST} ]; then |
| 68 |
# Let print-camera-list find libgphoto2.so |
| 69 |
export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" |
| 70 |
# Let libgphoto2 find its camera-modules |
| 71 |
export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}" |
| 72 |
|
| 73 |
- if use hal; then |
| 74 |
- einfo "Generating HAL FDI files ..." |
| 75 |
- mkdir -p "${D}"/${HAL_FDI%/*} |
| 76 |
- "${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi >> "${D}"/${HAL_FDI} \ |
| 77 |
- || die "failed to create hal-fdi" |
| 78 |
+ |
| 79 |
+ if use hal && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then |
| 80 |
+ einfo "Generating HAL FDI files ..." |
| 81 |
+ mkdir -p "${D}"/${HAL_FDI%/*} |
| 82 |
+ "${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \ |
| 83 |
+ || die "failed to create hal-fdi" |
| 84 |
+ else |
| 85 |
+ ewarn "No HAL FDI file generated because no real camera driver enabled" |
| 86 |
fi |
| 87 |
|
| 88 |
einfo "Generating UDEV-rules ..." |
| 89 |
mkdir -p "${D}"/${UDEV_RULES%/*} |
| 90 |
echo -e "# do not edit this file, it will be overwritten on update\n#" \ |
| 91 |
> "${D}"/${UDEV_RULES} |
| 92 |
- "${D}"/usr/$(get_libdir)/libgphoto2/print-camera-list \ |
| 93 |
- udev-rules version 0.98 group plugdev \ |
| 94 |
- >> "${D}"/${UDEV_RULES} \ |
| 95 |
+ "${D}"${CAM_LIST} udev-rules version 0.98 group plugdev >> "${D}"/${UDEV_RULES} \ |
| 96 |
|| die "failed to create udev-rules" |
| 97 |
else |
| 98 |
eerror "Unable to find print-camera-list" |
| 99 |
eerror "and therefore unable to generate hotplug usermap or HAL FDI files." |
| 100 |
eerror "You will have to manually generate it by running:" |
| 101 |
- eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list udev-rules version 0.98 group plugdev > ${UDEV_RULES}" |
| 102 |
- eerror " /usr/$(get_libdir)/libgphoto2/print-camera-list hal-fdi > ${HAL_FDI}" |
| 103 |
+ eerror " ${CAM_LIST} udev-rules version 0.98 group plugdev > ${UDEV_RULES}" |
| 104 |
+ eerror " ${CAM_LIST} hal-fdi > ${HAL_FDI}" |
| 105 |
fi |
| 106 |
|
| 107 |
} |
| 108 |
|
| 109 |
|
| 110 |
|
| 111 |
-- |
| 112 |
gentoo-commits@l.g.o mailing list |
Archives