[packages/sane-backends] up to 1.2.1

atler atler at pld-linux.org
Fri Nov 17 21:48:53 CET 2023 

commit b3a628edb0d0c5f44f665aed412c0377780777fd
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Nov 17 21:37:47 2023 +0100

    up to 1.2.1

 sane-backends-link.patch           | 43 +++++++++++++++++++-------------------
 sane-backends-lockpath_group.patch | 20 ------------------
 sane-backends-mustek-path.patch    |  2 +-
 sane-backends-spatc.patch          | 43 --------------------------------------
 sane-backends.spec                 | 16 ++++++--------
 5 files changed, 29 insertions(+), 95 deletions(-)
---
diff --git a/sane-backends.spec b/sane-backends.spec
index ef6978f..c2e9106 100644
--- a/sane-backends.spec
+++ b/sane-backends.spec
@@ -19,21 +19,19 @@ Summary(ko.UTF-8):	스캐너를 다루는 소프트웨어
 Summary(pl.UTF-8):	SANE - prosta obsługa skanerów lokalnych i sieciowych
 Summary(pt_BR.UTF-8):	SANE - acesso a scanners locais e em rede
 Name:		sane-backends
-Version:	1.0.32
+Version:	1.2.1
 Release:	1
 License:	relaxed GPL v2+ (libraries), Public Domain (docs)
 Group:		Libraries
 # http://www.sane-project.org/source.html is out of date atm. (20180902)
 #Source0Download: https://gitlab.com/sane-project/backends/-/tags [URLs from //gitlab.com/sane-project/backends/-/releases with JS support]
-Source0:	https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/%{name}-%{version}.tar.gz
-# Source0-md5:	51ff581b911fc9b7b6b5ae6959f9089b
+Source0:	https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/%{name}-%{version}.tar.gz
+# Source0-md5:	302159419ed1ee216c6e1edbe97c2a8c
 Source1:	%{name}.rc-inetd
 Source2:	%{name}.m4
-Patch0:		%{name}-lockpath_group.patch
-Patch1:		%{name}-mustek-path.patch
-Patch2:		%{name}-spatc.patch
-Patch3:		%{name}-link.patch
-Patch4:		%{name}-1.0.23-sane-config-multilib.patch
+Patch0:		%{name}-mustek-path.patch
+Patch1:		%{name}-link.patch
+Patch2:		%{name}-1.0.23-sane-config-multilib.patch
 URL:		http://www.sane-project.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	autoconf-archive
@@ -296,8 +294,6 @@ Sterownik SANE do urządzeń obsługiwanych przez system Video4Linux.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %{__sed} -i -e 's/m4_esyscmd_s(\[git describe --dirty\])/[%{version}]/' configure.ac
 
diff --git a/sane-backends-link.patch b/sane-backends-link.patch
index b979868..ab04d0b 100644
--- a/sane-backends-link.patch
+++ b/sane-backends-link.patch
@@ -1,34 +1,35 @@
---- sane-backends-1.0.29/backend/Makefile.am.orig	2020-04-19 08:47:07.661491206 +0200
-+++ sane-backends-1.0.29/backend/Makefile.am	2020-04-19 08:48:21.261092483 +0200
-@@ -284,7 +284,7 @@
- nodist_libsane_artec_eplus48u_la_SOURCES = artec_eplus48u-s.c
- libsane_artec_eplus48u_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=artec_eplus48u
- libsane_artec_eplus48u_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
--libsane_artec_eplus48u_la_LIBADD = $(COMMON_LIBS) libartec_eplus48u.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(MATH_LIB) $(USB_LIBS) $(SANEI_THREAD_LIBS) $(RESMEG_LIBS)
-+libsane_artec_eplus48u_la_LIBADD = $(COMMON_LIBS) libartec_eplus48u.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_config.lo  sane_strstatus.lo ../sanei/sanei_usb.lo ../sanei/sanei_thread.lo $(MATH_LIB) $(USB_LIBS) $(SANEI_THREAD_LIBS) $(RESMGR_LIBS)
+--- sane-backends-1.2.1/backend/Makefile.am.orig	2023-11-17 21:02:29.569878012 +0100
++++ sane-backends-1.2.1/backend/Makefile.am	2023-11-17 21:06:27.006433425 +0100
+@@ -335,7 +335,7 @@
+     sane_strstatus.lo \
+     ../sanei/sanei_usb.lo \
+     ../sanei/sanei_thread.lo \
+-    $(MATH_LIB) $(USB_LIBS) $(SANEI_THREAD_LIBS) $(RESMEG_LIBS)
++    $(MATH_LIB) $(USB_LIBS) $(SANEI_THREAD_LIBS) $(RESMGR_LIBS)
  EXTRA_DIST += artec_eplus48u.conf.in
  
  libas6e_la_SOURCES = as6e.c as6e.h
