From nobody Sat Mar 09 17:59:17 2024 X-Original-To: dev-commits-ports-branches@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 4TsW512vKKz5Df3P; Sat, 9 Mar 2024 17:59:17 +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 4TsW512Lsqz49Vw; Sat, 9 Mar 2024 17:59:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710007157; 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=qsIYXrCJc0kHv3cWL4pS3kZC1LegHgZZLZL+4FyUFcw=; b=bYnfOs03abxKpg0Qu7iLW6mepvqz+oqiUrmbnKZJjnYuHLfJdBFsTH+7WCbnkfX37wyxcK /Vi9X03MpY9YC8mdP2nhXOl3Vaydc+RmIx4j1cV9DHaBPIJVxcwQNOki1FKZasonCcfLNj zD4CKF10cA1yuYE4BAMF3zeuCBN4BZYwxKBTcJYF73qhgSQmUPm0rImUEa11YAqH+rH/3H AQ/HyMUZOTS15sgyUI+4oh8iZAELQd68MrrVI2i+R6Jb+eSfd9zMphMc4NgOfgdW47hQEY xP1JiwWZP8bXh0VH3/9o9G2acil2vWYZVSitoJVDB0NMp6zuR65mKZ2rf2IM5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710007157; a=rsa-sha256; cv=none; b=QBOTIhm8swmu6Ie7ZzqPhqYkq/WQtHViaehULp9udcQmkMkRfSJ3UgIA8k+/86VaKHSq3n NZanuKoPpcU+RAzZSGAeu2XOsZIb5wpbWUdLazq5iqWOpsSCdGAWuXJp7xA5svMhR/wOAd soRAbRsH5JFWaz+WCyddFpEjJz+t6JDiZXYw+B/+u64nc2iiE/HbtdcKIzuUyIVvdt1FGo MYyTsbaYY+8MmhAWjzLIExAa7JGGLuG5B9elrvG+tA/Wg6A9jZfavw1gcn3SMhx6PeFXlE nX5O/CxdIJ95WAN6n8hfwg3ZIyU/pmZJqUWoBwxDFpQWIvcFvF1dqHV9hVCMWg== 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=1710007157; 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=qsIYXrCJc0kHv3cWL4pS3kZC1LegHgZZLZL+4FyUFcw=; b=B0blMn9WIaOQttHwme6Pdx1UW7VphtejSdz2YfYWP4RqhHXeUShq/MhA6Hth+NpuZ9EN7Y leVdyfWjBObYqPEycbmxQx6QOx6uJ5BUNAq/HFEZd6O19IIdupGggVyDleESvGK4ieRQWB emspfmHTPUez5i9V+jU/HszAqPJ3q+OqMYdyS6FofF28y61yMGHxTEfUv3/n9ZCBI/4nh5 lpEgWZbEJarXHMONd+itnTBcchapWJ/NFnpFsQK6Tg5tTWeS8F4o0y3Kbl1myRre4HBVX3 tTB2uvCb0acbHR972vDnmRct1WLYg9XidXYm7KP3Nd7eAm3kgcaJ/KM82x8PSw== 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 4TsW511qh1z1BLJ; Sat, 9 Mar 2024 17:59:17 +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 429HxHAh006389; Sat, 9 Mar 2024 17:59:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 429HxHa8006386; Sat, 9 Mar 2024 17:59:17 GMT (envelope-from git) Date: Sat, 9 Mar 2024 17:59:17 GMT Message-Id: <202403091759.429HxHa8006386@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 0264ae98404b - 2024Q1 - graphics/openjpeg: Update to 2.5.2 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 0264ae98404b603870fe0d27bbea64448e6952e1 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=0264ae98404b603870fe0d27bbea64448e6952e1 commit 0264ae98404b603870fe0d27bbea64448e6952e1 Author: Po-Chuan Hsieh AuthorDate: 2024-03-09 13:45:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-03-09 17:46:23 +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 (cherry picked from commit 8637d879641bfab94a2d3410ceb1a1b41b6fb047) --- 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