From nobody Wed May 03 19:08:58 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QBRLy5mXlz499N5; Wed, 3 May 2023 19:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QBRLy4s5Mz3ht5; Wed, 3 May 2023 19:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683140938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaPEfNA3ruxpUw9/Yz784ee2PzxAGn07d5h6LA9c4nQ=; b=hMp4Yj5N+6Y7rJh0W5vLqIvJxaCJqdsG9oSKtv3ip7U0Ht5WEPiRJSRhZ91nP1J8ceL2b0 xN9WtJeh2nUJmSCACznrb4lmbyyyqxIXvkM1ruNB+ybfsjdPJpY+hLDMtugrCGUu2N85+0 LyboYV/ygBGGQnzYUPoibZ+XaY7P9On4Z92FcbKhAo/aZ4owa5x477eogPr+yciThctm70 3xwzQ2xx6zRp91vh6IJnMM1X7RRsBkycSljLNOhqVLJAIHGwZDvXRDwAiDOmTLWSkutXwN j3aH2ge9fbxWjE93AExTgw3bZmthkIXS+OBoseR0FO/sYQSbRtvFZ/EJRgOqRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683140938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uaPEfNA3ruxpUw9/Yz784ee2PzxAGn07d5h6LA9c4nQ=; b=MRtJRb67zD48SU3sTddO4kVHEzJZk83vJMWbdcUsMRUDDfwhJy2RqRVQix+U0ielxKVl42 VV/nU4gu7G2UR5DPdu7PGf0KWPp+I2UPAi73aCb4USw2CPyPSSvkmeEAb62yePUqsalPOq +IfeHHfnjd/v13Mth5W/FZUn6tKKlc64YUl0iQPPrlC7ak18c29zFKPfqk0mQReSmQkP6G 2a/DvD61N6nqHuWA8Ae58nbCt1gS3qXlWKxaF8PhDuH0x1i/zX7dfPXd7uCOS2xuhmVrLk oUvBLxh5XxOGS3igmPljy24puke/ukrwcy8UuhphpRme7MXQaONs7G/jLoK8cQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683140938; a=rsa-sha256; cv=none; b=XMzJUAnW52M1cA/4emgbIt63HSKHvJPYaQFeTFpfkgwqC6zP+3P1ezJ64s3ZvXvFSA6jr8 t8iyO1wo/eEVoh4t6x3Fv43AScxbmybNBbvjdAzUVc3+MVe2z43S1ZAD5mudOWpJ6z/1Mf gCda8eL29a6tP6G4nqJ3ZOU1mMzSp8Jy75cpU9vDDDSrW+8RA3jQLBpJ+exuY8IZaw1fSU Z53ZDEVp3TpM4tTV9TYSMalVh9FCKTuL5adWV2wX9TetZtuS5xOLZhNCwDv3P1eCrnNQ3T noMqFoqBgxv1EaTqaP+1hbweTfWa+Ll5enwqp31u1tH38vCDHiYrI0USDaWacA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QBRLy3w95zhnQ; Wed, 3 May 2023 19:08:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 343J8ww5022139; Wed, 3 May 2023 19:08:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 343J8wcT022138; Wed, 3 May 2023 19:08:58 GMT (envelope-from git) Date: Wed, 3 May 2023 19:08:58 GMT Message-Id: <202305031908.343J8wcT022138@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 3fdc4af80ed7 - main - graphics/sane-backends: update to 1.2.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fdc4af80ed712c4a40974063e3aaf4ed3d34ce6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fdc4af80ed712c4a40974063e3aaf4ed3d34ce6 commit 3fdc4af80ed712c4a40974063e3aaf4ed3d34ce6 Author: Vladimir Druzenko AuthorDate: 2023-05-03 19:05:58 +0000 Commit: Vladimir Druzenko CommitDate: 2023-05-03 19:08:44 +0000 graphics/sane-backends: update to 1.2.1 New with 1.2.1 (released 2023-02-05): https://gitlab.com/sane-project/backends/-/releases/1.2.1 Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D39952 --- graphics/sane-backends/Makefile | 5 ++--- graphics/sane-backends/distinfo | 6 +++--- graphics/sane-backends/files/patch-backend_Makefile.in | 12 ++++++------ graphics/sane-backends/files/patch-frontend_jpegtopdf.c | 14 -------------- graphics/sane-backends/files/patch-frontend_scanimage.c | 12 ------------ 5 files changed, 11 insertions(+), 38 deletions(-) diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index d4ecda8fcc3e..95c17a4bbc6c 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,8 +1,7 @@ PORTNAME= sane-backends -DISTVERSION= 1.1.1 -PORTREVISION= 14 +DISTVERSION= 1.2.1 CATEGORIES= graphics -MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/7d30fab4e115029d91027b6a58d64b43/ +MASTER_SITES= https://gitlab.com/sane-project/backends/uploads/110fc43336d0fb5e514f1fdc7360dd87/ MAINTAINER= vvd@FreeBSD.org COMMENT= API for accessing scanners, digital cameras, frame grabbers, etc diff --git a/graphics/sane-backends/distinfo b/graphics/sane-backends/distinfo index c33b16c65b9b..bea099c6c95d 100644 --- a/graphics/sane-backends/distinfo +++ b/graphics/sane-backends/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643041643 -SHA256 (sane-backends-1.1.1.tar.gz) = dd4b04c37a42f14c4619e8eea6a957f4c7c617fe59e32ae2872b373940a8b603 -SIZE (sane-backends-1.1.1.tar.gz) = 7447569 +TIMESTAMP = 1683137196 +SHA256 (sane-backends-1.2.1.tar.gz) = f832395efcb90bb5ea8acd367a820c393dda7e0dd578b16f48928b8f5bdd0524 +SIZE (sane-backends-1.2.1.tar.gz) = 7308040 diff --git a/graphics/sane-backends/files/patch-backend_Makefile.in b/graphics/sane-backends/files/patch-backend_Makefile.in index 203efcc1d2ed..1d9c624263d6 100644 --- a/graphics/sane-backends/files/patch-backend_Makefile.in +++ b/graphics/sane-backends/files/patch-backend_Makefile.in @@ -1,6 +1,6 @@ --- backend/Makefile.in.orig 2020-08-23 12:27:20 UTC +++ backend/Makefile.in -@@ -1667,7 +1667,7 @@ AM_V_at = $(am__v_at_@AM_V@) +@@ -1704,7 +1704,7 @@ AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ am__v_at_1 = @@ -9,16 +9,16 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/libabaton_la-abaton.Plo \ -@@ -7276,7 +7276,7 @@ install-becfg: becfg - @# installed library in $(sanelibdir) to $(sanelibdir)/libsane.*. - @# Having two libsane's can cause issues so get rid of it. - -rm -f $(DESTDIR)$(sanelibdir)/libsane.* +@@ -8220,7 +8220,7 @@ install-becfg: becfg + @# installed library in $(execsanelibdir) to libsane.*, which + @# causes a conflict with the actual libsane.* in $(libdir). + -rm -f $(DESTDIR)$(execsanelibdir)/libsane.* - test -z "$(configdir)" || $(MKDIR_P) "$(DESTDIR)$(configdir)" + test -z "$(configdir)/dist" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dist" test -z "$(configdir)/dll.d" || $(MKDIR_P) "$(DESTDIR)$(configdir)/dll.d" @list="$(BACKEND_CONFS_ENABLED) saned.conf dll.conf"; for cfg in $$list; do \ if test ! -r $${cfg}; then continue; fi; \ -@@ -7284,7 +7284,7 @@ install-becfg: becfg +@@ -8228,7 +8228,7 @@ install-becfg: becfg echo NOT overwriting $${cfg} in $(configdir)...; \ else \ echo installing $${cfg} in $(configdir)/$${cfg}...; \ diff --git a/graphics/sane-backends/files/patch-frontend_jpegtopdf.c b/graphics/sane-backends/files/patch-frontend_jpegtopdf.c deleted file mode 100644 index f6e4be53ca79..000000000000 --- a/graphics/sane-backends/files/patch-frontend_jpegtopdf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- frontend/jpegtopdf.c.orig 2022-01-19 16:38:00 UTC -+++ frontend/jpegtopdf.c -@@ -201,7 +201,11 @@ static SANE_Int _get_current_time( struct tm *pt, SANE - goto EXIT; - } - /* get time difference ( OHH'mm' ) */ -+#ifdef __FreeBSD__ -+ tz = -pt->tm_gmtoff; -+#else - tz = timezone; -+#endif - if ( tz > 0 ) { - *sign_c = '-'; - } diff --git a/graphics/sane-backends/files/patch-frontend_scanimage.c b/graphics/sane-backends/files/patch-frontend_scanimage.c deleted file mode 100644 index cd7a92a0be01..000000000000 --- a/graphics/sane-backends/files/patch-frontend_scanimage.c +++ /dev/null @@ -1,12 +0,0 @@ ---- frontend/scanimage.c.orig 2022-01-19 16:38:00 UTC -+++ frontend/scanimage.c -@@ -39,6 +39,9 @@ - #include - #include - #include -+#ifdef __FreeBSD__ -+#include -+#endif - - #include - #include