mirror of
https://abf.rosa.ru/djam/sane.git
synced 2025-02-23 17:23:00 +00:00
Drop unused patch
This commit is contained in:
parent
14f601e600
commit
c6c009d740
2 changed files with 2 additions and 56 deletions
|
@ -1,51 +0,0 @@
|
||||||
Index: configure
|
|
||||||
===================================================================
|
|
||||||
--- configure
|
|
||||||
+++ configure 2011-03-17 11:50:22.929227833 +0100
|
|
||||||
@@ -16877,7 +16877,7 @@
|
|
||||||
pixma plustek plustek_pp qcam ricoh rts8891 s9036 \
|
|
||||||
sceptre sharp sm3600 sm3840 snapscan sp15c st400 \
|
|
||||||
stv680 tamarack teco1 teco2 teco3 test u12 umax
|
|
||||||
- umax_pp umax1220u v4l xerox_mfp p5"
|
|
||||||
+ umax_pp umax1220u v4l xerox_mfp p5 primascan"
|
|
||||||
|
|
||||||
# If user specifies backends manually then cause configure
|
|
||||||
# to fail if its detected it can't be compiled. If we
|
|
||||||
Index: backend/Makefile.am
|
|
||||||
===================================================================
|
|
||||||
--- backend/Makefile.am
|
|
||||||
+++ backend/Makefile.am 2011-03-17 11:52:09.793227833 +0100
|
|
||||||
@@ -191,7 +191,7 @@
|
|
||||||
libtamarack.la libtest.la libteco1.la \
|
|
||||||
libteco2.la libteco3.la libu12.la libumax.la \
|
|
||||||
libumax1220u.la libumax_pp.la libv4l.la \
|
|
||||||
- libxerox_mfp.la
|
|
||||||
+ libxerox_mfp.la libprimascan.la
|
|
||||||
|
|
||||||
# Each stand alone backend thats possible to be built should be listed
|
|
||||||
# here. There are the libraries that are installed under $(libdir)/sane.
|
|
||||||
@@ -224,7 +224,7 @@
|
|
||||||
libsane-tamarack.la libsane-test.la libsane-teco1.la \
|
|
||||||
libsane-teco2.la libsane-teco3.la libsane-u12.la libsane-umax.la \
|
|
||||||
libsane-umax1220u.la libsane-umax_pp.la libsane-v4l.la \
|
|
||||||
- libsane-xerox_mfp.la
|
|
||||||
+ libsane-xerox_mfp.la libsane-primascan.la
|
|
||||||
|
|
||||||
EXTRA_LTLIBRARIES = $(be_convenience_libs) $(be_dlopen_libs)
|
|
||||||
|
|
||||||
@@ -1064,6 +1064,15 @@
|
|
||||||
libsane_xerox_mfp_la_LIBADD = $(COMMON_LIBS) libxerox_mfp.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_tcp.lo $(MATH_LIB) $(SOCKET_LIBS) $(USB_LIBS) $(RESMGR_LIBS)
|
|
||||||
EXTRA_DIST += xerox_mfp.conf.in
|
|
||||||
|
|
||||||
+libprimascan_la_SOURCES = primascan.c primascan.h
|
|
||||||
+libprimascan_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=primascan
|
|
||||||
+
|
|
||||||
+nodist_libsane_primascan_la_SOURCES = primascan-s.c
|
|
||||||
+libsane_primascan_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=primascan
|
|
||||||
+libsane_primascan_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
|
|
||||||
+libsane_primascan_la_LIBADD = $(COMMON_LIBS) libprimascan.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo sane_strstatus.lo ../sanei/sanei_usb.lo $(MATH_LIB) $(USB_LIBS)
|
|
||||||
+
|
|
||||||
+
|
|
||||||
libdll_la_SOURCES = dll.c
|
|
||||||
BUILT_SOURCES = dll-preload.h
|
|
||||||
CLEANFILES += dll-preload.h
|
|
|
@ -27,7 +27,7 @@ Version: 1.0.25
|
||||||
Release: 1
|
Release: 1
|
||||||
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
|
# lib/ is LGPLv2+, backends are GPLv2+ with exceptions
|
||||||
# Tools are GPLv2+, docs are public domain
|
# Tools are GPLv2+, docs are public domain
|
||||||
License: GPLv2+ and GPLv2+ with exceptions and Public Domain
|
License: GPLv2+ and GPLv2+ with exceptions and Public Domain
|
||||||
Group: Graphics
|
Group: Graphics
|
||||||
Url: http://www.sane-project.org/
|
Url: http://www.sane-project.org/
|
||||||
Source0: http://alioth.debian.org/frs/download.php/file/3958/sane-backends-%{version}.tar.gz
|
Source0: http://alioth.debian.org/frs/download.php/file/3958/sane-backends-%{version}.tar.gz
|
||||||
|
@ -72,8 +72,6 @@ Patch21: sane-backends-1.0.23-udev.patch
|
||||||
Patch30: iscan-2.29.3-fix-link.patch
|
Patch30: iscan-2.29.3-fix-link.patch
|
||||||
Patch31: iscan-2.20.1-no_non-free_please.diff
|
Patch31: iscan-2.20.1-no_non-free_please.diff
|
||||||
Patch32: iscan-2.28.1-linkage_fix.patch
|
Patch32: iscan-2.28.1-linkage_fix.patch
|
||||||
# (fc) 1.0.20-1mdv primascan build support
|
|
||||||
Patch29: sane-backends-1.0.21-primascan.patch
|
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
|
@ -283,9 +281,8 @@ systemctl restart xinetd
|
||||||
%setup -q -T -D -a 3 -n sane-backends-%{version}
|
%setup -q -T -D -a 3 -n sane-backends-%{version}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# "primascan" backend
|
# "primascan" backend
|
||||||
# (commented out in dll.conf, as it claims to support every USB scanner)
|
# (commented out in dll.conf, as it claims to support every USB scanner)
|
||||||
######%patch29 -p0 -b .primascan
|
|
||||||
cat %{SOURCE11} > backend/primascan.h
|
cat %{SOURCE11} > backend/primascan.h
|
||||||
cat %{SOURCE12} > backend/primascan.c
|
cat %{SOURCE12} > backend/primascan.c
|
||||||
echo '#primascan' >> backend/dll.conf.in
|
echo '#primascan' >> backend/dll.conf.in
|
||||||
|
|
Loading…
Add table
Reference in a new issue