Date: Wed, 9 Oct 2024 19:43:36 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c76de3159440 - main - graphics/dcmtk: Link with shared version of libtiff and add USES= pathfix Message-ID: <202410091943.499Jha90087964@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c76de315944078eac241ceff1ae3926678c25f23 commit c76de315944078eac241ceff1ae3926678c25f23 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2024-10-09 19:19:58 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> 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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410091943.499Jha90087964>