commit
582f4f65c4
@ -0,0 +1,2 @@
|
|||||||
|
SOURCES/sane-backends-1.2.1.tar.gz
|
||||||
|
SOURCES/sane.png
|
@ -0,0 +1,2 @@
|
|||||||
|
849c5970b8160408637c2ae1680dfc977cda6747 SOURCES/sane-backends-1.2.1.tar.gz
|
||||||
|
338783a09c91bf1cc1a3bda838a9e7568563e02e SOURCES/sane.png
|
@ -0,0 +1,2 @@
|
|||||||
|
# udev rule for saned (SANE scanning daemon) to be able to write on usb port
|
||||||
|
ENV{libsane_matched}=="yes", ENV{DEVNAME}!="", RUN+="/usr/bin/setfacl -m g:saned:rw $env{DEVNAME}"
|
@ -0,0 +1,28 @@
|
|||||||
|
README.Fedora
|
||||||
|
-------------
|
||||||
|
|
||||||
|
This file is meant as README for Fedora specific changes for sane-backends
|
||||||
|
package.
|
||||||
|
|
||||||
|
SANE daemon is moved to subpackage
|
||||||
|
----------------------------------
|
||||||
|
sane-backends daemon - saned - its manual page and systemd unit files are moved
|
||||||
|
into subpackage named sane-backends-daemon. It was done because daemon provides
|
||||||
|
access to scanning devices on remote server, which nowadays isn't common
|
||||||
|
usage of sane-backends, so it wasn't necessary to ship it with main package.
|
||||||
|
|
||||||
|
Several scanners need proprietary driver for working
|
||||||
|
----------------------------------------------------
|
||||||
|
Several scanners (e.g. Samsung, Brother, Epson) sometimes need special backends,
|
||||||
|
whose isn't shipped with sane-backends or cannot be shipped in Fedora because of
|
||||||
|
licensing problem. If your scanner isn't working with basic sane-backends:
|
||||||
|
|
||||||
|
1) if your scanner is Epson, try to install iscan-firmware package or Image Scan from Epson official site
|
||||||
|
2) if your scanner is Samsung, try to find driver on https://support.hp.com/gb-en/drivers/selfservice/
|
||||||
|
3) if your scanner is Brother, see http://support.brother.com/g/s/id/linux/en/download_scn.html
|
||||||
|
|
||||||
|
Ad2) Samsung proprietary driver is needed when user needs JPEG compression - this
|
||||||
|
feature support was added to sane-backends upstream by commit 926bfade544de4a4fd5,
|
||||||
|
which contained patches from Samsung. But this commit broke scanning for Samsung
|
||||||
|
scanners, so this patch was reverted with consequences of losing JPEG compression
|
||||||
|
feature for Samsung scanners.
|
@ -0,0 +1,36 @@
|
|||||||
|
From d0c61e7e9b13185f424dff1f4ac697ec53089d69 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nils Philippsen <nils@redhat.com>
|
||||||
|
Date: Tue, 4 Sep 2012 16:45:14 +0200
|
||||||
|
Subject: [PATCH] patch: sane-config-multilib
|
||||||
|
|
||||||
|
Squashed commit of the following:
|
||||||
|
|
||||||
|
commit 81aa4f41bf102b08258c8e1de1c0476835329ec5
|
||||||
|
Author: Nils Philippsen <nils@redhat.com>
|
||||||
|
Date: Tue Sep 4 16:43:34 2012 +0200
|
||||||
|
|
||||||
|
make installed sane-config multi-lib aware again
|
||||||
|
|
||||||
|
This partially reverts commit 77c4ea1a7aa680fb1c3ee4daa1404f21439b2c9b.
|
||||||
|
---
|
||||||
|
tools/sane-config.in | 4 ----
|
||||||
|
1 file changed, 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/sane-config.in b/tools/sane-config.in
|
||||||
|
index 8e4b52a..1fae2e5 100644
|
||||||
|
--- a/tools/sane-config.in
|
||||||
|
+++ b/tools/sane-config.in
|
||||||
|
@@ -10,10 +10,6 @@ scriptname="sane-config"
|
||||||
|
prefix="@prefix@"
|
||||||
|
exec_prefix="@exec_prefix@"
|
||||||
|
|
||||||
|
-# using our installed *.pc only - neither default nor user paths
|
||||||
|
-export PKG_CONFIG_LIBDIR="@libdir@/pkgconfig"
|
||||||
|
-export PKG_CONFIG_PATH=""
|
||||||
|
-
|
||||||
|
pkgconfig_package=sane-backends
|
||||||
|
|
||||||
|
usage ()
|
||||||
|
--
|
||||||
|
1.7.11.4
|
||||||
|
|
@ -0,0 +1,27 @@
|
|||||||
|
diff -up sane-backends-1.0.28/ltmain.sh.soname sane-backends-1.0.28/ltmain.sh
|
||||||
|
--- sane-backends-1.0.28/ltmain.sh.soname 2019-09-12 09:57:10.979802716 +0200
|
||||||
|
+++ sane-backends-1.0.28/ltmain.sh 2019-09-12 10:27:21.719895206 +0200
|
||||||
|
@@ -9615,23 +9615,6 @@ EOF
|
||||||
|
dlname=$soname
|
||||||
|
fi
|
||||||
|
|
||||||
|
- # If -module or -export-dynamic was specified, set the dlname
|
||||||
|
- if test "$module" = yes || test "$export_dynamic" = yes; then
|
||||||
|
- # On all known operating systems, these are identical.
|
||||||
|
- dlname="$soname"
|
||||||
|
- fi
|
||||||
|
-
|
||||||
|
- # On sane-backends the internal name for every lib is "libsane"
|
||||||
|
- # not "libsane-backendname" so that linking to each backend is possible.
|
||||||
|
- case $host in
|
||||||
|
- *mingw*)
|
||||||
|
- ;;
|
||||||
|
- *aix*)
|
||||||
|
- ;;
|
||||||
|
- *)
|
||||||
|
- soname=`echo $soname | sed -e "s/libsane-[A-Za-z_0-9]*/libsane/g"`
|
||||||
|
- esac
|
||||||
|
-
|
||||||
|
lib=$output_objdir/$realname
|
||||||
|
linknames=
|
||||||
|
for link
|
@ -0,0 +1,72 @@
|
|||||||
|
From 252f347d59fff3ab1877f77a36613b318651725e Mon Sep 17 00:00:00 2001
|
||||||
|
From: Nils Philippsen <nils@redhat.com>
|
||||||
|
Date: Tue, 8 Oct 2013 16:29:13 +0200
|
||||||
|
Subject: [PATCH] patch: udev
|
||||||
|
|
||||||
|
Squashed commit of the following:
|
||||||
|
|
||||||
|
commit fb6d1f4c0d17f1df33429bf03a64cd4fbb819ea5
|
||||||
|
Author: Nils Philippsen <nils@redhat.com>
|
||||||
|
Date: Tue Oct 8 16:24:49 2013 +0200
|
||||||
|
|
||||||
|
adapt generated udev rules for Fedora
|
||||||
|
|
||||||
|
commit 8bffaccc1eeb19ecbaddb4ac9da73954af4c5d4f
|
||||||
|
Author: Nils Philippsen <nils@redhat.com>
|
||||||
|
Date: Mon Sep 10 12:20:43 2012 +0200
|
||||||
|
|
||||||
|
use group and mode macros consistently
|
||||||
|
---
|
||||||
|
tools/sane-desc.c | 14 +++++++-------
|
||||||
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/tools/sane-desc.c b/tools/sane-desc.c
|
||||||
|
index badc8ce..f992bf5 100644
|
||||||
|
--- a/tools/sane-desc.c
|
||||||
|
+++ b/tools/sane-desc.c
|
||||||
|
@@ -57,9 +57,9 @@
|
||||||
|
#define COLOR_NEW "\"#F00000\""
|
||||||
|
#define COLOR_UNKNOWN "\"#000000\""
|
||||||
|
|
||||||
|
-#define DEVMODE "0664"
|
||||||
|
+#define DEVMODE "0644"
|
||||||
|
#define DEVOWNER "root"
|
||||||
|
-#define DEVGROUP "scanner"
|
||||||
|
+#define DEVGROUP "root"
|
||||||
|
|
||||||
|
#ifndef PATH_MAX
|
||||||
|
# define PATH_MAX 1024
|
||||||
|
@@ -3564,7 +3564,8 @@ print_udev (void)
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("\n# The following rule will disable USB autosuspend for the device\n");
|
||||||
|
- printf("ENV{libsane_matched}==\"yes\", RUN+=\"/bin/sh -c 'if test -e /sys/$env{DEVPATH}/power/control; then echo on > /sys/$env{DEVPATH}/power/control; elif test -e /sys/$env{DEVPATH}/power/level; then echo on > /sys/$env{DEVPATH}/power/level; fi'\"\n");
|
||||||
|
+ printf("ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n");
|
||||||
|
+ printf("ENV{libsane_matched}==\"yes\", TEST!=\"power/control\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
|
||||||
|
|
||||||
|
printf ("\nLABEL=\"libsane_usb_rules_end\"\n\n");
|
||||||
|
|
||||||
|
@@ -3641,10 +3642,8 @@ print_udev (void)
|
||||||
|
}
|
||||||
|
printf ("LABEL=\"libsane_scsi_rules_end\"\n");
|
||||||
|
|
||||||
|
- if (mode == output_mode_udevacl)
|
||||||
|
- printf("\nENV{libsane_matched}==\"yes\", RUN+=\"/bin/setfacl -m g:%s:rw $env{DEVNAME}\"\n", DEVGROUP);
|
||||||
|
- else
|
||||||
|
- printf ("\nENV{libsane_matched}==\"yes\", MODE=\"664\", GROUP=\"scanner\"\n");
|
||||||
|
+ if (mode != output_mode_udevacl)
|
||||||
|
+ printf ("\nENV{libsane_matched}==\"yes\", MODE=\"%s\", GROUP=\"%s\"\n", DEVMODE, DEVGROUP);
|
||||||
|
|
||||||
|
printf ("\nLABEL=\"libsane_rules_end\"\n");
|
||||||
|
}
|
||||||
|
@@ -3695,6 +3694,7 @@ print_udevhwdb (void)
|
||||||
|
|
||||||
|
printf("# The following rule will disable USB autosuspend for the device\n");
|
||||||
|
printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST==\"power/control\", ATTR{power/control}=\"on\"\n\n");
|
||||||
|
+ printf("ENV{DEVTYPE}==\"usb_device\", ENV{libsane_matched}==\"yes\", TEST!=\"power/control\", TEST==\"power/level\", ATTR{power/level}=\"on\"\n");
|
||||||
|
|
||||||
|
printf ("SUBSYSTEMS==\"scsi\", GOTO=\"libsane_scsi_rules_begin\"\n");
|
||||||
|
printf ("GOTO=\"libsane_rules_end\"\n\n");
|
||||||
|
--
|
||||||
|
2.5.0
|
||||||
|
|
@ -0,0 +1,72 @@
|
|||||||
|
From 300b460970f538ab515835f14650785e88808a8f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Sam James <sam@gentoo.org>
|
||||||
|
Date: Fri, 4 Nov 2022 04:04:46 +0000
|
||||||
|
Subject: acinclude.m4: fix -Wimplicit-function-declaration
|
||||||
|
|
||||||
|
-Wimplicit-function-declaration will become an error by default
|
||||||
|
in Clang 16.
|
||||||
|
|
||||||
|
Fixes errors like:
|
||||||
|
```
|
||||||
|
error: call to undeclared library function 'exit' with type 'void (int) __attribute__((noreturn))'; ISO C99 and later do not support implicit function declarations [-Werror,-Wimplicit-function-declaration]
|
||||||
|
```
|
||||||
|
|
||||||
|
Signed-off-by: Sam James <sam@gentoo.org>
|
||||||
|
|
||||||
|
DJ: Added pre-configure'd configure
|
||||||
|
|
||||||
|
diff --git a/acinclude.m4 b/acinclude.m4
|
||||||
|
index df8abe148..71e22c8d4 100644
|
||||||
|
--- a/acinclude.m4
|
||||||
|
+++ b/acinclude.m4
|
||||||
|
@@ -471,6 +471,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
|
||||||
|
if test "$ipv6" != "no" ; then
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
|
#define INET6
|
||||||
|
+ #include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h> ]], [[
|
||||||
|
/* AF_INET6 available check */
|
||||||
|
@@ -492,6 +493,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
|
||||||
|
AC_MSG_CHECKING([whether struct sockaddr_storage has an ss_family member])
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
|
#define INET6
|
||||||
|
+ #include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h> ]], [[
|
||||||
|
/* test if the ss_family member exists in struct sockaddr_storage */
|
||||||
|
@@ -504,6 +506,7 @@ AC_DEFUN([SANE_CHECK_IPV6],
|
||||||
|
], [
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
|
||||||
|
#define INET6
|
||||||
|
+ #include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h> ]], [[
|
||||||
|
/* test if the __ss_family member exists in struct sockaddr_storage */
|
||||||
|
diff -rup a/configure b/configure
|
||||||
|
--- a/configure 2023-02-05 21:12:47.000000000 -0500
|
||||||
|
+++ b/configure 2023-02-20 21:21:46.496776406 -0500
|
||||||
|
@@ -25824,6 +25824,7 @@ fi
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
#define INET6
|
||||||
|
+ #include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
int
|
||||||
|
@@ -25866,6 +25867,7 @@ $as_echo_n "checking whether struct sock
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
#define INET6
|
||||||
|
+ #include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
int
|
||||||
|
@@ -25895,6 +25897,7 @@ else
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
#define INET6
|
||||||
|
+ #include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
int
|
@ -0,0 +1,24 @@
|
|||||||
|
From 3f727cfb8f9bd6b3e3ac1ebf91ae7b9602f3d351 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
|
||||||
|
Date: Tue, 28 Nov 2023 21:24:01 +0100
|
||||||
|
Subject: [PATCH] sanei_usb: Fix build with libxml2 2.12
|
||||||
|
|
||||||
|
---
|
||||||
|
sanei/sanei_usb.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c
|
||||||
|
index 022f6fab9..850c3b369 100644
|
||||||
|
--- a/sanei/sanei_usb.c
|
||||||
|
+++ b/sanei/sanei_usb.c
|
||||||
|
@@ -65,6 +65,7 @@
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
#if WITH_USB_RECORD_REPLAY
|
||||||
|
+#include <libxml/parser.h>
|
||||||
|
#include <libxml/tree.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
@ -0,0 +1 @@
|
|||||||
|
u saned - "SANE scanner daemon user" /usr/share/sane /sbin/nologin
|
@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/backend/genesys.conf.in b/backend/genesys.conf.in
|
||||||
|
index d9c596a..50ae52c 100644
|
||||||
|
--- a/backend/genesys.conf.in
|
||||||
|
+++ b/backend/genesys.conf.in
|
||||||
|
@@ -146,6 +146,12 @@ usb 0x07b3 0x0c3a
|
||||||
|
# Plustek OpticFilm 7500i
|
||||||
|
usb 0x07b3 0x0c13
|
||||||
|
|
||||||
|
+# Plustek OpticFilm 7600i
|
||||||
|
+usb 0x07b3 0x0c3b
|
||||||
|
+
|
||||||
|
+# Plustek OpticFilm 8100
|
||||||
|
+usb 0x07b3 0x130c
|
||||||
|
+
|
||||||
|
# Plustek OpticFilm 8200i
|
||||||
|
usb 0x07b3 0x130d
|
||||||
|
|
@ -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=@CONFIGDIR@
|
||||||
|
# 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_NET=255
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
Also=saned.socket
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue