summaryrefslogtreecommitdiffstats
path: root/source/xap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-03-12 19:49:57 +0000
committer Eric Hameleers <alien@slackware.com>2024-03-12 22:30:49 +0100
commite4d752ef5069af2d0502827a03aaadfe36d3bb04 (patch)
treec1f54551a8ed1790f6a4f7714324901ed851fd32 /source/xap
parent30130016eed435a8530c1583fefe1ab8d19d1d50 (diff)
downloadcurrent-e4d752ef5069af2d0502827a03aaadfe36d3bb04.tar.gz
current-e4d752ef5069af2d0502827a03aaadfe36d3bb04.tar.xz
Tue Mar 12 19:49:57 UTC 202420240312194957
a/elogind-252.23-x86_64-1.txz: Upgraded. ap/sqlite-3.45.2-x86_64-1.txz: Upgraded. l/jasper-4.2.2-x86_64-1.txz: Upgraded. l/libpaper-2.2.5-x86_64-1.txz: Upgraded. l/netpbm-11.05.03-x86_64-1.txz: Upgraded. l/python-wheel-0.43.0-x86_64-1.txz: Upgraded. n/iproute2-6.8.0-x86_64-1.txz: Upgraded. xap/sane-1.3.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap')
-rwxr-xr-xsource/xap/sane/sane.SlackBuild33
1 files changed, 18 insertions, 15 deletions
diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild
index e44209c1e..3e700ba30 100755
--- a/source/xap/sane/sane.SlackBuild
+++ b/source/xap/sane/sane.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019, 2020 Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2018, 2019, 2020, 2024 Patrick Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,10 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sane
-VERSION=1.2.1
-BACKVER=1.2.1
+BACKVER=1.3.0
FRONTVER=1.0.14
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-$BACKVER}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -70,15 +70,23 @@ mkdir -p $TMP $PKG
# First, we'll build the backends
cd $TMP
-rm -rf sane-backends-$BACKVER
-tar xvf $CWD/sane-backends-$BACKVER.tar.xz || exit 1
-cd sane-backends-$BACKVER || exit 1
+rm -rf backends-$BACKVER
+tar xvf $CWD/backends-$BACKVER.tar.?z || exit 1
+cd backends-$BACKVER || exit 1
chown -R root:root .
# Put the SANE_CAP_ALWAYS_SETTABLE definition back until
# everything else catches up with the API change...
+# NOTE: "everything" includes the frontends lol
zcat $CWD/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz | patch -p1 || exit 1
+if [ ! -r configure ]; then
+ if [ -x ./autogen.sh ]; then
+ NOCONFIGURE=1 ./autogen.sh
+ else
+ autoreconf -vif
+ fi
+fi
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
@@ -111,14 +119,9 @@ cat tools/udev/libsane.rules \
| sed -e "s/ACTION!=\"add\"/ACTION!=\"add|change\"/g" \
> $PKG/lib/udev/rules.d/80-libsane.rules
-## Add the hal fdi file:
-#mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor/
-#cat tools/hal/libsane.fdi \
-# > $PKG/usr/share/hal/fdi/policy/10osvendor/10-libsane.fdi
-
# Install the pkgconfig file:
-install -D -m644 tools/sane-backends.pc \
- $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc
+#install -D -m644 tools/sane-backends.pc \
+# $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/sane-backends.pc
# If there's a ChangeLog, installing at least part of the recent history
# is useful, but don't let it get totally out of control:
@@ -131,7 +134,7 @@ fi
# Now let's build the frontends:
cd $TMP
rm -rf sane-frontends-$FRONTVER
-tar xvf $CWD/sane-frontends-$FRONTVER.tar.xz || exit 1
+tar xvf $CWD/sane-frontends-$FRONTVER.tar.?z || exit 1
cd sane-frontends-$FRONTVER || exit 1
chown -R root:root .