From nobody Sat Mar 9 14:10:22 2024 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 4TsQ0v2y5Qz5DFKD; Sat, 9 Mar 2024 14:10:23 +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 4TsQ0v1nHpz4qQg; Sat, 9 Mar 2024 14:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993423; 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=W1Bk4olC3/E/dehGm/y4K7WA1VZYl1bo2J4waIvR91Q=; b=sneplTEyA3QlrOqQnJdwXvQH9zg8SQH5fIPNrmL/EMsAr9s82sv8WeUdCb2vVYTRblO5s1 tVA61n/ddgyVUJMV1vrXPsFEyccUh5wKQymqJAoVG9B5lUMhF7D/ywmZuwkdBhGYkOMpDk Z26Jxo0X3EDzsLrS9URJVoxU533W9yiflbNmL9HrzesVem4byy+C8WxFNotzX6NLasaP5z royT4E/eUoNbyTYJ1saIHe1t6Uq+7exPj+l93WznJjktuA0xIjRqpizPwnDY9hxc042a5A WETVWpJqqUGk8+w08tv+Anhs2XC0cPw2iKRQaTYcnR6rOpuEaABzQ2yM3suXGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709993423; a=rsa-sha256; cv=none; b=tUOhsKgwa7/bgnjvnjAFZBzGkhNh+nTBGFdsBgLkSj2iNhjPyQLW4bNoDYjRjKCR1eI+Lp JFc4UOFYSQBDuMF3AZi7fcL8WdY2vIiordCOsciwBL3b+8Jp4SwgFd4cPhQ6gTaPNg3XsN gd2NRTJmh7gcgpXpio7iwZ9pDZu0y2iaKMSf15mrfb2HYJ8LFtTEWqbRsZQ6ZPJdRIYGN7 kwWTFOvcRmoLnYshC369aihJluuwnXcGGQZMtkK36Fz1mXI5uyQ7lNDJNX9vbDIVrhZEWD e1qOyA6LAd3WmbFVRPEAcpndktOGLnDWrwJWdUuwAKZYNg8Ec9af3WVP1vjyqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709993423; 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=W1Bk4olC3/E/dehGm/y4K7WA1VZYl1bo2J4waIvR91Q=; b=a9CDH5oENCNhCa7VDe0SWUt7L7ryLluhujIrZwH17tgPWp3vaou2P7thyy5aqXku5h++BE z56Z8NbpAUoZulfffV+Q1S5KKCb8E+0JYu8uJcoz+7hJGJItQ/jTrM1i0Up6TWWOvv1/Ov r5W9TAnoYBAFMD1wgr7oA3rh4x9KVo48sbNJYjUyxtoDB7vXmLEzlTnaZG/M/Cy2HbLGLV sicBS3dT/h7CfX7HPPVEOrR5npC76m3lMZ5CEP29n2yTvx9/eiBJCo9QrVZkvlzPfNd/0f K/o14O+aKrnt/yCMd5lUQ0576DfssCyUIawl72LQwQs/dUZ1L3GgvK5V8S1yLA== 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 4TsQ0v09lyz14Mm; Sat, 9 Mar 2024 14:10:23 +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 429EAM2T003135; Sat, 9 Mar 2024 14:10:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429EAMNl003132; Sat, 9 Mar 2024 14:10:22 GMT (envelope-from git) Date: Sat, 9 Mar 2024 14:10:22 GMT Message-Id: <202403091410.429EAMNl003132@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 8637d879641b - main - graphics/openjpeg: Update to 2.5.2 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8637d879641bfab94a2d3410ceb1a1b41b6fb047 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=8637d879641bfab94a2d3410ceb1a1b41b6fb047 commit 8637d879641bfab94a2d3410ceb1a1b41b6fb047 Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:45:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-09 14:05:24 +0000 graphics/openjpeg: Update to 2.5.2 - Update WWW - Use USES=pathfix to fix .pc installation Changes: https://github.com/uclouvain/openjpeg/releases https://github.com/uclouvain/openjpeg/blob/master/CHANGELOG.md https://github.com/uclouvain/openjpeg/blob/master/NEWS.md Security: CVE-2021-3575 --- graphics/openjpeg/Makefile | 25 ++++++++++++++++++------- graphics/openjpeg/distinfo | 6 +++--- graphics/openjpeg/files/patch-CMakeLists.txt | 19 ------------------- graphics/openjpeg/pkg-plist | 8 ++++---- 4 files changed, 25 insertions(+), 33 deletions(-) diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index 70ec7052c3c9..514b2e0eb0bd 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -1,12 +1,12 @@ PORTNAME= openjpeg -PORTVERSION= 2.5.0 +PORTVERSION= 2.5.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= sunpoet@FreeBSD.org COMMENT= Open-source JPEG 2000 codec -WWW= https://www.openjpeg.org/ +WWW= https://www.openjpeg.org/ \ + https://github.com/uclouvain/openjpeg LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE @@ -15,10 +15,21 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= cmake cpe localbase:ldflags jpeg pkgconfig - -CMAKE_OFF= BUILD_DOC BUILD_JAVA BUILD_JPIP BUILD_JPIP_SERVER BUILD_LUTS_GENERATOR BUILD_TESTING BUILD_THIRDPARTY BUILD_UNIT_TESTS BUILD_VIEWER WITH_ASTYLE -CMAKE_ON= BUILD_CODEC BUILD_PKGCONFIG_FILES BUILD_SHARED_LIBS BUILD_STATIC_LIBS +USES= cmake cpe localbase:ldflags jpeg pathfix pkgconfig + +CMAKE_OFF= BUILD_DOC \ + BUILD_JAVA \ + BUILD_JPIP \ + BUILD_JPIP_SERVER \ + BUILD_LUTS_GENERATOR \ + BUILD_TESTING \ + BUILD_THIRDPARTY \ + BUILD_UNIT_TESTS \ + BUILD_VIEWER \ + WITH_ASTYLE +CMAKE_ON= BUILD_CODEC \ + BUILD_SHARED_LIBS \ + BUILD_STATIC_LIBS USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R} diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo index 72da930c1f67..2cb491883bdb 100644 --- a/graphics/openjpeg/distinfo +++ b/graphics/openjpeg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653151054 -SHA256 (uclouvain-openjpeg-v2.5.0_GH0.tar.gz) = 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a -SIZE (uclouvain-openjpeg-v2.5.0_GH0.tar.gz) = 1867111 +TIMESTAMP = 1709390392 +SHA256 (uclouvain-openjpeg-v2.5.2_GH0.tar.gz) = 90e3896fed910c376aaf79cdd98bdfdaf98c6472efd8e1debf0a854938cbda6a +SIZE (uclouvain-openjpeg-v2.5.2_GH0.tar.gz) = 1871948 diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt deleted file mode 100644 index 306d2fed2c30..000000000000 --- a/graphics/openjpeg/files/patch-CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2022-05-13 16:54:29 UTC -+++ CMakeLists.txt -@@ -370,14 +370,14 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ libdata/pkgconfig ) - # - if(BUILD_JPIP) - # install in lib and not share (see multi-arch note above) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ libdata/pkgconfig ) - endif() - endif() - diff --git a/graphics/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist index 0c05f9efebb1..062d6a341527 100644 --- a/graphics/openjpeg/pkg-plist +++ b/graphics/openjpeg/pkg-plist @@ -3,12 +3,12 @@ bin/opj_decompress bin/opj_dump include/openjpeg-%%VER%%/openjpeg.h include/openjpeg-%%VER%%/opj_config.h -include/openjpeg-%%VER%%/opj_stdint.h +lib/cmake/openjpeg-%%VER%%/OpenJPEGConfig.cmake +lib/cmake/openjpeg-%%VER%%/OpenJPEGConfigVersion.cmake +lib/cmake/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/openjpeg-%%VER%%/OpenJPEGTargets.cmake lib/libopenjp2.a lib/libopenjp2.so lib/libopenjp2.so.%%PORTVERSION%% lib/libopenjp2.so.7 -lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake -lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake libdata/pkgconfig/libopenjp2.pc