cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to sane-backends-1.1.1.

Browse Source
This commit is contained in:
ajacoutot 2022-01-21 07:09:33 +00:00
parent 5bd7276bf3
commit 5c3a3dd134
10 changed files with 90 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
graphics/sane-backends/Makefile
View File

@ -1,13 +1,14 @@
# $OpenBSD: Makefile,v 1.103 2021/09/03 11:48:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.104 2022/01/21 07:09:33 ajacoutot Exp $
BROKEN-alpha= ICE hp5590.c:1141: error: unrecognizable insn
COMMENT= API for accessing scanners, backends
DISTNAME= sane-backends-1.0.32
REVISION= 2
V= 1.1.1
DISTNAME= backends-${V}
PKGNAME= sane-${DISTNAME}
SHARED_LIBS += sane 2.1 # unknown
SHARED_LIBS += sane 2.2 # unknown
CATEGORIES= graphics
@ -21,7 +22,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} c execinfo iconv jpeg lzma m png
WANTLIB += tiff usb-1.0 v4l1 v4l2 v4lconvert xml2 z zstd
MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/104f09c07d35519cc8e72e604f11643f/
MASTER_SITES= https://gitlab.com/sane-project/backends/-/archive/${V}/
COMPILER= base-clang ports-gcc
@ -44,7 +45,12 @@ USE_GMAKE= Yes
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/spool
CONFIGURE_STYLE= gnu
AUTOCONF_VERSION= 2.69
AUTOMAKE_VERSION= 1.16
# ./configure[18935]: syntax error: `noext,' unexpected
BUILD_DEPENDS += devel/autoconf-archive
CONFIGURE_STYLE= autoreconf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
@ -67,7 +73,7 @@ WANTLIB += X11 Xext Xrender avahi-client avahi-common cairo crypto
WANTLIB += curl dbus-1 expat ffi fontconfig freetype gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gobject-2.0 intl lcms2 nghttp2 openjp2
WANTLIB += pcre pixman-1 poppler poppler-glib ssl xcb xcb-render
WANTLIB += xcb-shm
WANTLIB += xcb-shm Xau Xdmcp
.else
CONFIGURE_ARGS += --without-avahi
.endif
@ -87,6 +93,11 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
FAKE_FLAGS= configdir=${PREFIX}/share/examples/sane-backends/sane.d
# https://gitlab.com/sane-project/backends/-/issues/440
post-extract:
echo ${V} >${WRKSRC}/.tarball-version
echo ${V} >${WRKSRC}/.version
post-install:
# removing the microtek2 backend which needs a Linux kernel module
find ${PREFIX} -name \*microtek2\* -delete

4
graphics/sane-backends/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (sane-backends-1.0.32.tar.gz) = OijCN8CnJ2cIYgI3n23JLbtj7AjfurIjEsuoDiOLsRQ=
SIZE (sane-backends-1.0.32.tar.gz) = 7349442
SHA256 (backends-1.1.1.tar.gz) = TKqRVbeX6Lg6vIi8v8ghIVXTiDEcO6B3u8+cmO14yg4=
SIZE (backends-1.1.1.tar.gz) = 5803631

32
graphics/sane-backends/patches/patch-acinclude_m4 Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2022/01/21 07:09:33 ajacoutot Exp $
Index: acinclude.m4
--- acinclude.m4.orig
+++ acinclude.m4
@@ -351,16 +351,6 @@ AC_DEFUN([SANE_CHECK_LOCKING],
[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
@@ -660,8 +650,7 @@ for be in ${BACKENDS}; do
;;
v4l)
- if test "${have_linux_ioctl_defines}" != "yes" \
- || test "${have_libv4l1}" != "yes"; then
+ if test "${have_libv4l1}" != "yes"; then
echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
backend_supported="no"
fi

12
graphics/sane-backends/patches/patch-backend_Makefile_in → graphics/sane-backends/patches/patch-backend_Makefile_am
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-backend_Makefile_in,v 1.15 2021/02/14 17:15:05 ajacoutot Exp $
$OpenBSD: patch-backend_Makefile_am,v 1.1 2022/01/21 07:09:33 ajacoutot Exp $
Index: backend/Makefile.in
--- backend/Makefile.in.orig
+++ backend/Makefile.in
@@ -2415,7 +2415,7 @@ top_srcdir = @top_srcdir@
Index: backend/Makefile.am
--- backend/Makefile.am.orig
+++ backend/Makefile.am
@@ -11,7 +11,7 @@ AM_LDFLAGS += $(STRICT_LDFLAGS)
# The -rpath option is added because we are creating _LTLIBRARIES based
# on configure substitution. This causes automake to not know the
# correct $libdir and must be added here.
-DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV) $(DYNAMIC_FLAG)
+DIST_SANELIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)/sane' -avoid-version $(DYNAMIC_FLAG)
DIST_LIBS_LDFLAGS = $(AM_LDFLAGS) -rpath '$(libdir)' -version-number $(V_MAJOR):$(V_MINOR):$(V_REV)
FIRMWARE_DIRS = artec_eplus48u gt68xx snapscan epjitsu
# LIBTOOL install is a little to noisy for my liking.

