diff --git a/graphics/libgphoto2/CONFIGURE b/graphics/libgphoto2/CONFIGURE
index 313ade1..c6bff00 100755
--- a/graphics/libgphoto2/CONFIGURE
+++ b/graphics/libgphoto2/CONFIGURE
@@ -21,6 +21,8 @@ if query "Do you want to (re)configure
DRIVER=${DRIVER%,} # Strip any stray comma at the end.
DRIVER=`echo $DRIVER | tr -d '\t'` # Remove strange leading tab
-fi
+fi &&
+
+config_query_string GP_RUN 'which program to run when camera is detected?'
'/bin/true' &&
config_query DOXYGEN "Do you want to build C++ API documentation?" n
diff --git a/graphics/libgphoto2/DEPENDS b/graphics/libgphoto2/DEPENDS
index 44725c4..a453337 100755
--- a/graphics/libgphoto2/DEPENDS
+++ b/graphics/libgphoto2/DEPENDS
@@ -5,7 +5,8 @@ depends pkgconfig &&
local GPH_KDEV
GPH_KVER=`uname -r |cut -c-3` &&
if [ $GPH_KVER == "2.6" ];then
- optional_depends udev "" "" "for kernel hotplug support"
+ optional_depends udev "udevscriptdir=$INSTALL_ROOT/lib/udev" "" \
+ "for kernel UDEV support"
else
optional_depends hotplug "" "" "for kernel hotplug support"
fi &&
@@ -19,8 +20,9 @@ optional_depends libtool "--with-ltdl"
# With 2.1.99, --with-libusb makes configure crash, let nothing as libusb
# is enabled by default
-optional_depends libusb "" "--without-libusb" \
- "enable use of cameras connected though the USB port" &&
+optional_depends libusb "--with-libusb" \
+ "--without-libusb" \
+ "enable use of cameras connected though the USB port" &&
optional_depends dbus "" "" "for dbus support" &&
optional_depends hal "" "" "for HAL support" &&
diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index 27b71cf..81fd418 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,9 +1,9 @@
SPELL=libgphoto2
- VERSION=2.3.0
+ VERSION=2.3.1
+
SOURCE_HASH=sha512:5cc0795259cff974d4968809503d932647221ad26e885b7a62d21ebe27d8cf8198a8432c43796954edce6ac4fd80d7f07a2817292ad5363f74b3881c780389a1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/gphoto/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://gphoto.sourceforge.net/proj/libgphoto2/
ENTERED=20030125
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index da5bbf5..078f5c2 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,11 @@
+2007-03-05 Treeve Jelbert <treeve01 AT pi.be>
+ * DETAILS: version 2.3.1
+ * INSTALL: replace obsolete print-usb-usermap command
+ use upstream udev rules
+ * DEPENDS: improve udev support
+ explicitly enable libusb
+ * CONFIGURE: prompt for program to run whne camera is detected
+
2006-12-04 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 2.3.0
* Makefile.in.patch: Removed
diff --git a/graphics/libgphoto2/INSTALL b/graphics/libgphoto2/INSTALL
index 51e8d3c..39b2233 100755
--- a/graphics/libgphoto2/INSTALL
+++ b/graphics/libgphoto2/INSTALL
@@ -2,10 +2,12 @@ default_install &&
cd doc &&
make install-man &&
+local CAMERALIST &&
+CAMERALIST=$INSTALL_ROOT/usr/lib/libgphoto2/print-camera-list &&
# Installs fdi files for use with HAL
if spell_ok hal; then
local
FDI=${INSTALL_ROOT}/usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi
&&
- ${INSTALL_ROOT}/usr/lib/libgphoto2/print-usb-usermap --fdi > $FDI
+ $CAMERALIST hal-fdi >$FDI
fi
# Produce a udev rules file for all the cameras
@@ -17,27 +19,28 @@ if spell_ok udev; then
local RULE_DIR="$INSTALL_ROOT/etc/udev/rules.d"