Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9daeaf6356ecef750e072cce46c5c4a3aee823e2)
  • Date: Wed, 2 Sep 2009 14:36:19 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

graphics/libgphoto2/CONFIGURE | 1 +
graphics/libgphoto2/DETAILS | 3 ++-
graphics/libgphoto2/HISTORY | 12 ++++++++++++
graphics/libgphoto2/INSTALL | 9 +++++----
graphics/libgphoto2/PRE_BUILD | 5 ++---
graphics/libgphoto2/cameras.diff | 21 +++++++++++++++++++++
6 files changed, 43 insertions(+), 8 deletions(-)

New commits:
commit 9daeaf6356ecef750e072cce46c5c4a3aee823e2
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libgphoto2 - fixes and new cameras

diff --git a/graphics/libgphoto2/CONFIGURE b/graphics/libgphoto2/CONFIGURE
index 468bb4b..aa31e13 100755
--- a/graphics/libgphoto2/CONFIGURE
+++ b/graphics/libgphoto2/CONFIGURE
@@ -1,4 +1,5 @@
message "if configure fails, unknown camera driver, please reconfigure" &&
+message "most modern cameras use PTP2 protocol" &&
persistent_add DRIVER &&
if query "Do you want to (re)configure drivers?" n
then
diff --git a/graphics/libgphoto2/DETAILS b/graphics/libgphoto2/DETAILS
index 4630e72..6fc557a 100755
--- a/graphics/libgphoto2/DETAILS
+++ b/graphics/libgphoto2/DETAILS
@@ -1,11 +1,12 @@
SPELL=libgphoto2
VERSION=2.4.7

SOURCE_HASH=sha512:8a2471eb5d8989af9fa9930905911fadc8d1d58668f1ab0c0f729dbb2c93818f1ac2a2a56dcd655afe8184bb680d0ef35cd10db45d6f3094787519c918aba2a2
+ PATCHLEVEL=1
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/
+ WEB_SITE=http://www.gphoto.org/
ENTERED=20030125
LICENSE[0]=GPL
KEYWORDS="graphics"
diff --git a/graphics/libgphoto2/HISTORY b/graphics/libgphoto2/HISTORY
index 67a58d2..b09e58a 100644
--- a/graphics/libgphoto2/HISTORY
+++ b/graphics/libgphoto2/HISTORY
@@ -1,3 +1,15 @@
+2009-09-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: new WEB_SITE
+ PATCHLEVEL++
+ * cameras.diff: added, for Nikon P90 and Casio EX-Z150
+ * PRE_BUILD: add support for extra cameras;
+ remove useless sedit
+ * INSTALL: fix generation of udev rules and hal fdi data
+ specify udev version >= 136
+ change name of rules file, store it in /lib/udev/rules.d
+ this may fix bug #15359
+ * CONFIGURE: add extra message
+
2009-08-31 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.4.7
* DEPENDS: fix libusb flags
diff --git a/graphics/libgphoto2/INSTALL b/graphics/libgphoto2/INSTALL
index b49aa1e..c97cda6 100755
--- a/graphics/libgphoto2/INSTALL
+++ b/graphics/libgphoto2/INSTALL
@@ -3,7 +3,7 @@ cd doc &&
make install-man &&

local CAMERALIST &&
-CAMERALIST=$TRACK_ROOT/usr/lib/libgphoto2/print-camera-list &&
+CAMERALIST=$INSTALL_ROOT/usr/lib/libgphoto2/print-camera-list &&
# Installs fdi files for use with HAL
if spell_ok hal; then
message "\nInstalling hal fdi data" &&
@@ -16,12 +16,13 @@ fi &&
if spell_ok udev; then
local TMP_DIR="/tmp"
local MAP="$TMP/usbmap"
- local RULE="20-gphoto2.rules"
+ local RULE="40-gphoto2.rules"
local TMP_RULE="$TMP/$RULE"
- local RULE_DIR="$INSTALL_ROOT/etc/udev/rules.d"
+ local RULE_DIR="$INSTALL_ROOT/lib/udev/rules.d"

message "\nInstalling udev rules file in $RULE_DIR/$RULE\n"
- $CAMERALIST udev-rules script $GP_RUN > $TMP_RULE &&
+# asssume udev > 136
+ $CAMERALIST udev-rules version 136 script $GP_RUN > $TMP_RULE &&
install -m 644 $TMP_RULE $RULE_DIR &&
rm -f $TMP_RULE $MAP
else
diff --git a/graphics/libgphoto2/PRE_BUILD b/graphics/libgphoto2/PRE_BUILD
index ad20be1..564ac0f 100755
--- a/graphics/libgphoto2/PRE_BUILD
+++ b/graphics/libgphoto2/PRE_BUILD
@@ -1,5 +1,4 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-if [ $DOXYGEN = 'n' ]; then
- sedit 's/packaging doc/packaging/' Makefile.am
-fi
+# TJ private patch
+patch -p1 < $SPELL_DIRECTORY/cameras.diff
diff --git a/graphics/libgphoto2/cameras.diff
b/graphics/libgphoto2/cameras.diff
new file mode 100644
index 0000000..c85782e
--- /dev/null
+++ b/graphics/libgphoto2/cameras.diff
@@ -0,0 +1,21 @@
+diff -uNr libgphoto2-2.4.7/camlibs/ptp2/library.c
libgphoto2-2.4.7.cp/camlibs/ptp2/library.c
+--- libgphoto2-2.4.7/camlibs/ptp2/library.c 2009-08-16 15:58:17.000000000
+0200
++++ libgphoto2-2.4.7.cp/camlibs/ptp2/library.c 2009-09-02 18:51:18.000000000
+0200
+@@ -619,6 +619,8 @@
+ {"Nikon:Coolpix P50 (PTP mode)", 0x04b0, 0x0169, 0},
+ /* http://bugs.debian.org/520752 */
+ {"Nikon:Coolpix S60 (PTP mode)", 0x04b0, 0x0171, 0},
++ /* Nikon:Coolpix P90: Treeve Jelbert 2009.08.31*/
++ {"Nikon:Coolpix P90 (PTP mode)", 0x04b0, 0x0173,
PTP_CAP|PTP_NIKON_BROKEN_CAP},
+ {"Nikon:Coolpix SQ (PTP mode)", 0x04b0, 0x0202, 0},
+ /* lars marowski bree, 16.8.2004 */
+ {"Nikon:Coolpix 4200 (PTP mode)", 0x04b0, 0x0204, 0},
+@@ -716,6 +718,8 @@
+ {"Casio:EX-S770", 0x07cf, 0x1049, 0},
+ /* https://launchpad.net/bugs/64146 */
+ {"Casio:EX-Z700", 0x07cf, 0x104c, 0},
++ /* Casio:EX-Z150 (PTP mode): Treeve Jelbert 2009/09/02 */
++ {"Casio:EX-Z150", 0x07cf, 0x120f, 0},
+
+ /* (at least some) newer Canon cameras can be switched between
+ * PTP and "normal" (i.e. Canon) mode



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (9daeaf6356ecef750e072cce46c5c4a3aee823e2), Treeve Jelbert, 09/02/2009

Archive powered by MHonArc 2.6.24.

Top of Page