Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c0a3a279658ab135907878fa3ac70ec37f04b0f8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c0a3a279658ab135907878fa3ac70ec37f04b0f8)
  • Date: Mon, 5 Mar 2007 10:36:51 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT scarlet.be>:

database/dbd-sqlite2/DEPENDS | 3 -
database/dbd-sqlite2/HISTORY | 4 ++
database/qdbm/DETAILS | 4 +-
database/qdbm/HISTORY | 3 +
dev/null |binary
graphics/libgphoto2/CONFIGURE | 4 +-
graphics/libgphoto2/DEPENDS | 8 ++--
graphics/libgphoto2/DETAILS | 4 +-
graphics/libgphoto2/HISTORY | 8 ++++
graphics/libgphoto2/INSTALL | 43
++++++++++++------------
graphics/libgphoto2/libgphoto2-2.3.0.tar.gz.sig | 0
perl-cpan/dbi/DETAILS | 4 +-
perl-cpan/dbi/HISTORY | 3 +
13 files changed, 56 insertions(+), 32 deletions(-)

New commits:
commit ffbfa1074d79c3a624441a4a7ce40df1a7db5c6c
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

libgphoto2-2.3.1

commit ad0d3d4779d4191b3b605b6740659a716d8d19d5
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

dbi-1.54

commit 104f7dfefc79c3cc230e29010d466b36bd092bce
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

dbd-sqlite2

commit 06f1f17c131bbad719778b244b116b54dc021530
Author: Treeve Jelbert <treeve AT scarlet.be>
Commit: Treeve Jelbert <treeve AT scarlet.be>

qdbm-1.8.75

diff --git a/database/dbd-sqlite2/DEPENDS b/database/dbd-sqlite2/DEPENDS
index 5f73380..bb1ea68 100755
--- a/database/dbd-sqlite2/DEPENDS
+++ b/database/dbd-sqlite2/DEPENDS
@@ -1,3 +1,2 @@
depends perl &&
-depends dbi &&
-depends sqlite2
+depends dbi
diff --git a/database/dbd-sqlite2/HISTORY b/database/dbd-sqlite2/HISTORY
index 7f887a9..5f9839b 100644
--- a/database/dbd-sqlite2/HISTORY
+++ b/database/dbd-sqlite2/HISTORY
@@ -1,3 +1,7 @@
+2007-03-05 Treeve Jelbert <treeve AT pi.be>
+ * DEPENDS: remove depends on sqlite2
+ it uses an embedded copy of sqlite2
+
2006-09-21 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: [automated] Removed BUILD_API=2.

diff --git a/database/qdbm/DETAILS b/database/qdbm/DETAILS
index c53011e..7580665 100755
--- a/database/qdbm/DETAILS
+++ b/database/qdbm/DETAILS
@@ -1,6 +1,6 @@
SPELL=qdbm
- VERSION=1.8.74
-
SOURCE_HASH=sha512:9de2b2a473a5e91cf0ed14976faf303519ea15a0615a36fa3e15db24c0150c25ede927dba4c5c811725137aec1411c305b90f7bcf9a821ccf95b12431dddd1d0
+ VERSION=1.8.75
+
SOURCE_HASH=sha512:e0a05ab963e3b45a77435adc65ecb47a85f6a345330e395c6e1f22c7c4a9ba454ce33ecd47f9669ec8a9f0f4fa1b6c80521a34d6ec2f0fb4ae94a9984b2e7d69
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://qdbm.sourceforge.net/$SOURCE
diff --git a/database/qdbm/HISTORY b/database/qdbm/HISTORY
index f363476..51d7fb0 100644
--- a/database/qdbm/HISTORY
+++ b/database/qdbm/HISTORY
@@ -1,3 +1,6 @@
+2007-03-05 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.8.75
+
2006-11-07 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 1.8.74

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"

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
+# 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
+$CAMERALIST udev-rules $GP_RUN > $TMP_RULE &&
+# $INSTALL_ROOT/usr/lib/libgphoto2/print-camera-list usb-usermap usbcam >
$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
+# 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

- echo -e "\nLABEL=\"gphoto_rules_end\"" >> $TMP_RULE
+# echo -e "\nLABEL=\"gphoto_rules_end\"" >> $TMP_RULE

install -m 644 $TMP_RULE $RULE_DIR
rm -f $TMP_RULE $MAP
@@ -48,7 +51,7 @@ else
local DEST=${INSTALL_ROOT}/etc/hotplug/usb
&&
mkdir -p $DEST
&&
local FF=$DEST/usbcam
&&
- ${INSTALL_ROOT}/usr/lib/libgphoto2/print-usb-usermap > ${FF}.usermap
&&
+ $CAMERALIST usb-usermap usbmap > ${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 &&
diff --git a/graphics/libgphoto2/libgphoto2-2.3.0.tar.gz.sig
b/graphics/libgphoto2/libgphoto2-2.3.0.tar.gz.sig
deleted file mode 100644
index 55aa0fa..0000000
Binary files a/graphics/libgphoto2/libgphoto2-2.3.0.tar.gz.sig and /dev/null
differ
diff --git a/perl-cpan/dbi/DETAILS b/perl-cpan/dbi/DETAILS
index 400dee3..9750229 100755
--- a/perl-cpan/dbi/DETAILS
+++ b/perl-cpan/dbi/DETAILS
@@ -1,6 +1,6 @@
SPELL=dbi
- VERSION=1.52
-
SOURCE_HASH=sha512:afe1f382c833f81bebd263366a9cc8bcc999faa185abc6ce0f5903ba732ca75871edb5f19ecfe8dad109c8c87990b3649091ab422892f65543b58dba49a7464a
+ VERSION=1.54
+
SOURCE_HASH=sha512:6729dc6a7dc8bafa1e996e123868a55d65e0677e32fcbd94222bfd15a083d3aab8e53792ba97830a17a8b537b8562d65e0e9d11587635ab48a53f7a964a05d42
SOURCE=DBI-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/DBI-$VERSION
SOURCE_URL[0]=http://www.cpan.org/authors/id/TIMB/$SOURCE
diff --git a/perl-cpan/dbi/HISTORY b/perl-cpan/dbi/HISTORY
index 7c972b3..c6f111f 100644
--- a/perl-cpan/dbi/HISTORY
+++ b/perl-cpan/dbi/HISTORY
@@ -1,3 +1,6 @@
+2007-03-05 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 1.54
+
2006-10-21 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 1.52




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (c0a3a279658ab135907878fa3ac70ec37f04b0f8), Treeve Jelbert, 03/05/2007

Archive powered by MHonArc 2.6.24.

Top of Page