Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (de918e711881619b704ea64d5b9e95f7c23ab174)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arwed von Merkatz <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (de918e711881619b704ea64d5b9e95f7c23ab174)
  • Date: Sun, 30 Sep 2007 04:17:39 -0500

GIT changes to master grimoire by Arwed von Merkatz <v.merkatz AT gmx.net>:

graphics/libgphoto2/CONFIGURE | 9 ++++-----
graphics/libgphoto2/DETAILS | 2 +-
graphics/libgphoto2/HISTORY | 6 ++++++
3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit de918e711881619b704ea64d5b9e95f7c23ab174
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>

libgphoto2: unbreak hal support if no camera is selected

diff --git a/graphics/libgphoto2/CONFIGURE b/graphics/libgphoto2/CONFIGURE
index b4300b4..468bb4b 100755
--- a/graphics/libgphoto2/CONFIGURE
+++ b/graphics/libgphoto2/CONFIGURE
@@ -1,4 +1,5 @@
message "if configure fails, unknown camera driver, please reconfigure" &&
+persistent_add DRIVER &&
if query "Do you want to (re)configure drivers?" n
then
local drivers=$( sed 's/$/\0 driver off/' $SCRIPT_DIRECTORY/drivers )
@@ -12,17 +13,15 @@ if query "Do you want to (re)configure drivers?" n
0 0 10 \
all driver on $drivers )

- if [ -z "$DRIVER" ] ; then
- message "No driver selected, defaulting to all."
- DRIVER='"all"'
- fi
-
DRIVER=${DRIVER//\"/} # Remove all " characters.
DRIVER=${DRIVER// /,} # Replace spaces with commas.
DRIVER=${DRIVER%,} # Strip any stray comma at the end.
DRIVER=`echo $DRIVER | tr -d '\t'` # Remove strange leading tab

fi &&
+if [ -z "$DRIVER" ] ; then
+ DRIVER='"all"'
+fi &&

config_query_string GP_RUN 'which program to run when camera is detected?'
'/bin/true' &&

diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index f7f92cd..e5bcdde 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://gphoto.sourceforge.net/proj/libgphoto2/
ENTERED=20030125
- PATCHLEVEL=1
+ PATCHLEVEL=2
LICENSE[0]=GPL
KEYWORDS="graphics"
SHORT="gPhotolib2 - for gPhoto2"
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index b56fe7a..3ed52d7 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,9 @@
+2007-09-30 Arwed v. Merkatz <v.merkatz AT gmx.net>
+ * CONFIGURE: set DRIVER to all if the user never chose drivers,
+ otherwise it installs a broken .fdi file causing hal to break in
+ mysterious ways
+ * DETAILS: PATCHLEVEL++
+
2007-08-29 Treeve Jelbert <treeve AT sourcemage.org>
* drivers: update camera list.
* CONFIGURE: warn about driver changes



  • [SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (de918e711881619b704ea64d5b9e95f7c23ab174), Arwed von Merkatz, 09/30/2007

Archive powered by MHonArc 2.6.24.

Top of Page