From nobody Wed Oct 9 19:43:36 2024 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 4XP3Gc4Rgvz5Yvgq; Wed, 09 Oct 2024 19:43:36 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XP3Gc2ZTLz4RTY; Wed, 9 Oct 2024 19:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728503016; 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=AJkr24r9ogb5+lfyrSo+GXaPsqW03DYpcOIeL3J0Bfw=; b=ZV319W6Z4uLKzZAyUG3Jjzu95HAXPy9cnMvp7GRooNs1KnM15kx9HSCon4ws3M5fpmFZbB r9ACVSSkZaTz3pBkgBx+QNHxCQA7mPCLoplQwTRU8FWOoJmfQ7pSZuZ21+w2rDZWYvoShP akrKFYh4HHHs8+EwaaHzExRJ4TOpZbwE+Nf8nWHvDfvEiiYuwwPw432LwSGqek4uOd5+qi oaqCBfe5yFhm0IsCt5GTyT5D6qwUQnH5cdbeHTDzI6H8dVZkEaobGI218rnOg4PPV+hoBw 46AbR5SBxuzzvxRvQ/Ny9DI4Qw5ud7/izwyeduTUfyfIT6uP9d01+J+WFbnILA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728503016; 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=AJkr24r9ogb5+lfyrSo+GXaPsqW03DYpcOIeL3J0Bfw=; b=ojjncM+2HH+Aoj0MIdkijmXDotHW/YoHSCLbUpZVBpcVqq0YCjOSBwhTdDik+iJw4ZD1E6 7AFkC/AkPsAAtrK+9xAeoF5ZB6NkJi/6Z99EL6YMjCkPVf1hU6gM7RnAuubddPBQ1qiHrC Rqji7FY+pEJpS98xPSOew0j0IMOcQVHl69vYi/0GifApbSOR4asU+fnLb495lzpi8g7kyX qYTd99qGw65/LTTRFCwlD2AiDHyk5uPiD058BmOLVhF8wrmGDziWt/37naKTzP6WSzdwP9 CbyHkTBleBotA/U/28P4l0s7yvRwhKGDVOmEJoAjVD3hx+oXNXtiporxUAWDxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728503016; a=rsa-sha256; cv=none; b=vyoPgvtCL8KgflgeEX2v/tevPXph/IVxP+busDMkdsfZW/erA6QRNLh2y5ipZUTTysZ1pC yPDaWezGljm2Vl/4nYxA2CH4Q1q6mOXpFwplwyj0xq19WgQBaCqCpBTb8rua/OBLfxMcZG Yqy4XgCHu1ZTgKqkQ0jZAZxX0N1arhY9PB/fQqtfZi4oiWexIdmK0SfBxb3Ci3KwAPRMil Rrd1/LUz28CGyiN0uegCLNUXO9bYOfNKDo40c3CHiIhU8QCunmODQUU5pEyFRg8ZNq070P 5qMPbbJChnZd8PFy2tsCunxCmQq0RHWcO10yKAYrCVP1r9Fy6aA20pyFSXZ46w== 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 4XP3Gc1YGwzRrp; Wed, 9 Oct 2024 19:43:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 499Jha47087967; Wed, 9 Oct 2024 19:43:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 499Jha90087964; Wed, 9 Oct 2024 19:43:36 GMT (envelope-from git) Date: Wed, 9 Oct 2024 19:43:36 GMT Message-Id: <202410091943.499Jha90087964@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: c76de3159440 - main - graphics/dcmtk: Link with shared version of libtiff and add USES= pathfix 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c76de315944078eac241ceff1ae3926678c25f23 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c76de315944078eac241ceff1ae3926678c25f23 commit c76de315944078eac241ceff1ae3926678c25f23 Author: Daniel Engberg AuthorDate: 2024-10-09 19:19:58 +0000 Commit: Daniel Engberg CommitDate: 2024-10-09 19:43:25 +0000 graphics/dcmtk: Link with shared version of libtiff and add USES= pathfix Port defines (lib)tiff as dependency using the shared library and also refers to it in .pc file as a shared however dcmimage/libsrc compiles using the static library. Adjust upstream code to link with the shared library instead. While at it add USES= pathfix to fix warning about location of installed .pc file. PR: 281640 Reviewed by: yuri --- graphics/dcmtk/Makefile | 3 ++- graphics/dcmtk/files/patch-dcmimage_libsrc_CMakeLists.txt | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/graphics/dcmtk/Makefile b/graphics/dcmtk/Makefile index d401b7985ec0..63c3f0172601 100644 --- a/graphics/dcmtk/Makefile +++ b/graphics/dcmtk/Makefile @@ -1,6 +1,7 @@ PORTNAME= dcmtk DISTVERSIONPREFIX= ${PORTNAME:tu}- DISTVERSION= 3.6.8 +PORTREVISION= 1 CATEGORIES= graphics devel PATCH_SITES= https://github.com/DCMTK/${PORTNAME}/commit/ @@ -17,7 +18,7 @@ LIB_DEPENDS= libicuuc.so:devel/icu \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -USES= compiler:c++11-lang cmake cpe gnome jpeg ssl +USES= compiler:c++11-lang cmake cpe gnome jpeg pathfix ssl CPE_VENDOR= offis USE_GITHUB= yes GH_ACCOUNT= ${PORTNAME:tu} diff --git a/graphics/dcmtk/files/patch-dcmimage_libsrc_CMakeLists.txt b/graphics/dcmtk/files/patch-dcmimage_libsrc_CMakeLists.txt new file mode 100644 index 000000000000..8515f2c062dc --- /dev/null +++ b/graphics/dcmtk/files/patch-dcmimage_libsrc_CMakeLists.txt @@ -0,0 +1,8 @@ +--- dcmimage/libsrc/CMakeLists.txt.orig 2024-09-22 09:00:50 UTC ++++ dcmimage/libsrc/CMakeLists.txt +@@ -25,4 +25,4 @@ DCMTK_TARGET_LINK_MODULES(dcmimage oflog dcmdata dcmim + ) + + DCMTK_TARGET_LINK_MODULES(dcmimage oflog dcmdata dcmimgle) +-DCMTK_TARGET_LINK_LIBRARIES(dcmimage ${LIBTIFF_LIBS} ${LIBPNG_LIBS}) ++DCMTK_TARGET_LINK_LIBRARIES(dcmimage TIFF::tiff ${LIBPNG_LIBS})