Skip to Content.
Sympa Menu

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

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 (a183c5940ca61d4368194e6e71b7e7d88e43bb78)
  • Date: Mon, 29 Jan 2007 12:02:18 -0600

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

graphics-libs/sane-backends/BUILD | 6 +++++-
graphics-libs/sane-backends/CONFIGURE | 15 ++++++++++++---
graphics-libs/sane-backends/DEPENDS | 10 +++++-----
graphics-libs/sane-backends/HISTORY | 7 +++++++
graphics-libs/sane-backends/INSTALL | 8 +++++++-
utils/syslinux/DETAILS | 2 +-
utils/syslinux/HISTORY | 3 +++
7 files changed, 40 insertions(+), 11 deletions(-)

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

sane-backends - add driver selection

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

syslinux-3.35

diff --git a/graphics-libs/sane-backends/BUILD
b/graphics-libs/sane-backends/BUILD
index 8a750d8..b55740a 100755
--- a/graphics-libs/sane-backends/BUILD
+++ b/graphics-libs/sane-backends/BUILD
@@ -16,5 +16,9 @@ if [ "$HP5400NVSM" == "y" ]; then
echo '#define NO_STRING_VERSION_MATCH
' >> $SOURCE_DIRECTORY/backend/hp5400_internal.h
fi &&
-
+if [ $SANE_LOCAL == none ];then
+ OPTS="$OPTS --disable-local-backends"
+else
+export BACKENDS=$SANE_LOCAL
+fi &&
default_build
diff --git a/graphics-libs/sane-backends/CONFIGURE
b/graphics-libs/sane-backends/CONFIGURE
index fc20ec3..207bf80 100755
--- a/graphics-libs/sane-backends/CONFIGURE
+++ b/graphics-libs/sane-backends/CONFIGURE
@@ -1,5 +1,14 @@
-config_query USEFORK "Use fork instead of pthread?" y &&
-config_query IPV6 "Enable IPV6 support?" y &&
-config_query HP5400NVSM "Disable Version String Matching in HP5400 driver
(needed on certain models)?" n
+. $GRIMOIRE/config_query_multi.function &&
+config_query_multi SANE_LOCAL "which local scanners?" \
+none abaton agfafocus \
+apple artec as6e avision bh canon canon630u coolscan coolscan2 dc25 dmc
epson \
+fujitsu genesys gt68xx hp leo lexmark matsushita microtek microtek2 mustek
\
+mustek_usb nec net pie pixma plustek plustek_pp ricoh s9036 sceptre sharp
sp15c \
+st400 tamarack test teco1 teco2 teco3 umax umax_pp umax1220u artec eplus48u
\
+ma1509 ibm hp5400 u12 snapscan niash sm3840 hp4200 sm3600 hp3500 stv680
&&
+
+config_query USEFORK "Use fork instead of pthread?" y &&
+config_query IPV6 "Enable IPV6 support?" y &&
+config_query HP5400NVSM "Disable Version String Matching in HP5400
SANE_BACKEND (needed on certain models)?" n


diff --git a/graphics-libs/sane-backends/DEPENDS
b/graphics-libs/sane-backends/DEPENDS
index bf75c6a..71931a1 100755
--- a/graphics-libs/sane-backends/DEPENDS
+++ b/graphics-libs/sane-backends/DEPENDS
@@ -5,8 +5,8 @@ optional_depends libusb
optional_depends libgphoto2 \
"--with-gphoto2" \
"--without-gphoto2" \
- "Enable libgphoto2 backend" &&
-optional_depends hotplug \
- "" \
- "" \
- "For usb plug and play"
+ "Enable libgphoto2 backend" &&
+optional_depends tetex \
+ "--enable-translations" \
+ "--disable-translations" \
+ "Build translated documentation"
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index e013a57..810b059 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,10 @@
+2007-01-29 Treeve Jelbert <treeve AT pi.be>
+ * DEPENDS: add optional tetex, remove hotplug
+ * INSTALL: hotplug files are optional
+ optionally install udev file
+ * CONFIGURE: add driver selection
+ * BUILD: build selected drivers
+
2006-07-04 Flavien Bridault <vlaaad AT sourcemage.org>
* DETAILS: Updated to 1.0.18, added SOURCE_URL[1]

diff --git a/graphics-libs/sane-backends/INSTALL
b/graphics-libs/sane-backends/INSTALL
index 8e970ae..0441085 100755
--- a/graphics-libs/sane-backends/INSTALL
+++ b/graphics-libs/sane-backends/INSTALL
@@ -1,9 +1,15 @@
default_install &&
cd $SOURCE_DIRECTORY &&
+if spell_ok hotplug;then
mkdir -p $INSTALL_ROOT/etc/hotplug/usb &&
install_config_file tools/hotplug/libsane.usermap \
$INSTALL_ROOT/etc/hotplug/usb/libsane.usermap &&
install_config_file tools/hotplug/libusbscanner \
- $INSTALL_ROOT/etc/hotplug/usb/libusbscanner &&
+ $INSTALL_ROOT/etc/hotplug/usb/libusbscanner
+fi &&
+if spell_ok udev;then
+install_config_file tools/udev/libsane.rules \
+ $INSTALL_ROOT/etc/udev/rules.d/20-libsane.rules
+fi &&
mkdir -p -m 1770 /var/lock/sane/ &&
chown root:users /var/lock/sane/
diff --git a/utils/syslinux/DETAILS b/utils/syslinux/DETAILS
index 82647d5..c089566 100755
--- a/utils/syslinux/DETAILS
+++ b/utils/syslinux/DETAILS
@@ -1,5 +1,5 @@
SPELL=syslinux
- VERSION=3.31
+ VERSION=3.35
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/boot/$SPELL/$SOURCE
diff --git a/utils/syslinux/HISTORY b/utils/syslinux/HISTORY
index e0ff9ae..3ab92ba 100644
--- a/utils/syslinux/HISTORY
+++ b/utils/syslinux/HISTORY
@@ -1,3 +1,6 @@
+2007-01-29 Treeve Jelbert <treeve AT pi.be>
+ * DETAILS: version 3.35
+
2006-09-26 Treeve Jelbert <treeve AT pi.be>
* DETAILS: version 3.31




  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a183c5940ca61d4368194e6e71b7e7d88e43bb78), Treeve Jelbert, 01/29/2007

Archive powered by MHonArc 2.6.24.

Top of Page