14
graphics/sane-backends/patches/patch-backend_epsonds_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-backend_epsonds_c,v 1.3 2020/08/23 15:52:11 ajacoutot Exp $
Index: backend/epsonds.c
--- backend/epsonds.c.orig
+++ backend/epsonds.c
@@ -50,6 +50,8 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
+#include <sys/select.h> /* fd_set */
+#include <sys/socket.h> /* setsockopt */
#include "sane/saneopts.h"
#include "sane/sanei_config.h"

4
graphics/sane-backends/patches/patch-backend_genesys_low_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-backend_genesys_low_cpp,v 1.4 2021/02/14 17:15:05 ajacoutot Exp $
$OpenBSD: patch-backend_genesys_low_cpp,v 1.5 2022/01/21 07:09:33 ajacoutot Exp $
errno.h header is required now that errno is a per-thread variable.
"undefined symbol 'errno'" at runtime with dlopen()'d modules.
@ -6,7 +6,7 @@ errno.h header is required now that errno is a per-thread variable.
Index: backend/genesys/low.cpp
--- backend/genesys/low.cpp.orig
+++ backend/genesys/low.cpp
@@ -42,6 +42,8 @@
@@ -21,6 +21,8 @@
#define DEBUG_DECLARE_ONLY

61
graphics/sane-backends/patches/patch-configure
View File

@ -1,61 +0,0 @@
$OpenBSD: patch-configure,v 1.21 2021/02/14 17:15:05 ajacoutot Exp $
Index: configure
--- configure.orig
+++ configure
@@ -22456,18 +22456,6 @@ if test "${with_group+set}" = set; then :
fi
- # 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
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&5
-$as_echo "$as_me: WARNING: Group $LOCKPATH_GROUP does not exist on this system." >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Locking feature will be disabled." >&5
-$as_echo "$as_me: WARNING: Locking feature will be disabled." >&2;}
- use_locking=no
- fi
fi
if test $use_locking = yes ; then
INSTALL_LOCKPATH=install-lockpath
@@ -23146,7 +23134,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
fi
-for ac_header in fcntl.h unistd.h libc.h sys/dsreq.h sys/select.h \
+for ac_header in fcntl.h unistd.h sys/dsreq.h sys/select.h \
sys/time.h sys/shm.h sys/ipc.h sys/scanio.h os2.h \
sys/socket.h sys/io.h sys/hw.h sys/types.h linux/ppdev.h \
dev/ppbus/ppi.h machine/cpufunc.h sys/sem.h sys/poll.h \
@@ -23369,6 +23357,7 @@ $as_echo_n "checking for socklen_t in <sys/socket.h>..
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
+#include <sys/types.h>
#include <sys/socket.h>
int
@@ -26520,8 +26509,7 @@ for be in ${BACKENDS}; do
;;
v4l)
- if test "${have_linux_ioctl_defines}" != "yes" \
- || test "${have_libv4l1}" != "yes"; then
+ if test "${have_libv4l1}" != "yes"; then
echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
backend_supported="no"
fi
@@ -26734,8 +26722,7 @@ for be in ${BACKENDS}; do
;;
v4l)
- if test "${have_linux_ioctl_defines}" != "yes" \
- || test "${have_libv4l1}" != "yes"; then
+ if test "${have_libv4l1}" != "yes"; then
echo "*** $be backend requires v4l libraries - $DISABLE_MSG"
backend_supported="no"
fi

