From nobody Sun May 22 07:23:12 2022 X-Original-To: dev-commits-ports-all@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 A74831AEA751; Sun, 22 May 2022 07:23:12 +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 4L5X4J4974z4jlS; Sun, 22 May 2022 07:23:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653204192; 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=FZ7WkuBjcziP/xjZvt7Aazf4Mx2KwFiS4fjZZNIDgVI=; b=jiI88enRVnFc3RPy1rrJELnoU3y1Y9QqafkvHs4wJazhkAi7c4cY9hJ9HIeqU7wzSy8+O9 kJb5KiY0nFpR6YbUZkdMaCOcnQH0L95bk7KToKYpELric6VoiAeXOfVpox7XMJZyTtQv9W NJI5GKPITUC2tu56ssnQ+eRlj1DlsfUhJmjZT17WCDeKoeo77CJHLzT7dR3PGqn4Qbb0zz N1tTT8a8whuR3OpFcrdRLBAeTPB6in6ejIl7PXDrIUmWbpUMshw6gEJ0fER1SspboODl45 w5U+oPg+IBbw4odWrB6e+gis27O/2/6bNN31GX1fay/+IdwIwnn0beNaABonXQ== 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 6F39917199; Sun, 22 May 2022 07:23:12 +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 24M7NCaD041593; Sun, 22 May 2022 07:23:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24M7NCuR041592; Sun, 22 May 2022 07:23:12 GMT (envelope-from git) Date: Sun, 22 May 2022 07:23:12 GMT Message-Id: <202205220723.24M7NCuR041592@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: e3df2c5159b1 - 2022Q2 - graphics/openjpeg: Update to 2.5.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2022Q2 X-Git-Reftype: branch X-Git-Commit: e3df2c5159b1e85d73853126b8125fd9f65b4a5a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653204192; 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=FZ7WkuBjcziP/xjZvt7Aazf4Mx2KwFiS4fjZZNIDgVI=; b=VAZHks+jvwkJnaDQFSc+hpsvDCN6zwLj/EyAa8xhy1LeyBS5fTJFuzXFNKwt3uenZLegok D6dpF9Jgbm+SlodZFAvF60+C7QDzALbg1gkqtUuN/q4trJlPYRBfIU/Hun1uR//atFBL7A foQmComAiZUIOi508J9GGQYfXQEVq/GMSMusMxV02NIOgeAqQBjOMu+mdLbwLJyEHzDgt7 b5d1WZ3teQfK3qkwD8W8hjmEx33ZRJuG5BKZxWijN8K3ij/2mCWWEXb9fXhUc1MrZW7b3Z fOsMk+WqbLSKVTGLZifr2vpEB2e6efNnrZh0mr9KZCxcLRjwoySsRVHzbOoBRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653204192; a=rsa-sha256; cv=none; b=vjvXfj0V7GrX2m2soKo5p7avQILwMcu1N1A3DB7wTXGp4X7uI1kt1GDSHXImVqiIT2HgDH KyOXlHPGFpW2HoGoo+PC3XFXrUyPYV7DKY2ytvSfG1b4c5xELmOmnDUN5dx572dJStBoNn aM3IAxvP6uKtHJbp82nG9jA88n+89AzvKu3uu1iCzORce6Z6MvIBXPv6kFpxPT0qxvcUWG bNwlBdGPW8/eSDj+NmicWH8V1PzcQ2uSwp9MuMbx1Yjk8CbVgPlx2d/GBvvF0kT+aZ/8IG s0lZ/8uUqRLRk0463TubPKJgmJZ5lyGv4Bjxk63iBeXejcBhzfeQgluIh9mBrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3df2c5159b1e85d73853126b8125fd9f65b4a5a commit e3df2c5159b1e85d73853126b8125fd9f65b4a5a Author: Po-Chuan Hsieh AuthorDate: 2022-05-22 04:22:33 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-05-22 07:22:46 +0000 graphics/openjpeg: Update to 2.5.0 - Update WWW 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-2013-4289, CVE-2013-4290, CVE-2018-16376, CVE-2018-20846, CVE-2019-6988, CVE-2021-29338 (cherry picked from commit 3aff837326a9e23905d09d0d034df382f75f12e1) --- graphics/openjpeg/Makefile | 15 +++++++++++++-- graphics/openjpeg/distinfo | 6 +++--- graphics/openjpeg/files/patch-CMakeLists.txt | 28 +++++----------------------- graphics/openjpeg/pkg-descr | 2 +- 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile index c5528ebfb1cd..03b1702c9d38 100644 --- a/graphics/openjpeg/Makefile +++ b/graphics/openjpeg/Makefile @@ -1,7 +1,7 @@ # Created by: trasz PORTNAME= openjpeg -PORTVERSION= 2.4.0 +PORTVERSION= 2.5.0 DISTVERSIONPREFIX= v CATEGORIES= graphics @@ -16,8 +16,10 @@ LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= cmake cpe pkgconfig +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 USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R} @@ -27,4 +29,13 @@ USE_GITHUB= yes CPE_VENDOR= uclouvain +post-patch: +# Clean up bundled libraries + @${RM} -r ${WRKSRC}/thirdparty/astyle/ + @${RM} -r ${WRKSRC}/thirdparty/include/ + @${RM} -r ${WRKSRC}/thirdparty/liblcms2/ + @${RM} -r ${WRKSRC}/thirdparty/libpng/ + @${RM} -r ${WRKSRC}/thirdparty/libtiff/ + @${RM} -r ${WRKSRC}/thirdparty/libz/ + .include diff --git a/graphics/openjpeg/distinfo b/graphics/openjpeg/distinfo index 31e0a46cee34..72da930c1f67 100644 --- a/graphics/openjpeg/distinfo +++ b/graphics/openjpeg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609598845 -SHA256 (uclouvain-openjpeg-v2.4.0_GH0.tar.gz) = 8702ba68b442657f11aaeb2b338443ca8d5fb95b0d845757968a7be31ef7f16d -SIZE (uclouvain-openjpeg-v2.4.0_GH0.tar.gz) = 2233229 +TIMESTAMP = 1653151054 +SHA256 (uclouvain-openjpeg-v2.5.0_GH0.tar.gz) = 0333806d6adecc6f7a91243b2b839ff4d2053823634d4f6ed7a59bc87409122a +SIZE (uclouvain-openjpeg-v2.5.0_GH0.tar.gz) = 1867111 diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt index e1bf64d555f2..306d2fed2c30 100644 --- a/graphics/openjpeg/files/patch-CMakeLists.txt +++ b/graphics/openjpeg/files/patch-CMakeLists.txt @@ -1,37 +1,19 @@ ---- CMakeLists.txt.orig 2019-04-02 12:45:15 UTC +--- CMakeLists.txt.orig 2022-05-13 16:54:29 UTC +++ CMakeLists.txt -@@ -363,14 +363,14 @@ if(BUILD_PKGCONFIG_FILES) +@@ -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_JPWL) - # install in lib and not share (see multi-arch note above) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ libdata/pkgconfig) - endif() ++ libdata/pkgconfig ) # if(BUILD_JPIP) -@@ -378,7 +378,7 @@ if(BUILD_PKGCONFIG_FILES) + # 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() - # - if(BUILD_JP3D) -@@ -386,7 +386,7 @@ if(BUILD_PKGCONFIG_FILES) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY) - install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION -- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig ) -+ libdata/pkgconfig) ++ libdata/pkgconfig ) endif() endif() diff --git a/graphics/openjpeg/pkg-descr b/graphics/openjpeg/pkg-descr index 9eca790392df..976e15e41a45 100644 --- a/graphics/openjpeg/pkg-descr +++ b/graphics/openjpeg/pkg-descr @@ -12,4 +12,4 @@ Besides this main codec, OpenJPEG integrates several other modules: - JPIP (JPEG 2000 standard Part 9) - OPJViewer, a GUI viewer for J2K, JP2, JPWL and MJ2 files -WWW: http://www.openjpeg.org/ +WWW: https://www.openjpeg.org/