[SM-Commit] PERFORCE change 78701 by Flavien Bridault for review
Perforce Review Daemon
p4review at smee.org
Sun Apr 30 15:15:01 EDT 2006
Change 78701 by flavien_bridault at flavien-Gargamel on 2006/04/30 20:12:30
integrate from devel
Affected files ...
... //sgl/grimoires/test/graphics/libgphoto2/CONFIGURE#3 integrate
... //sgl/grimoires/test/graphics/libgphoto2/DEPENDS#4 integrate
... //sgl/grimoires/test/graphics/libgphoto2/DETAILS#10 integrate
... //sgl/grimoires/test/graphics/libgphoto2/HISTORY#14 integrate
... //sgl/grimoires/test/graphics/libgphoto2/INSTALL#3 integrate
... //sgl/grimoires/test/graphics/libgphoto2/Makefile.in.patch#1 branch
... //sgl/grimoires/test/graphics/libgphoto2/PRE_BUILD#1 branch
... //sgl/grimoires/test/graphics/libgphoto2/libgphoto2-2.1.99.tar.gz.sig#1 branch
Differences ...
==== //sgl/grimoires/test/graphics/libgphoto2/CONFIGURE#3 (xtext) ====
@@ -22,3 +22,5 @@
DRIVER=`echo $DRIVER | tr -d '\t'` # Remove strange leading tab
fi
+
+config_query DOXYGEN "Do you want to build C++ API documentation?" n
==== //sgl/grimoires/test/graphics/libgphoto2/DEPENDS#4 (xtext) ====
@@ -1,4 +1,5 @@
depends bison && # Is this really needed?
+depends libtool &&
depends pkgconfig &&
# test kernel version
@@ -17,6 +18,19 @@
optional_depends libtool "--with-ltdl" "--without-ltdl" \
"an alternative way of opening shared libraries" &&
-optional_depends libusb "--with-usb" "--without-usb" \
+# 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 hal "" "" "for hal support"
+optional_depends hal "" "" "for hal support" &&
+
+# Currently broken, disabling it
+# even if with current doxygen disabling hack that would be impossible to build anyway
+#optional_depends gtk-doc \
+# "--enable-docs" \
+# "--disable-docs" \
+# "Build documentation with gtk-doc" &&
+
+if [ $DOXYGEN = 'y' ]; then
+ depends doxygen
+fi
==== //sgl/grimoires/test/graphics/libgphoto2/DETAILS#10 (xtext) ====
@@ -1,17 +1,18 @@
SPELL=libgphoto2
VERSION=2.1.99
- SOURCE_HASH=sha512:ebde9cdf1b07256204e2143c19dc8002accd2a7a0e75ae90c7e43d7304bff9141ab7b1666413bb9e8d32f8530f3c302d858ee7f2246e5927c5b841d17131c2f0
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"
WEB_SITE=http://gphoto.sourceforge.net/proj/libgphoto2/
ENTERED=20030125
- UPDATED=20030125
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=GPL
KEYWORDS="graphics"
SHORT="gPhotolib2 - for gPhoto2"
cat << EOF
libgphoto2 is the core library designed to allow access to digital
camera by external programs.
+All users belonging to the video group are allowed to access the
+devices.
EOF
==== //sgl/grimoires/test/graphics/libgphoto2/HISTORY#14 (text) ====
@@ -1,3 +1,16 @@
+2006-04-30 Flavien Bridault <vlaaad at sourcemage.org>
+ * CONFIGURE: prompt for doxygen documentation building
+ * DEPENDS; used the good options to enable/disable libusb support
+ (bug #11625), added optional doxygen
+ * DETAILS; sha512->GPG, removed UPDATED, updated PATCHLEVEL, added
+ a comment in the description
+ * Makefile.in.patch: allows to disable doxygen doc
+ * PRE_BUILD: added to apply patch above
+ * INSTALL: installs fdi files for HAL, create udev rules so that hotplug
+ is no longer needed
+ * POST_INSTALL: don't claim that dispel fails if we can't remove
+ /etc/hotplug/usb/usbcam.usermap
+
2006-03-12 Karsten Behrmann <BearPerson at sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
==== //sgl/grimoires/test/graphics/libgphoto2/INSTALL#3 (xtext) ====
@@ -1,17 +1,59 @@
- default_install &&
- cd doc &&
- make install-man &&
+default_install &&
+cd doc &&
+make install-man &&
+
+# 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
+fi
+
+# Produce a udev rules file for all the cameras
+if spell_ok udev; then
+ local TMP_DIR="/tmp"
+ local MAP="$TMP/usbmap"
+ local RULE="20-gphoto2.rules"
+ local TMP_RULE="$TMP/$RULE"
+ local RULE_DIR="$INSTALL_ROOT/etc/udev/rules.d"
+
+ message "\nInstalling udev rules file in $RULE_DIR/$RULE\n"
+ echo -e "ACTION==\"add\", SUBSYSTEM==\"usb_device\", \
+PROGRAM=\"/bin/sh -c 'K=%k; K=\$\${K#usbdev}; printf bus/usb/%%03i/%%03i \$\${K%%%%.*} \$\${K#*.}'\", \
+NAME=\"%c\", MODE=\"0644\"\n \
+\n\
+SUBSYSTEM!=\"usb_device\", ACTION!=\"add\", GOTO=\"gphoto_rules_end\"\n" > $TMP_RULE
+
+ $INSTALL_ROOT/usr/lib/libgphoto2/print-usb-usermap > $MAP
+
+ local PRODUCT
+ local VENDOR
+ while read LINE; do
+ if echo $LINE | grep -q "^#"; then
+ echo $LINE >> $TMP_RULE
+ else
+ PRODUCT=$(echo $LINE | cut -f3 -d' ')
+ VENDOR=$(echo $LINE | cut -f4 -d' ')
+ echo "SYSFS{idVendor}==\"${PRODUCT#0x}\", SYSFS{idProduct}==\"${VENDOR#0x}\", GROUP=\"video\", MODE=\"660\"" >> $TMP_RULE
+ fi
+ done < $MAP
- if spell_ok hotplug; then
-# create list of cameras
- DEST=${INSTALL_ROOT}/etc/hotplug/usb &&
- mkdir -p $DEST &&
- FF=$DEST/usbcam &&
- ${INSTALL_ROOT}/usr/lib/libgphoto2/print-usb-usermap > ${FF}.usermap &&
- if [ ! -f $FF ];then
-# enable hotplug to set permissions for device
- cp ${INSTALL_ROOT}/usr/share/doc/libgphoto2/linux-hotplug/usbcam.group $FF &&
- chmod u+x $FF &&
- sed -i -e "s/=camera/=video/" $FF
+ echo -e "\nLABEL=\"gphoto_rules_end\"" >> $TMP_RULE
+
+ install -m 644 $TMP_RULE $RULE_DIR
+ rm -f $TMP_RULE $MAP
+else
+ # Else we fallback on the old method using hotplug stuff
+ if spell_ok hotplug; then
+ # create list of cameras
+ local DEST=${INSTALL_ROOT}/etc/hotplug/usb &&
+ mkdir -p $DEST &&
+ local FF=$DEST/usbcam &&
+ ${INSTALL_ROOT}/usr/lib/libgphoto2/print-usb-usermap > ${FF}.usermap &&
+ if [ ! -f $FF ];then
+ # enable hotplug to set permissions for device
+ cp ${INSTALL_ROOT}/usr/share/doc/libgphoto2/linux-hotplug/usbcam.group $FF &&
+ chmod u+x $FF &&
+ sed -i -e "s/=camera/=video/" $FF
+ fi
fi
- fi
+fi
More information about the SM-Commit
mailing list