-@@ -969,7 +969,7 @@
- nodist_libsane_ricoh2_la_SOURCES = ricoh2-s.c
- libsane_ricoh2_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=ricoh2
- libsane_ricoh2_la_LDFLAGS = $(DIST_SANELIBS_LDFLAGS)
--libsane_ricoh2_la_LIBADD = $(COMMON_LIBS) libricoh2.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_usb.lo ../sanei/sanei_config.lo sane_strstatus.lo $(USB_LIBS)
-+libsane_ricoh2_la_LIBADD = $(COMMON_LIBS) libricoh2.la ../sanei/sanei_init_debug.lo ../sanei/sanei_constrain_value.lo ../sanei/sanei_usb.lo ../sanei/sanei_config.lo sane_strstatus.lo $(USB_LIBS) $(RESMGR_LIBS)
+@@ -1586,7 +1586,7 @@
+     ../sanei/sanei_usb.lo \
+     ../sanei/sanei_config.lo \
+     sane_strstatus.lo \
+-    $(USB_LIBS)
++    $(USB_LIBS) $(RESMGR_LIBS)
  EXTRA_DIST += ricoh2_buffer.c
  
  librts8891_la_SOURCES = rts8891.c rts8891.h rts88xx_lib.c rts88xx_lib.h
-@@ -1178,10 +1178,10 @@
- 
+@@ -1966,11 +1966,11 @@
  libdll_preload_la_SOURCES =  dll.c
  libdll_preload_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll -DENABLE_PRELOAD
--libdll_preload_la_LIBADD = ../sanei/sanei_usb.lo $(USB_LIBS) $(XML_LIBS)
-+libdll_preload_la_LIBADD = ../sanei/sanei_usb.lo $(USB_LIBS) $(RESMGR_LIBS) $(XML_LIBS)
+ libdll_preload_la_LIBADD = ../sanei/sanei_usb.lo \
+-     $(USB_LIBS) $(XML_LIBS)
++     $(USB_LIBS) $(RESMGR_LIBS) $(XML_LIBS)
  libdll_la_SOURCES =  dll.c
  libdll_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
--libdll_la_LIBADD = ../sanei/sanei_usb.lo $(USB_LIBS) $(XML_LIBS)
-+libdll_la_LIBADD = ../sanei/sanei_usb.lo $(USB_LIBS) $(RESMGR_LIBS) $(XML_LIBS)
- BUILT_SOURCES = dll-preload.h
+ libdll_la_LIBADD = ../sanei/sanei_usb.lo \
+-     $(USB_LIBS) $(XML_LIBS)
++     $(USB_LIBS) $(RESMGR_LIBS) $(XML_LIBS)
+ BUILT_SOURCES += dll-preload.h
  CLEANFILES += dll-preload.h
  
 --- sane-backends-1.0.29/tools/Makefile.am.orig	2020-04-19 08:47:07.661491206 +0200
