Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a24c598fddbae7b18c4d0248b7dfba38a7c4de25)

Chronological Thread  
    < 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 (a24c598fddbae7b18c4d0248b7dfba38a7c4de25)
  • Date: Tue, 23 May 2017 13:43:02 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog | 3 +++
graphics-libs/sane-backends/BUILD | 21 ++++-----------------
graphics-libs/sane-backends/CONFIGURE | 10 +---------
graphics-libs/sane-backends/DEPENDS | 25 +++++++++++++++++++++----
graphics-libs/sane-backends/DETAILS | 8 +++-----
graphics-libs/sane-backends/HISTORY | 6 ++++++
graphics-libs/sane-backends/INSTALL | 17 -----------------
libs/libusb/HISTORY | 3 +++
libs/libusb/UP_TRIGGERS | 4 +++-
libs/libusbx/BUILD | 1 -
libs/libusbx/CONFLICTS | 1 -
libs/libusbx/DETAILS | 8 --------
libs/libusbx/DOWNLOAD | 1 -
libs/libusbx/HISTORY | 4 ----
libs/libusbx/INSTALL | 1 -
libs/libusbx/PRE_BUILD | 1 -
libs/libusbx/UP_TRIGGERS | 1 -
17 files changed, 44 insertions(+), 71 deletions(-)

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

deprecate libs/libusbx [replaced by libusb]

commit 41f6d2b0bee335e7a6bebd70240d6b629a6277aa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libusb - tweak UP_TRIGGERS

commit 8500f45d3a0d59507a26d8748093b2957ba8bcb7
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

sane-backends: => 1.0.27

diff --git a/ChangeLog b/ChangeLog
index 79185ce..9af65fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2017-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * libs/libusbx: spell deprecated [replaced by libusb]
+
2017-05-22 Treeve Jelbert <treeve AT sourcemage.org>
* qt5ct: move to qt5-qmake

diff --git a/graphics-libs/sane-backends/BUILD
b/graphics-libs/sane-backends/BUILD
index c6c4817..5c5cc93 100755
--- a/graphics-libs/sane-backends/BUILD
+++ b/graphics-libs/sane-backends/BUILD
@@ -1,31 +1,18 @@
create_group scanner &&

-LDFLAGS="-pthread $LDFLAGS"
-
-if [[ $USEFORK == y ]]; then
- OPTS="$OPTS --disable-pthread"
-else
- OPTS="$OPTS --enable-pthread"
-fi &&
-
if [[ $IPV6 == y ]]; then
OPTS="$OPTS --enable-ipv6"
else
OPTS="$OPTS --disable-ipv6"
fi &&

-if [[ $HP5400NVSM == y ]]; then
- echo "patching HP5400 for NO_STRING_VERSION_MATCH"
- echo '#define NO_STRING_VERSION_MATCH
-' >> $SOURCE_DIRECTORY/backend/hp5400_internal.h
-fi &&
-
if [[ "$SANE_BUILD_LOCAL" == n ]]; then
OPTS="$OPTS --disable-local-backends"
fi &&

-OPTS="--disable-latex \
- --with-docdir=$INSTALL_ROOT/usr/share/doc/sane-backends \
- $OPTS" &&
+#OPTS="--disable-latex \
+# --with-docdir=$INSTALL_ROOT/usr/share/doc/sane-backends \
+# $OPTS" &&

+OPTS+=" --disable-translations" &&
default_build
diff --git a/graphics-libs/sane-backends/CONFIGURE
b/graphics-libs/sane-backends/CONFIGURE
index 9c46592..7ebb5ad 100755
--- a/graphics-libs/sane-backends/CONFIGURE
+++ b/graphics-libs/sane-backends/CONFIGURE
@@ -1,13 +1,5 @@
. $GRIMOIRE/config_query_multi.function &&

-# Honor the legacy decision for SANE_LOCAL
-local local_default=y &&
-if [[ "$SANE_LOCAL" == none ]]; then
- local_default=n
-fi &&
-
config_query SANE_BUILD_LOCAL "Build local drivers (for connecting a scanner
to _this_ box)?" $local_default &&

-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
+config_query IPV6 "Enable IPV6 support?" y
diff --git a/graphics-libs/sane-backends/DEPENDS
b/graphics-libs/sane-backends/DEPENDS
index 4c2475d..5c2d2c5 100755
--- a/graphics-libs/sane-backends/DEPENDS
+++ b/graphics-libs/sane-backends/DEPENDS
@@ -1,12 +1,29 @@
+depends libpng &&
depends JPEG &&
depends tiff &&
-
+depends DEVICE-MANAGER &&
optional_depends libusb \
- "--enable-libusb" \
- "--disable-libusb" \
+ "--with-usb" \
+ "--without-usb" \
"Enable libusb support" &&