24
graphics/sane-backends/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-configure_ac,v 1.1 2022/01/21 07:09:33 ajacoutot Exp $
1st chunk: ur libtool(1) and devel/libtool versions are too old.
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -55,7 +55,7 @@ AC_USE_SYSTEM_EXTENSIONS dnl call before runnin
AM_PROG_AR
LT_INIT([disable-static win32-dll])
-LT_PREREQ([2.4.6])
+LT_PREREQ([2.4.2])
dnl *****************************************************************
dnl Set up I18N/L10N support
@@ -239,6 +239,7 @@ AC_MSG_RESULT($have_long_long)
AC_MSG_CHECKING([for socklen_t in <sys/socket.h>])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
#include <sys/socket.h>
]], [[socklen_t len]])],AC_MSG_RESULT(yes),
[AC_MSG_RESULT(no); AC_DEFINE(socklen_t,int,

8
graphics/sane-backends/patches/patch-doc_saned_man
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-doc_saned_man,v 1.9 2021/02/14 17:15:05 ajacoutot Exp $
$OpenBSD: patch-doc_saned_man,v 1.10 2022/01/21 07:09:33 ajacoutot Exp $
Index: doc/saned.man
--- doc/saned.man.orig
+++ doc/saned.man
@@ -231,7 +231,7 @@ configuration file
@@ -250,7 +250,7 @@ configuration file
The configuration line normally looks like this:
.PP
.RS
@ -12,7 +12,7 @@ Index: doc/saned.man
.RE
.PP
However, if your system uses
@@ -245,16 +245,16 @@ and use a line of the following form in
@@ -264,16 +264,16 @@ and use a line of the following form in
instead:
.PP
.RS
@ -32,7 +32,7 @@ Index: doc/saned.man
can access the scanner (the program generally needs read and
write access to scanner devices).
@@ -279,8 +279,8 @@ service sane\-port
@@ -298,8 +298,8 @@ service sane\-port
port = 6566
socket_type = stream
wait = no

54
graphics/sane-backends/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.29 2021/04/25 06:54:52 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.30 2022/01/21 07:09:33 ajacoutot Exp $
@newgroup _saned:553
@newuser _saned:553:_saned:daemon:SANE Scanner Daemon:/var/empty:/sbin/nologin
@extraunexec rm -rf /var/spool/lock/sane/*
@ -458,82 +458,32 @@ share/examples/sane-backends/sane.d/umax_pp.conf
share/examples/sane-backends/sane.d/v4l.conf
share/examples/sane-backends/sane.d/xerox_mfp.conf
@sample ${SYSCONFDIR}/sane.d/xerox_mfp.conf
share/locale/
share/locale/bg/
share/locale/bg/LC_MESSAGES/
share/locale/bg/LC_MESSAGES/sane-backends.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/LC_MESSAGES/sane-backends.mo
share/locale/ca@valencia/
share/locale/ca@valencia/LC_MESSAGES/
share/locale/ca@valencia/LC_MESSAGES/sane-backends.mo
share/locale/cs/
share/locale/cs/LC_MESSAGES/
share/locale/cs/LC_MESSAGES/sane-backends.mo
share/locale/da/
share/locale/da/LC_MESSAGES/
share/locale/da/LC_MESSAGES/sane-backends.mo
share/locale/de/
share/locale/de/LC_MESSAGES/
share/locale/de/LC_MESSAGES/sane-backends.mo
share/locale/en@boldquot/
share/locale/en@boldquot/LC_MESSAGES/
share/locale/en@boldquot/LC_MESSAGES/sane-backends.mo
share/locale/en@quot/
share/locale/en@quot/LC_MESSAGES/
share/locale/en@quot/LC_MESSAGES/sane-backends.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/sane-backends.mo
share/locale/eo/
share/locale/eo/LC_MESSAGES/
share/locale/eo/LC_MESSAGES/sane-backends.mo
share/locale/es/
share/locale/es/LC_MESSAGES/
share/locale/es/LC_MESSAGES/sane-backends.mo
share/locale/fi/
share/locale/fi/LC_MESSAGES/
share/locale/fi/LC_MESSAGES/sane-backends.mo
share/locale/fr/
share/locale/fr/LC_MESSAGES/
share/locale/fr/LC_MESSAGES/sane-backends.mo
share/locale/gl/
share/locale/gl/LC_MESSAGES/
share/locale/gl/LC_MESSAGES/sane-backends.mo
share/locale/he/
share/locale/he/LC_MESSAGES/
share/locale/he/LC_MESSAGES/sane-backends.mo
share/locale/hu/
share/locale/hu/LC_MESSAGES/
share/locale/hu/LC_MESSAGES/sane-backends.mo
share/locale/it/
share/locale/it/LC_MESSAGES/
share/locale/it/LC_MESSAGES/sane-backends.mo
share/locale/ja/
share/locale/ja/LC_MESSAGES/
share/locale/ja/LC_MESSAGES/sane-backends.mo
share/locale/nb/
share/locale/nb/LC_MESSAGES/
share/locale/nb/LC_MESSAGES/sane-backends.mo
share/locale/nl/
share/locale/nl/LC_MESSAGES/
share/locale/nl/LC_MESSAGES/sane-backends.mo
share/locale/pl/
share/locale/pl/LC_MESSAGES/
share/locale/pl/LC_MESSAGES/sane-backends.mo
share/locale/pt/
share/locale/pt/LC_MESSAGES/
share/locale/pt/LC_MESSAGES/sane-backends.mo
share/locale/ru/
share/locale/ru/LC_MESSAGES/
share/locale/ru/LC_MESSAGES/sane-backends.mo
share/locale/sv/
share/locale/sv/LC_MESSAGES/
share/locale/sv/LC_MESSAGES/sane-backends.mo
share/locale/uk/
share/locale/uk/LC_MESSAGES/
share/locale/uk/LC_MESSAGES/sane-backends.mo
share/locale/zh_CN/LC_MESSAGES/sane-backends.mo
share/sane/
share/sane/artec_eplus48u/
share/sane/epjitsu/