<pre style='margin:0'>
Aaron Madlon-Kay (amake) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f34c734adeca684b943b72e711a91c2f70235758">https://github.com/macports/macports-ports/commit/f34c734adeca684b943b72e711a91c2f70235758</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f34c734adec sane-backends: update to 1.0.31 and fix build error (#8934)
</span>f34c734adec is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f34c734adeca684b943b72e711a91c2f70235758
</span>Author: macosx12345 <someuser12@users.noreply.github.com>
AuthorDate: Sun Jan 3 14:08:55 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> sane-backends: update to 1.0.31 and fix build error (#8934)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * sane-backends: update to 1.0.31 and fix build error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/61362
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - Fixed implicit function declaration when detecting IPv6 support
</span><span style='display:block; white-space:pre;color:#404040;'> - Deleted disused patch
</span><span style='display:block; white-space:pre;color:#404040;'> - libxml2 is linked opportunistically and disabling caused problems in my
</span><span style='display:block; white-space:pre;color:#404040;'> testing
</span><span style='display:block; white-space:pre;color:#404040;'> - `--{en,dis}able-avahi` renamed to `--with{,out}-avahi`
</span><span style='display:block; white-space:pre;color:#404040;'> - `--without-api-spec` has been removed
</span><span style='display:block; white-space:pre;color:#404040;'> - libcurl and poppler may be opportunistically linked for eslc support
</span><span style='display:block; white-space:pre;color:#404040;'> - Renamed variants to be less verbose
</span><span style='display:block; white-space:pre;color:#404040;'> - Added eslc variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Aaron Madlon-Kay <amake@macports.org>
</span>---
graphics/sane-backends/Portfile | 47 ++++++++++++++--------
.../files/patch-backend-ricoh2_buffer.c.diff | 14 -------
graphics/sane-backends/files/patch-configure.diff | 14 +++++--
.../files/patch-frontend-scanimage.c.diff | 10 +++++
4 files changed, 51 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/sane-backends/Portfile b/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3c8d7135901..f86c9cae7e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/sane-backends/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name sane-backends
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.0.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set upload_tag 9e718daff347826f4cfe21126c8d5091
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.0.31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set upload_tag 8bf1cae2e1803aefab9e5331550e5d5d
</span> categories graphics
platforms darwin
# Some content is LGPL-2+ or public-domain, but the package as a whole is GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@ long_description These are the backends for the Scanner Access Now \
</span>
master_sites https://gitlab.com/sane-project/backends/uploads/${upload_tag}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 03b8a59b0957f68ab0df8fdecb365ffc1a865e77 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 31260f3f72d82ac1661c62c5a4468410b89fb2b4a811dabbfcc0350c1346de03 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6753880
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a8b74418afc44513ec5e75e4f240448ad48ac59a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4a3b10fcb398ed854777d979498645edfe66fcac2f2fd2b9117a79ff45e2a5aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7301484
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,22 +30,24 @@ depends_lib port:jpeg \
</span> port:libusb \
port:net-snmp \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libxml2
</span>
# magicolor backend requires libcrypto from openssl
depends_lib-append path:lib/libcrypto.dylib:openssl
patchfiles patch-configure.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-backend-ricoh2_buffer.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-frontend-scanimage.c.diff
</span>
# genesys backend now uses C++11
compiler.cxx_standard 2011
configure.cppflags-append -fno-common
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-avahi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-api-spec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gphoto2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --without-avahi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gphoto2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-libcurl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-poppler-glib
</span>
post-configure {
reinplace -E {s|-arch [a-z0-9_]+||g} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,23 +59,23 @@ build.env-append LC_CTYPE=C
</span> use_parallel_build no
pre-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -o root -g admin -m 775 ${destroot}${prefix}/var/lock
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -o root -g admin -m 0775 ${destroot}${prefix}/var/lock
</span> }
destroot.keepdirs ${destroot}${prefix}/var/lock
default_variants +avahi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant disable_localbackends conflicts enable_pnmbackend with_gphoto2 description "turn off compilation of all backends but net" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant no_local conflicts pnm gphoto2 description "turn off compilation of all backends but net" {
</span> depends_lib-delete port:libusb-compat
configure.args-append --disable-local-backends --without-usb
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant enable_pnmbackend conflicts disable_localbackends description "enable the pnm backend for testing frontends (possible security risk, see PROBLEMS file)" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant pnm conflicts no_local description "enable the pnm backend for testing frontends (possible security risk, see PROBLEMS file)" {
</span> configure.args-append --enable-pnm-backend
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant with_gphoto2 conflicts disable_localbackends description "include the gphoto2 backend" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gphoto2 conflicts no_local description "include the gphoto2 backend" {
</span> depends_lib-append port:libexif \
port:libgphoto2 \
port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,8 +85,19 @@ variant with_gphoto2 conflicts disable_localbackends description "include the gp
</span>
variant avahi description "enable Avahi support for saned and the net backend" {
depends_lib-append port:avahi
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-avahi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-avahi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-avahi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-avahi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant escl requires avahi description "include the eSCL backend" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:jpeg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:poppler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-libcurl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-poppler-glib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-libcurl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-poppler-glib
</span> }
# This project uses u_long *everywhere* and doesn't bother including sys/types.h
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +105,7 @@ configure.cppflags-append -include sys/types.h
</span>
livecheck.type regex
livecheck.url https://gitlab.com/sane-project/backends/-/tags
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "backends-(\\d+(?:\\.\\d+)*)${extract.suffix}"
</span>
notes "\
Edit ${prefix}/etc/sane.d/dll.conf to enable only\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/sane-backends/files/patch-backend-ricoh2_buffer.c.diff b/graphics/sane-backends/files/patch-backend-ricoh2_buffer.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e4b2b9b798f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/sane-backends/files/patch-backend-ricoh2_buffer.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- backend/ricoh2_buffer.c.orig 2019-09-08 21:26:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ backend/ricoh2_buffer.c 2019-09-08 21:34:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <memory.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <assert.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../include/sane/sanei_debug.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/sane-backends/files/patch-configure.diff b/graphics/sane-backends/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fd71d0c5ab..c95b7d70e55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/sane-backends/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/sane-backends/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2009-05-03 09:59:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2009-07-06 15:09:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20171,7 +20171,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2020-08-23 13:59:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2020-10-24 23:57:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20198,7 +20198,7 @@
</span> AM_LDFLAGS="$AM_LDFLAGS -Wl,-brtl"
;;
darwin*) #include frameworks
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +9,11 @@
</span> ;;
esac
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -25940,6 +25940,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define INET6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/socket.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/sane-backends/files/patch-frontend-scanimage.c.diff b/graphics/sane-backends/files/patch-frontend-scanimage.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0be1f69ec54
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/sane-backends/files/patch-frontend-scanimage.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- frontend/scanimage.c.orig 2020-08-23 13:59:21.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ frontend/scanimage.c 2020-10-24 23:52:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <libgen.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/types.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/stat.h>
</span></pre><pre style='margin:0'>
</pre>