From nobody Fri Mar 17 06:38:31 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 4PdDwm27Mcz40BJB; Fri, 17 Mar 2023 06:38:32 +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 4PdDwm159tz49KP; Fri, 17 Mar 2023 06:38:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679035112; 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=8YilUhVDfPZu8Z9NQTB0VTZHAx1jINA+4Gscl+lxFM0=; b=h/99RifFbHrquz2A94nF/prRN443B7zPcoc4BxUQbxRLjJimPM8uUVD5O+B8FBzfWZ/9Iu PeU5ClixCQiSSv3haRIvzIGwZUnNhy9L6ZlOQMQ3oq/JY/2EpX/kWUTLLFLYq5DeGbUBe4 5O84Sru5ae6zMwgLWizuSEk/qWL8SPsU7r4vcfQTzPe5Weqv6MVyHsicJLA1b8m3mZTHgu npqKFXCRsajnEzS2ulH8XhOXI+hOykffJy2BmCMcpW7olshQEzX8wJJGj6PhsDOd4DpklM aUzaJkw+V/UAC3V3e0UYUtT3mcTCe0aDiy2rmE6g2iUis/wq3CerNHBmskMnjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679035112; 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=8YilUhVDfPZu8Z9NQTB0VTZHAx1jINA+4Gscl+lxFM0=; b=gCPZiplU8y9iAM9uTI86hKMKS7kvXz4Ls1g2hfk/BUg0yBbMuR7YZ/ODh7dli2CsdY6gWT a/HW2Agf9UDcmOvdybHHTnY+4XPtTuMuDdUbqACwxvewSRu3YW4YLq9IJ+soRypD/Y1Df8 GeOc3rweAgyEUByQa3za7cjTCxbvV4tU93UZs2PXaJC5L2HEx8qCSRYwLZTWhRX6h+qilm fRM3JX2Nc90+h/tM8+PoQV1TZ12qjD4CHK+VBU77mUeFk3vDhFBMksWt8ZUiUc0WS9I375 Bfuh5hHfQdfg9YDLtMGJD7MB5NYudxsKv9JES1/OqGVzZCPrWOz4yFchdEkXLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679035112; a=rsa-sha256; cv=none; b=OxrdAiMttt344rup168TR7fJtjV6YWbybdRGpFr7LqW5DMHGh7MXc6xz1s6SgqGCVhdeyt s3U5Y/IUajRilnM4Sh6z3VhMy4sl5192SKmw8Sx+/RYL7+v4PWcByCLrSauExY9Q+AYFwS xdp02a+ABWtDjePAc3s814tvUwZPCv4tjimsNOegztqKYUDWEUMr5ntMEJ0sWAMSJ8R6Z4 nCNLOQHkGqFbK49Z7e/OAM+2Jf9KGLDTl4SYfL4Jf/z34Xwsyy5aesco7bdMWPoUBSecKr ofwy/J3tOakFEnswxPVT80ki81rWUMeBr4iBfEORGQn7xEHrG4dxqIdlQhppxg== 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 4PdDwm031HzFhC; Fri, 17 Mar 2023 06:38:32 +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 32H6cVAJ088122; Fri, 17 Mar 2023 06:38:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32H6cV6x088121; Fri, 17 Mar 2023 06:38:31 GMT (envelope-from git) Date: Fri, 17 Mar 2023 06:38:31 GMT Message-Id: <202303170638.32H6cV6x088121@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 1e7e52e029c8 - main - graphics/unpaper: Update to 7.0.0 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e7e52e029c8f5ffc38448ae46bc804a16fe6906 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e7e52e029c8f5ffc38448ae46bc804a16fe6906 commit 1e7e52e029c8f5ffc38448ae46bc804a16fe6906 Author: Daniel Engberg AuthorDate: 2023-03-17 06:30:20 +0000 Commit: Kai Knoblich CommitDate: 2023-03-17 06:30:20 +0000 graphics/unpaper: Update to 7.0.0 Changelog: * Tests now compare a golden file by counting the bytes that differ between it and the result. This allows non-byte-perfect calculations to be executed and still not fail the tests. This is required as fused multiply-add instructions can increase precision and thus deviate from the base C code, when using floating-point arithmetic. * Build is now provided by Meson, replacing the Autotools based build system introduced in 0.4, 10½ years ago. * Compatibility expanded to ffmpeg-5 (and newer versions), which is the current widely available release. https://github.com/unpaper/unpaper/releases/tag/unpaper-7.0.0 PR: 270218 --- graphics/unpaper/Makefile | 15 +++++++-------- graphics/unpaper/distinfo | 6 +++--- graphics/unpaper/files/patch-file.c | 30 ------------------------------ 3 files changed, 10 insertions(+), 41 deletions(-) diff --git a/graphics/unpaper/Makefile b/graphics/unpaper/Makefile index 64b8c47cb9d4..90af57dc960b 100644 --- a/graphics/unpaper/Makefile +++ b/graphics/unpaper/Makefile @@ -1,24 +1,23 @@ PORTNAME= unpaper -PORTVERSION= 6.1 +DISTVERSION= 7.0.0 CATEGORIES= graphics -MASTER_SITES= https://www.flameeyes.eu/files/ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/ \ + https://www.flameeyes.eu/files/ MAINTAINER= kai@FreeBSD.org COMMENT= Post-processing tool for scanned sheets of paper WWW= https://www.flameeyes.eu/projects/unpaper LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSES/GPL-2.0-only.txt + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} -BUILD_DEPENDS= xsltproc:textproc/libxslt \ - bash:shells/bash LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg -USES= autoreconf pkgconfig tar:xz - -GNU_CONFIGURE= yes +USES= meson pkgconfig python:build tar:xz PLIST_FILES= bin/${PORTNAME} \ man/man1/${PORTNAME}.1.gz diff --git a/graphics/unpaper/distinfo b/graphics/unpaper/distinfo index 16e5a9c01cd8..1c73c7691290 100644 --- a/graphics/unpaper/distinfo +++ b/graphics/unpaper/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1565468288 -SHA256 (unpaper-6.1.tar.xz) = 237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930 -SIZE (unpaper-6.1.tar.xz) = 2655724 +TIMESTAMP = 1678808615 +SHA256 (unpaper-7.0.0.tar.xz) = 2575fbbf26c22719d1cb882b59602c9900c7f747118ac130883f63419be46a80 +SIZE (unpaper-7.0.0.tar.xz) = 4430572 diff --git a/graphics/unpaper/files/patch-file.c b/graphics/unpaper/files/patch-file.c deleted file mode 100644 index aa8bbf6368fb..000000000000 --- a/graphics/unpaper/files/patch-file.c +++ /dev/null @@ -1,30 +0,0 @@ -Subject: Fix wrong ffmpeg API usage -Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800312 -Bug: https://github.com/Flameeyes/unpaper/issues/39 -Author: Andreas Cadhalpun -Forwarded: https://github.com/Flameeyes/unpaper/pull/42 - ---- file.c.orig 2014-10-26 22:35:38 UTC -+++ file.c -@@ -93,10 +93,21 @@ void loadImage(const char *filename, AVFrame **image) - if (pkt.stream_index != 0) - errOutput("unable to open file %s: invalid stream.", filename); - -+ while (!got_frame && pkt.data) { -+ -+ if (pkt.size <= 0) { -+ pkt.data = NULL; -+ pkt.size = 0; -+ } -+ - ret = avcodec_decode_video2(avctx, frame, &got_frame, &pkt); - if (ret < 0) { - av_strerror(ret, errbuff, sizeof(errbuff)); - errOutput("unable to open file %s: %s", filename, errbuff); -+ } -+ -+ pkt.data += ret; -+ pkt.size -= ret; - } - - switch(frame->format) {