From nobody Mon Nov 27 17:44:10 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 4SfCd62nPbz536sw; Mon, 27 Nov 2023 17:44:10 +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 4SfCd62NTDz4FDy; Mon, 27 Nov 2023 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107050; 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=Uajznmn8BXZ+HAxr1YY0tUm0jEJLfHUiXo4qpIPn9mI=; b=sdoEXsrHAFwMM6tn6wwvUevZdleB5L5EBZQzkWY4ZBMVl5TMGpFD8d85XlzwKKOgQhpwf8 7sHSiLH1IJaSBlBNca2Ov7yO30A5fZ0RDxFC6JnxxkjvhPABWioCEM7N2yShPee5RQ3SmG TK8lpWh6Ff13AFhLGX1UBnvL+p4iV3CJD+3iCILTuhzX8vgAEFth5kQljIaAVNzYnDIMoF OrbRqWBqcW32ErzPXBbeHvp84iNnWk3sJ8Grhm5Cf2M7ZKe4wXiAVmjQ0G7x5KiftL50UE L1OBy1SmHMnaUwelXzEvgPFKGzBTfdrmv4pr0YSJKfHADS+1gKRTDfEPqCX7wA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701107050; 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=Uajznmn8BXZ+HAxr1YY0tUm0jEJLfHUiXo4qpIPn9mI=; b=oSXUaSHokB9Ga5G3jV5epniUpbkikb2MyjIBuPCWgi+/wZamENwIrQAROzM/2Q08aUWTj6 szZiH7dbz5eZAfRjsv2iehlfo9ikwxoQb3ThaKq3ysiI+V+rUkfcxJDx25rTeRwbjve4qu iWm9sXyIbUHuA94L3J/UwlBfbEaXJEpQMDOHL46TVYsuWrPrhCnIFNirWE2YaUqByr9wn4 TEY/qNA+zHfAj6di4z1QrcTQ/XVHsKAqJ0IE7epzAqOJCScc8463pTDr4knwg8/V828K8F D9Wi7MyIGcWj6qzvmfW4JwlXJyoZzvj7+CfTNZP2H0Lk4dKklWhVlxc14Ay3xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701107050; a=rsa-sha256; cv=none; b=tCm7m4qqrKRVuKcj+3I25SC8B+qqO2UFy5LUYbbV5pdIcktHfwcz6gDp0IioZsaqHAY0IH C2WY/7jpwEjaSvG7Yut7G/idpPfynxb3YwxFzbWifKFuw4ggdiLFpVeUiH7lSzPappA1Gf eDpYiADwMM1URTgT+xJStCBGX3DiwsoMP1f69R8MbF93U7qEiqRXB8gudiJM3HFmQIqj8i zwFq+/1EbXhx12ljUv3JIu/wt7gXVZUqRV4ACeV7NGL5k8c8ad5ZPx0pK9mToFpcxqLdY0 HgCfBta1dysMkYTp+ItPUlrY425u3SvY0BmWpQWZnlZtz2wiThuYssGdXh4TmA== 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 4SfCd61T4wznW1; Mon, 27 Nov 2023 17:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARHiAPc031095; Mon, 27 Nov 2023 17:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARHiAvK031092; Mon, 27 Nov 2023 17:44:10 GMT (envelope-from git) Date: Mon, 27 Nov 2023 17:44:10 GMT Message-Id: <202311271744.3ARHiAvK031092@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 8a47062d2f9a - main - graphics/mupdf: update to 1.23.6 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a47062d2f9a82624cfcd155038df1603286d985 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a47062d2f9a82624cfcd155038df1603286d985 commit 8a47062d2f9a82624cfcd155038df1603286d985 Author: Zsolt Udvari AuthorDate: 2023-11-27 08:20:35 +0000 Commit: Fernando Apesteguía CommitDate: 2023-11-27 17:43:42 +0000 graphics/mupdf: update to 1.23.6 ChangeLog: https://mupdf.com/releases/history.html PR: 275315 Reported by: uzsolt@uzsolt.hu (maintainer) --- graphics/mupdf/Makefile | 6 +- graphics/mupdf/distinfo | 6 +- graphics/mupdf/files/patch-Makerules | 150 +++++++++++------------------------ graphics/mupdf/pkg-plist | 34 ++------ 4 files changed, 56 insertions(+), 140 deletions(-) diff --git a/graphics/mupdf/Makefile b/graphics/mupdf/Makefile index c5af0a1ad89a..a77fdc979784 100644 --- a/graphics/mupdf/Makefile +++ b/graphics/mupdf/Makefile @@ -1,11 +1,9 @@ PORTNAME= mupdf -DISTVERSION= 1.20.3 -PORTREVISION= 1 +DISTVERSION= 1.23.6 DISTVERSIONSUFFIX= -source PORTEPOCH= 1 CATEGORIES= graphics -MASTER_SITES= http://www.mupdf.com/downloads/ \ - http://www.mupdf.com/downloads/archive/ +MASTER_SITES= http://www.mupdf.com/downloads/archive/ MAINTAINER= uzsolt@uzsolt.hu COMMENT= Lightweight PDF viewer and toolkit diff --git a/graphics/mupdf/distinfo b/graphics/mupdf/distinfo index 87e979bad365..94bd86c847b7 100644 --- a/graphics/mupdf/distinfo +++ b/graphics/mupdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1667131678 -SHA256 (mupdf-1.20.3-source.tar.gz) = 6b60070f6eec20e8d87d2b5cd22cf49020311a3cf15ee10998e3e5f5f984b1eb -SIZE (mupdf-1.20.3-source.tar.gz) = 88457290 +TIMESTAMP = 1700849414 +SHA256 (mupdf-1.23.6-source.tar.gz) = ac11eb859dd404488e5153cdc9651bb4341e5baaf4d3b3f27e2afc82f9aadc29 +SIZE (mupdf-1.23.6-source.tar.gz) = 55310697 diff --git a/graphics/mupdf/files/patch-Makerules b/graphics/mupdf/files/patch-Makerules index 3878e5d9a25c..d03a83bbeb7d 100644 --- a/graphics/mupdf/files/patch-Makerules +++ b/graphics/mupdf/files/patch-Makerules @@ -1,106 +1,46 @@ ---- Makerules.orig 2018-10-04 09:19:28 UTC +--- Makerules.orig 2023-11-24 18:10:54 UTC +++ Makerules -@@ -24,28 +24,28 @@ ifeq ($(build),debug) - CFLAGS += -pipe -g - LDFLAGS += -g $(LDREMOVEUNREACH) - else ifeq ($(build),release) -- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -+ CFLAGS += -DNDEBUG -fomit-frame-pointer - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s - else ifeq ($(build),small) - CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s - else ifeq ($(build),valgrind) -- CFLAGS += -pipe -O2 -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer -+ CFLAGS += -DNDEBUG -DPACIFY_VALGRIND -fno-omit-frame-pointer - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s - else ifeq ($(build),sanitize) - CFLAGS += -pipe -g -fno-omit-frame-pointer $(SANITIZE_FLAGS) - LDFLAGS += -g $(SANITIZE_FLAGS) - else ifeq ($(build),sanitize-release) -- CFLAGS += -pipe -O2 -DNDEBUG -fno-omit-frame-pointer $(SANITIZE_FLAGS) -+ CFLAGS += -DNDEBUG -fno-omit-frame-pointer $(SANITIZE_FLAGS) - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s $(SANITIZE_FLAGS) - else ifeq ($(build),profile) -- CFLAGS += -pipe -O2 -DNDEBUG -pg -+ CFLAGS += -DNDEBUG -pg - LDFLAGS += -pg - else ifeq ($(build),coverage) - CFLAGS += -pipe -g -pg -fprofile-arcs -ftest-coverage - LIBS += -lgcov - else ifeq ($(build),native) -- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native -+ CFLAGS += -DNDEBUG -fomit-frame-pointer -march=native - LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s - else ifeq ($(build),memento) - CFLAGS += -pipe -g -DMEMENTO -@@ -55,7 +55,7 @@ else ifeq ($(build),memento) - LIBS += -ldl - endif - else ifeq ($(build),gperf) -- CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -DGPERF -+ CFLAGS += -DNDEBUG -fomit-frame-pointer -DGPERF - LIBS += -lprofiler - else - $(error unknown build setting: '$(build)') -@@ -143,7 +143,59 @@ else ifeq ($(OS),Linux) - PTHREAD_LIBS := -lpthread - endif - --endif -+else ifeq ($(OS),FreeBSD) -+ PTHREAD_LIBS := -lthr -+# alphabetical order -+ # curl -+ USE_SYSTEM_CURL := yes -+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) -+ SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -+ # freetype -+ USE_SYSTEM_FREETYPE := yes -+ SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) -+ SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) -+ # glut -+ HAVE_GLUT := yes -+ USE_SYSTEM_GLUT := yes -+ SYS_GLUT_CFLAGS := -+ SYS_GLUT_LIBS := -lglut -lGL -+ # harfbuzz -+ USE_SYSTEM_HARFBUZZ := yes -+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) -+ SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) -+ # jbig2dec -+ USE_SYSTEM_JBIG2DEC := yes -+ SYS_JBIG2DEC_CFLAGS := -+ SYS_JIB2DEC_LIBS := -ljbig2dec -+ # lcms2 - needs a patched version of lcms2 -+ USE_SYSTEM_LCMS2 := no -+ # libcrypto -+ HAVE_LIBCRYPTO := no -+ SYS_LIBCRYPTO_CFLAGS := -+ SYS_LIBCRYPTO_LIBS := -+ # libjpeg -+ USE_SYSTEM_LIBJPEG := yes -+ SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) -+ SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) -+ # openjpeg -+ USE_SYSTEM_OPENJPEG := yes -+ SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) -+ SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) -+ # openssl -+ HAVE_OPENSSL_SSL := no -+ # pthread -+ HAVE_PTHREAD := yes -+ SYS_PTHREAD_CFLAGS := -+ SYS_PTHREAD_LIBS := -lpthread -+ # x11 -+ HAVE_X11 := yes -+ X11_CFLAGS := $(shell pkg-config --cflags x11 xext) -+ X11_LIBS := $(shell pkg-config --libs x11 xext) -+ # zlib -+ USE_SYSTEM_ZLIB := yes -+ SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) -+ SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) -+endif # FreeBSD - - # The following section has various cross compilation configurations. - # +@@ -331,3 +331,43 @@ ifeq "$(OS)" "ios" + LD = xcrun ld + RANLIB = xcrun ranlib + endif ++ ++ ++# added from FreeBSD ports ++PTHREAD_LIBS := -lthr ++USE_SYSTEM_CURL := yes ++SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl) ++SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) ++USE_SYSTEM_FREETYPE := yes ++SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2) ++SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2) ++HAVE_GLUT := yes ++USE_SYSTEM_GLUT := yes ++SYS_GLUT_CFLAGS := $(shell pkg-config --cflags gl glut) ++SYS_GLUT_LIBS := $(shell pkg-config --libs gl glut) ++USE_SYSTEM_HARFBUZZ := yes ++SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz) ++SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz) ++USE_SYSTEM_JBIG2DEC := yes ++SYS_JBIG2DEC_CFLAGS := $(shell pkg-config --cflags jbig2dec) ++SYS_JIB2DEC_LIBS := $(shell pkg-config --libs jbig2dec) ++USE_SYSTEM_LCMS2 := no ++HAVE_LIBCRYPTO := no ++SYS_LIBCRYPTO_CFLAGS := ++SYS_LIBCRYPTO_LIBS := ++USE_SYSTEM_LIBJPEG := yes ++SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg) ++SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg) ++USE_SYSTEM_OPENJPEG := yes ++SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2) ++SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2) ++HAVE_OPENSSL_SSL := no ++HAVE_PTHREAD := yes ++SYS_PTHREAD_CFLAGS := ++SYS_PTHREAD_LIBS := -lpthread ++HAVE_X11 := yes ++X11_CFLAGS := $(shell pkg-config --cflags x11 xext) ++X11_LIBS := $(shell pkg-config --libs x11 xext) ++USE_SYSTEM_ZLIB := yes ++SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib) ++SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib) diff --git a/graphics/mupdf/pkg-plist b/graphics/mupdf/pkg-plist index 18de275c5b51..f22e40634d55 100644 --- a/graphics/mupdf/pkg-plist +++ b/graphics/mupdf/pkg-plist @@ -37,6 +37,8 @@ include/mupdf/fitz/pool.h include/mupdf/fitz/separation.h include/mupdf/fitz/shade.h include/mupdf/fitz/store.h +include/mupdf/fitz/story-writer.h +include/mupdf/fitz/story.h include/mupdf/fitz/stream.h include/mupdf/fitz/string-util.h include/mupdf/fitz/structured-text.h @@ -79,20 +81,14 @@ man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/CHANGES %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/android-library.html -%%PORTDOCS%%%%DOCSDIR%%/artifex-logo.png -%%PORTDOCS%%%%DOCSDIR%%/building.html -%%PORTDOCS%%%%DOCSDIR%%/coding-overview.html -%%PORTDOCS%%%%DOCSDIR%%/coding-progressive.html -%%PORTDOCS%%%%DOCSDIR%%/coding-style.html -%%PORTDOCS%%%%DOCSDIR%%/ecosystem.css -%%PORTDOCS%%%%DOCSDIR%%/ecosystem.html +%%PORTDOCS%%%%DOCSDIR%%/examples/SnarkFront.svg %%PORTDOCS%%%%DOCSDIR%%/examples/bbox-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/create-thumbnail.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-device.js %%PORTDOCS%%%%DOCSDIR%%/examples/draw-document.js %%PORTDOCS%%%%DOCSDIR%%/examples/example.c %%PORTDOCS%%%%DOCSDIR%%/examples/fix-s22pdf.js +%%PORTDOCS%%%%DOCSDIR%%/examples/huntingofthesnark.png %%PORTDOCS%%%%DOCSDIR%%/examples/jpx-to-pdf.js %%PORTDOCS%%%%DOCSDIR%%/examples/multi-threaded.c %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-create-lowlevel.js @@ -102,24 +98,6 @@ man/man1/mutool.1.gz %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-merge.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-portfolio.js %%PORTDOCS%%%%DOCSDIR%%/examples/pdf-trace.js +%%PORTDOCS%%%%DOCSDIR%%/examples/storytest.c +%%PORTDOCS%%%%DOCSDIR%%/examples/storytest.js %%PORTDOCS%%%%DOCSDIR%%/examples/trace-device.js -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/library.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mupdf-gl.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-clean.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-convert.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-create.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-draw.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-extract.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-info.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-merge.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-pages.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-poster.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-run.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-show.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-sign.html -%%PORTDOCS%%%%DOCSDIR%%/manual-mutool-trace.html -%%PORTDOCS%%%%DOCSDIR%%/mutool.html -%%PORTDOCS%%%%DOCSDIR%%/style.css -%%PORTDOCS%%%%DOCSDIR%%/thirdparty.html -%%PORTDOCS%%%%DOCSDIR%%/viewers.html