From nobody Fri Feb 18 09:34:57 2022 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 4DD6D19C062E; Fri, 18 Feb 2022 09:34:58 +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 4K0RPF660Kz3rfy; Fri, 18 Feb 2022 09:34:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645176898; 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=yWiN4MwX7vvKSJiNBsWf18/zp2T/Wp/4O27Qc5HlfoY=; b=KMaGsKg73HQvxLEVG1WGM7fESdB1l76ycSPH+4Ani/EhInCmj7ciXuOeHGD72JAirKQ3Is ZiL8OLeAxg3nvf1bNyp6JNuRlPyOyrALadz7/im0eLLBeayQjQeck/64KJrL+X3xfo+/7m frceYLK4dzCrc7eOY9MoCEhS4FudKXPwT6KssFiOTNXJc5qeXGRT/j7BqvjHp+Zym4HoDe llAerTCkBAPrZuCzlKb4Nb17MHM8vN61oMoRquD/P3rXUcTCcMlQV5GQCY7lM3V9+XRQh5 F07VrgxpntnflkpsKAFPhh0h0+w9M3luWF8kA0IkI82MgeAXnP3wUgGT6svyDw== 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 52D6D1AF53; Fri, 18 Feb 2022 09:34:57 +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 21I9YvF8049180; Fri, 18 Feb 2022 09:34:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21I9Yvlc049179; Fri, 18 Feb 2022 09:34:57 GMT (envelope-from git) Date: Fri, 18 Feb 2022 09:34:57 GMT Message-Id: <202202180934.21I9Yvlc049179@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: f3ba77e14cac - main - graphics/openjpeg15: resolve build conflicts with openjpeg2 for consumers (+) 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3ba77e14cac05d43caf35100848eeaee3bc64b4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645176898; 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=yWiN4MwX7vvKSJiNBsWf18/zp2T/Wp/4O27Qc5HlfoY=; b=Hg7y4GETEGDDlLYatFBjbeNwB1gv263GAhBhu/TgvJP6SgQqN7fcQWxkI5tE9jr0QA8vci qFHEpugpYjXgETqisUi1IGzGrD/hLVfTu5qvKygpJZpMWqDwFTQ7ZqsR/ER9Wv4Yi2uVhx TNhqw3VSaQMPowWieM3+mcQp3YxcH2ScO9ToZWbofui8AJgkLP0WzVJBKdQBELjd4nTJCF 7ZyPEH5tLphIbflFIodMVPxY+9y5UR9e5mnky3NEYkLErNejhARvdltxZZEHC7LRaWIfox HK98d/jTS5OLwaUEq7etbHQiVv+vHZD+pHZeaPVvFRQMxBIk5fr0gp8iWoP/3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645176898; a=rsa-sha256; cv=none; b=bQwjWbyJSWsvjW9yr9eZkILOS4uv0HfCH4Cp2oW2c15+7Slf9nCeqInW6V7wn4lzsgL8z7 cwgQe+gJg/Ye4Vu3oS55g3v4eau5IZ8lzpXjfu+XfyhiHNHeQvfjyeMjxn8VTuJFrl/gLc qlh0AIAHJoyILezvwTVDqGUKn+jwIC3fubSps3Ahvr722QkAdMTjZ8dRrFiUqWKcSRO7M/ AJ0QbW3UZhUHNyGKAxTbBL6VS+XkjsIQhu4zBJfictKaLP2nXqV0TpSVL3owMm+SbOGHn6 e2kf5qUqiPlNQ9HLH6im4VRtlfwWdn5UlOrmG7ZLcr6MmnmpSjYq/bcXnLZNQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=f3ba77e14cac05d43caf35100848eeaee3bc64b4 commit f3ba77e14cac05d43caf35100848eeaee3bc64b4 Author: Dima Panov AuthorDate: 2022-02-18 08:57:00 +0000 Commit: Dima Panov CommitDate: 2022-02-18 08:57:00 +0000 graphics/openjpeg15: resolve build conflicts with openjpeg2 for consumers (+) Includes must be installed into own project subdir as intended by authors. Pointyhat to: sunpoet With hat: office Sponsored by: Netzkommune GmbH --- graphics/openjpeg15/Makefile | 4 ++- graphics/openjpeg15/files/patch-CMakeLists.txt | 38 +++++++------------------- graphics/openjpeg15/pkg-plist | 8 +++--- 3 files changed, 17 insertions(+), 33 deletions(-) diff --git a/graphics/openjpeg15/Makefile b/graphics/openjpeg15/Makefile index a00fda35a9a7..149887a1a1ae 100644 --- a/graphics/openjpeg15/Makefile +++ b/graphics/openjpeg15/Makefile @@ -3,7 +3,7 @@ PORTNAME= openjpeg PORTVERSION= 1.5.2 DISTVERSIONPREFIX= version. -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMESUFFIX= 15 @@ -24,6 +24,8 @@ USE_LDCONFIG= yes PORTDOCS= CHANGES LICENSE +PLIST_SUB= PORTVERSION=${PORTVERSION} VER=${PORTVERSION:R} + GH_ACCOUNT= uclouvain USE_GITHUB= yes diff --git a/graphics/openjpeg15/files/patch-CMakeLists.txt b/graphics/openjpeg15/files/patch-CMakeLists.txt index 02b9fd8fa31c..4c7246a15f2b 100644 --- a/graphics/openjpeg15/files/patch-CMakeLists.txt +++ b/graphics/openjpeg15/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-03-27 11:58:08.000000000 +0100 -+++ CMakeLists.txt 2014-05-24 11:24:37.000000000 +0200 -@@ -54,7 +54,7 @@ +--- CMakeLists.txt.orig 2014-03-28 08:20:25 UTC ++++ CMakeLists.txt +@@ -54,7 +54,7 @@ if(NOT OPENJPEG_SOVERSION) endif(NOT OPENJPEG_SOVERSION) SET(OPENJPEG_LIBRARY_PROPERTIES VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}" @@ -9,21 +9,7 @@ ) # -------------------------------------------------------------------------- -@@ -94,7 +94,7 @@ - # Install directories - - STRING(TOLOWER ${PROJECT_NAME} projectname) --SET(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") -+SET(OPENJPEG_INSTALL_SUBDIR "${projectname}") - - IF(NOT OPENJPEG_INSTALL_BIN_DIR) - SET(OPENJPEG_INSTALL_BIN_DIR "bin") -@@ -125,11 +125,11 @@ - ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR) - - IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) -- SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") -+ SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/") +@@ -129,11 +129,11 @@ IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR) IF(NOT OPENJPEG_INSTALL_MAN_DIR) @@ -32,16 +18,12 @@ ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR) IF(NOT OPENJPEG_INSTALL_DOC_DIR) -@@ -148,7 +148,7 @@ - # We could install *.cmake files in share/ however those files contains - # hardcoded path to libraries on a multi-arch system (fedora/debian) those - # path will be different (lib/i386-linux-gnu vs lib/x86_64-linux-gnu) -- SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") -+ SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}") - ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR) +- SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") ++ SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${projectname}") + ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR) - #----------------------------------------------------------------------------- -@@ -188,10 +188,10 @@ + if(NOT OPENJPEG_INSTALL_JNI_DIR) +@@ -188,10 +188,10 @@ IF(UNIX) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY) INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION @@ -54,7 +36,7 @@ ENDIF(UNIX) #----------------------------------------------------------------------------- -@@ -288,6 +288,7 @@ +@@ -288,6 +288,7 @@ ENDIF(BUILD_TESTING) #----------------------------------------------------------------------------- # install all targets referenced as OPENJPEGTargets INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) diff --git a/graphics/openjpeg15/pkg-plist b/graphics/openjpeg15/pkg-plist index eef129fa5824..aa513fabf73a 100644 --- a/graphics/openjpeg15/pkg-plist +++ b/graphics/openjpeg15/pkg-plist @@ -1,7 +1,10 @@ bin/image_to_j2k bin/j2k_dump bin/j2k_to_image -include/openjpeg.h +include/openjpeg-%%VER%%/openjpeg.h +lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake +lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake lib/libopenjpeg.so lib/libopenjpeg.so.1.5.2 lib/libopenjpeg.so.2 @@ -9,8 +12,5 @@ man/man1/image_to_j2k.1.gz man/man1/j2k_dump.1.gz man/man1/j2k_to_image.1.gz man/man3/libopenjpeg.3.gz -%%DATADIR%%/OpenJPEGConfig.cmake -%%DATADIR%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake -%%DATADIR%%/OpenJPEGTargets.cmake libdata/pkgconfig/libopenjpeg.pc libdata/pkgconfig/libopenjpeg1.pc