optional_depends libgphoto2 \
"--with-gphoto2" \
"--without-gphoto2" \
- "Enable libgphoto2 backend"
+ "Enable libgphoto2 backend" &&
+optional_depends gettext \
+ "--enable-nls" \
+ "--disable-nls" \
+ "Native Language Support" &&
+optional_depends v4l-utils \
+ "--with-v4l" \
+ "--without-v4l" \
+ "build v4l backend"
+optional_depends libieee1284 \
+ "" \
+ "" \
+ "parallel port support" &&
+optional_depends avahi \
+ "--enable-avahi" \
+ "--disable-avahi" \
+ "network support"
diff --git a/graphics-libs/sane-backends/DETAILS
b/graphics-libs/sane-backends/DETAILS
index 7811459..4ccaa37 100755
--- a/graphics-libs/sane-backends/DETAILS
+++ b/graphics-libs/sane-backends/DETAILS
@@ -1,11 +1,9 @@
SPELL=sane-backends
- VERSION=1.0.25
-
SOURCE_HASH=sha512:b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df
-# PATCHLEVEL=1
+ VERSION=1.0.27
+
SOURCE_HASH=sha512:c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-# SOURCE_URL[0]=ftp://ftp.sane-project.org/pub/sane/$SPELL-$VERSION/$SOURCE
- SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/file/4146/$SOURCE
+ SOURCE_URL[0]=https://alioth.debian.org/frs/download.php/file/4224/$SOURCE
# SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=GPL
WEB_SITE=http://www.sane-project.org/
diff --git a/graphics-libs/sane-backends/HISTORY
b/graphics-libs/sane-backends/HISTORY
index 84553f2..ff72cf3 100644
--- a/graphics-libs/sane-backends/HISTORY
+++ b/graphics-libs/sane-backends/HISTORY
@@ -1,3 +1,9 @@
+2017-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.0.27
+ * DEPENDS: lots of changes
+ * BUILD CONFIGURE: adjust
+ * INSTALL: deleted
+
2015-11-21 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.25
* PRE_BUILD libv4l.patch: deleted
diff --git a/graphics-libs/sane-backends/INSTALL
b/graphics-libs/sane-backends/INSTALL
deleted file mode 100755
index 6313014..0000000
--- a/graphics-libs/sane-backends/INSTALL
+++ /dev/null
@@ -1,17 +0,0 @@
-mkdir -p ${INSTALL_ROOT}/etc/sane.d &&
-default_install &&
-cd $SOURCE_DIRECTORY &&
-cp include/sane/sanei*.h ${INSTALL_ROOT}/usr/include/sane &&
-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
-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/libs/libusb/HISTORY b/libs/libusb/HISTORY
index 32c4d17..04b1d66 100644
--- a/libs/libusb/HISTORY
+++ b/libs/libusb/HISTORY
@@ -1,3 +1,6 @@
+2017-05-23 Treeve Jelbert <treeve AT sourcemage.org>
+ * UP_TRIGGERS: do not force cast of libusb-compat
+
2016-10-27 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0.21
* PRE_BUILD, DEPENDS: use autoreconf to generate configure script
diff --git a/libs/libusb/UP_TRIGGERS b/libs/libusb/UP_TRIGGERS
index dfd894b..11c2ae5 100755
--- a/libs/libusb/UP_TRIGGERS
+++ b/libs/libusb/UP_TRIGGERS
@@ -1 +1,3 @@
-up_trigger libusb-compat cast_self
+if spell_ok libusb-compat;then
+ up_trigger libusb-compat cast_self
+fi
diff --git a/libs/libusbx/BUILD b/libs/libusbx/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/libusbx/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/libusbx/CONFLICTS b/libs/libusbx/CONFLICTS
deleted file mode 100755
index 678cde3..0000000
--- a/libs/libusbx/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts libusbx y
diff --git a/libs/libusbx/DETAILS b/libs/libusbx/DETAILS
deleted file mode 100755
index 3f6d063..0000000
--- a/libs/libusbx/DETAILS
+++ /dev/null
@@ -1,8 +0,0 @@
- SPELL=libusbx
- VERSION=0
- PATCHLEVEL=9999
- SHORT="deprecated"
-cat << EOF
-deprecated spell [replaced by libusb]
-EOF
-
diff --git a/libs/libusbx/DOWNLOAD b/libs/libusbx/DOWNLOAD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/libusbx/DOWNLOAD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/libusbx/HISTORY b/libs/libusbx/HISTORY
deleted file mode 100644
index cdfeb98..0000000
--- a/libs/libusbx/HISTORY
+++ /dev/null
@@ -1,4 +0,0 @@
-2014-01-26 Treeve Jelbert <treeve AT sourcemage.org>
- * DETAILS: version 0
- PATCHLEVEL=9999
- spell deprecated [replaced by libusb]
diff --git a/libs/libusbx/INSTALL b/libs/libusbx/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/libusbx/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/libusbx/PRE_BUILD b/libs/libusbx/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/libs/libusbx/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/libs/libusbx/UP_TRIGGERS b/libs/libusbx/UP_TRIGGERS
deleted file mode 100755
index d40a01c..0000000
--- a/libs/libusbx/UP_TRIGGERS
+++ /dev/null
@@ -1 +0,0 @@
-up_trigger libusb cast_self


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (a24c598fddbae7b18c4d0248b7dfba38a7c4de25), Treeve Jelbert, 05/23/2017

Archive powered by MHonArc 2.6.24.

Top of Page