summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2024-12-19 18:56:14 +0100
committerJörg Frings-Fürst <debian@jff.email>2024-12-19 18:56:14 +0100
commitf7bb1be5414854235b90e9863b37b8a79ade446c (patch)
tree18d041f054b65952e9c0c55a0df8193672291aaa
parent84a14edb40b406239ea3390d5ab2bce028551919 (diff)
Fix FTBFS on non-Linux architecturesdevelop
-rw-r--r--debian/changelog7
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules8
3 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ea3cab2..88caaa6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sane-backends (1.3.1-2) UNRELEASED; urgency=medium
+
+ * Fix FTBFS on non-Linux architectures (Closes: #1090801).
+ Thanks to Pino Toscano <pino@debian.org>.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Thu, 19 Dec 2024 18:48:26 +0100
+
sane-backends (1.3.1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index e25d36b..1d27dc2 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends:
libsystemd-dev [linux-any],
libtiff-dev,
libusb-1.0-0-dev,
- libv4l-dev,
+ libv4l-dev [linux-any],
libxml2-dev,
pkgconf,
po-debconf,
diff --git a/debian/rules b/debian/rules
index d9f933e..1b0243f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_STRIP_FLAG = ""
STRIP = ""
endif
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+ EXTRA_CONFIGURE_ARGS += --with-v4l
+else
+ EXTRA_CONFIGURE_ARGS += --without-v4l
+endif
%:
dh $@
@@ -48,7 +53,8 @@ endif
--with-avahi \
--enable-pnm-backend \
--with-usb \
- --disable-locking
+ --disable-locking \
+ $(EXTRA_CONFIGURE_ARGS)
override_dh_autoreconf:
dh_autoreconf -Xlibtool.m4