diff --git a/sane-backends-lockpath_group.patch b/sane-backends-lockpath_group.patch
deleted file mode 100644
index 998fb76..0000000
--- a/sane-backends-lockpath_group.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sane-backends-1.0.19/acinclude.m4.orig	2008-05-30 20:34:04.620337000 +0200
-+++ sane-backends-1.0.19/acinclude.m4	2008-05-30 20:37:47.481036362 +0200
-@@ -322,16 +322,6 @@
-                      [use the specified group for lock dir @<:@default=uucp@:>@]),
-         [LOCKPATH_GROUP="$withval"]
-     )
--    # check if the group does exist
--    lasterror=""
--    touch sanetest.file
--    chgrp $LOCKPATH_GROUP sanetest.file 2>/dev/null || lasterror=$?
--    rm -f sanetest.file
--    if test ! -z "$lasterror"; then
--      AC_MSG_WARN([Group $LOCKPATH_GROUP does not exist on this system.])
--      AC_MSG_WARN([Locking feature will be disabled.])
--      use_locking=no
--    fi
-   fi
-   if test $use_locking = yes ; then
-     INSTALL_LOCKPATH=install-lockpath
-
diff --git a/sane-backends-mustek-path.patch b/sane-backends-mustek-path.patch
index 252db24..d1f265f 100644
--- a/sane-backends-mustek-path.patch
+++ b/sane-backends-mustek-path.patch
@@ -1,8 +1,8 @@
 --- sane-backends-1.0.4/tools/mustek600iin-off.c.orig	Mon Aug  9 20:06:01 1999
 +++ sane-backends-1.0.4/tools/mustek600iin-off.c	Sat Feb 10 20:29:19 2001
 @@ -28,7 +28,7 @@
- #include "../include/sane/config.h"
  #include "../include/sane/sanei.h"
+ #include "../include/sane/sanei_directio.h"
  
 -#define MUSTEK_CONF	STRINGIFY(PATH_SANE_CONFIG_DIR) "/mustek.conf"
 +#define MUSTEK_CONF	"/etc/sane.d/mustek.conf"
diff --git a/sane-backends-spatc.patch b/sane-backends-spatc.patch
deleted file mode 100644
index 4ea3048..0000000
--- a/sane-backends-spatc.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- sane-1.0.2/sanei/sanei_ab306.c.orig	Thu May 18 18:22:45 2000
-+++ sane-1.0.2/sanei/sanei_ab306.c	Thu May 18 18:24:27 2000
-@@ -49,6 +49,10 @@
- 
- #include <sys/types.h>
- 
-+#ifdef __sparc__
-+#define IO_SUPPORT_MISSING
-+#else
-+
- #ifdef HAVE_SYS_IO_H
- # include <sys/io.h>	/* use where available (glibc 2.x, for example) */
- # ifndef SANE_HAVE_SYS_IO_H_WITH_INB_OUTB
-@@ -72,6 +76,8 @@
- 
- #else
- # define IO_SUPPORT_MISSING
-+#endif
-+
- #endif
- 
- #include "../include/sane/sane.h"
---- sane-1.0.2/sanei/sanei_pio.c.orig	Thu May 18 18:24:42 2000
-+++ sane-1.0.2/sanei/sanei_pio.c	Thu May 18 18:25:31 2000
-@@ -58,6 +58,10 @@
- #endif
- #include <sys/types.h>
- 
-+#ifdef __sparc__
-+#define IO_SUPPORT_MISSING
-+#else
-+
- #ifdef HAVE_SYS_IO_H
- # include <sys/io.h>	/* use where available (glibc 2.x, for example) */
- # ifndef SANE_HAVE_SYS_IO_H_WITH_INB_OUTB
-@@ -83,6 +87,7 @@
- 
- #else
- # define IO_SUPPORT_MISSING
-+#endif
- #endif
- 
- #include "../include/sane/sane.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sane-backends.git/commitdiff/b3a628edb0d0c5f44f665aed412c0377780777fd

More information about the pld-cvs-commit mailing list