Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,61 @@
|
||||
[PATCH] backend/qcam.c: fix build on !x86
|
||||
|
||||
inb/outb/ioperm are x86 specific interfaces, so replace with noops on
|
||||
!x86.
|
||||
|
||||
Inspired by similar patch in openwrt:
|
||||
https://dev.openwrt.org/ticket/5689
|
||||
|
||||
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
|
||||
---
|
||||
backend/qcam.c | 14 +++++++++++++-
|
||||
1 file changed, 13 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: sane-backends-1.0.22/backend/qcam.c
|
||||
===================================================================
|
||||
--- sane-backends-1.0.22.orig/backend/qcam.c
|
||||
+++ sane-backends-1.0.22/backend/qcam.c
|
||||
@@ -205,12 +205,20 @@
|
||||
|
||||
#endif /* <sys/io.h> || <asm/io.h> || <sys/hw.h> */
|
||||
|
||||
+/* inb / outb only exist on x86 */
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
#define read_lpdata(d) inb ((d)->port)
|
||||
#define read_lpstatus(d) inb ((d)->port + 1)
|
||||
#define read_lpcontrol(d) inb ((d)->port + 2)
|
||||
#define write_lpdata(d,v) outb ((v), (d)->port)
|
||||
#define write_lpcontrol(d,v) outb ((v), (d)->port + 2)
|
||||
-
|
||||
+#else
|
||||
+#define read_lpdata(d) 0
|
||||
+#define read_lpstatus(d) 0
|
||||
+#define read_lpcontrol(d) 0
|
||||
+#define write_lpdata(d,v)
|
||||
+#define write_lpcontrol(d,v)
|
||||
+#endif
|
||||
|
||||
static SANE_Status
|
||||
enable_ports (QC_Device * q)
|
||||
@@ -219,8 +227,10 @@
|
||||
if (q->port < 0x278 || q->port > 0x3bc)
|
||||
return SANE_STATUS_INVAL;
|
||||
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
if (ioperm (q->port, 3, 1) < 0)
|
||||
return SANE_STATUS_INVAL;
|
||||
+#endif
|
||||
|
||||
return SANE_STATUS_GOOD;
|
||||
}
|
||||
@@ -228,8 +238,10 @@
|
||||
static SANE_Status
|
||||
disable_ports (QC_Device * q)
|
||||
{
|
||||
+#if defined(__i386__) || defined(__x86_64__)
|
||||
if (ioperm (q->port, 3, 0) < 0)
|
||||
return SANE_STATUS_INVAL;
|
||||
+#endif
|
||||
|
||||
return SANE_STATUS_GOOD;
|
||||
}
|
||||
@@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_SANE_BACKENDS
|
||||
bool "sane-backends"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
SANE - Scanner Access Now Easy
|
||||
|
||||
http://www.sane-project.org
|
||||
|
||||
Backends are included automatically based on the libraries that have
|
||||
been selected: libusb, jpeg, tiff, avahi (with dbus and libglib2),
|
||||
and netsnmp.
|
||||
@@ -0,0 +1,2 @@
|
||||
# From http://www.sane-project.org/sane-md5sums.txt
|
||||
md5 f9ed5405b3c12f07c6ca51ee60225fe7 sane-backends-1.0.25.tar.gz
|
||||
@@ -0,0 +1,78 @@
|
||||
################################################################################
|
||||
#
|
||||
# sane-backends
|
||||
#
|
||||
################################################################################
|
||||
|
||||
SANE_BACKENDS_VERSION = 1.0.25
|
||||
SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/4146
|
||||
SANE_BACKENDS_CONFIG_SCRIPTS = sane-config
|
||||
SANE_BACKENDS_LICENSE = GPLv2+
|
||||
SANE_BACKENDS_LICENSE_FILES = COPYING
|
||||
SANE_BACKENDS_INSTALL_STAGING = YES
|
||||
|
||||
SANE_BACKENDS_CONF_OPTS = \
|
||||
$(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-pthread,--disable-pthread)
|
||||
|
||||
ifeq ($(BR2_INIT_SYSTEMD),y)
|
||||
SANE_BACKENDS_CONF_OPTS += --with-systemd
|
||||
SANE_BACKENDS_DEPENDENCIES += systemd
|
||||
else
|
||||
SANE_BACKENDS_CONF_OPTS += --without-systemd
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBUSB),y)
|
||||
SANE_BACKENDS_DEPENDENCIES += libusb
|
||||
SANE_BACKENDS_CONF_OPTS += --enable-libusb_1_0
|
||||
else
|
||||
SANE_BACKENDS_CONF_OPTS += --disable-libusb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JPEG),y)
|
||||
SANE_BACKENDS_DEPENDENCIES += jpeg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_TIFF),y)
|
||||
SANE_BACKENDS_DEPENDENCIES += tiff
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBV4L),y)
|
||||
SANE_BACKENDS_DEPENDENCIES += libv4l
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yyy)
|
||||
SANE_BACKENDS_DEPENDENCIES += avahi
|
||||
SANE_BACKENDS_CONF_OPTS += --enable-avahi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NETSNMP),y)
|
||||
SANE_BACKENDS_CONF_ENV += ac_cv_path_SNMP_CONFIG_PATH=$(STAGING_DIR)/usr/bin/net-snmp-config
|
||||
SANE_BACKENDS_DEPENDENCIES += netsnmp
|
||||
else
|
||||
SANE_BACKENDS_CONF_OPTS += --without-snmp
|
||||
endif
|
||||
|
||||
define SANE_BACKENDS_DISABLE_DOCS
|
||||
$(SED) 's/ doc//' $(@D)/Makefile
|
||||
endef
|
||||
|
||||
SANE_BACKENDS_POST_CONFIGURE_HOOKS += SANE_BACKENDS_DISABLE_DOCS
|
||||
|
||||
define SANE_BACKENDS_USERS
|
||||
saned -1 saned -1 * /etc/sane.d - - Saned User
|
||||
endef
|
||||
|
||||
define SANE_BACKENDS_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -m 0644 -D package/sane-backends/saned.socket \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/saned.socket
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/socket.target.wants
|
||||
ln -sf ../../../../usr/lib/systemd/system/saned.socket \
|
||||
$(TARGET_DIR)/etc/systemd/system/socket.target.wants/saned.socket
|
||||
$(INSTALL) -m 0644 -D package/sane-backends/saned@.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/saned@.service
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants
|
||||
ln -sf ../../../../usr/lib/systemd/system/saned@.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/saned@.service
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
@@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=saned incoming socket
|
||||
|
||||
[Socket]
|
||||
ListenStream=6566
|
||||
Accept=yes
|
||||
MaxConnections=1
|
||||
|
||||
[Install]
|
||||
WantedBy=sockets.target
|
||||
@@ -0,0 +1,18 @@
|
||||
[Unit]
|
||||
Description=Scanner Service
|
||||
Requires=saned.socket
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/sbin/saned
|
||||
User=saned
|
||||
Group=saned
|
||||
StandardInput=null
|
||||
StandardOutput=syslog
|
||||
StandardError=syslog
|
||||
Environment=SANE_CONFIG_DIR=/etc/sane.d
|
||||
# If you need to debug your configuration uncomment the next line and
|
||||
# change it as appropriate to set the desired debug options
|
||||
# Environment=SANE_DEBUG_DLL=255 SANE_DEBUG_BJNP=5
|
||||
|
||||
[Install]
|
||||
Also=saned.socket
|
||||
Reference in New Issue
Block a user