Bug#973723: libcharls-dev ships libcharls.so which is also in libdcmtk-dev

[Mathieu Malaterre]

Control: tags -1 patch upstream confirmed

On Wed, Nov 4, 2020 at 9:13 AM Mathieu Malaterre <ma...@debian.org> wrote:
>
> Control: reassign -1 src:dcmtk
>
> > trying to overwrite '/usr/lib/x86_64-linux-gnu/libcharls.so', which is also 
> > in package libdcmtk-dev 3.6.4-2.1+b1
>
> Dear dcmtk maintainer,
>
> Would it make sense to rename the customized charls included as a
> convenient copy in dcmtk as 'libdcmcharls.so' instead of simply
> 'libcharls.so' ?
>
> Thanks for comments,

Here is a suggested patch for cmake based build system to handle
renaming of charls to dcmcharls.

Thanks

diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
index 2a9a452..eff767f 100644
--- a/dcmjpls/apps/CMakeLists.txt
+++ b/dcmjpls/apps/CMakeLists.txt
@@ -8,5 +8,5 @@ endforeach()
 
 # make sure executables are linked to the corresponding libraries
 foreach(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
-  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
+  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls dcmcharls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
 endforeach()
diff --git a/dcmjpls/libcharls/CMakeLists.txt b/dcmjpls/libcharls/CMakeLists.txt
index 0c5b143..3ae8d07 100644
--- a/dcmjpls/libcharls/CMakeLists.txt
+++ b/dcmjpls/libcharls/CMakeLists.txt
@@ -2,6 +2,6 @@
 include_directories("${dcmjpls_SOURCE_DIR}/libcharls" "${ofstd_SOURCE_DIR}/include")
 
 # create library from source files
-DCMTK_ADD_LIBRARY(charls header intrface jpegls)
+DCMTK_ADD_LIBRARY(dcmcharls header intrface jpegls)
 
-DCMTK_TARGET_LINK_MODULES(charls ofstd oflog)
+DCMTK_TARGET_LINK_MODULES(dcmcharls ofstd oflog)
diff --git a/dcmjpls/libcharls/intrface.h b/dcmjpls/libcharls/intrface.h
index c8fdaa9..49bb777 100644
--- a/dcmjpls/libcharls/intrface.h
+++ b/dcmjpls/libcharls/intrface.h
@@ -10,7 +10,7 @@
 #include "dcmtk/ofstd/ofstd.h"    /* for size_t */
 #include "dcmtk/ofstd/ofdefine.h" /* for DCMTK_DECL_EXPORT */
 
-#ifdef charls_EXPORTS
+#ifdef dcmcharls_EXPORTS
 #define DCMTK_CHARLS_EXPORT DCMTK_DECL_EXPORT
 #else
 #define DCMTK_CHARLS_EXPORT DCMTK_DECL_IMPORT
diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
index 314face..d48471a 100644
--- a/dcmjpls/libsrc/CMakeLists.txt
+++ b/dcmjpls/libsrc/CMakeLists.txt
@@ -4,4 +4,4 @@ include_directories("${dcmjpls_SOURCE_DIR}/include" "${ofstd_SOURCE_DIR}/include
 # create library from source files
 DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
 
-DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
+DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage dcmcharls)
diff --git a/debian/control b/debian/control
index 0880d5e..974d8d0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,6 @@ Priority: optional
 Build-Depends: cmake,
                debhelper (>= 9),
                help2man,
-               libcharls-dev,
                libpng-dev,
                libsndfile1-dev,
                libssl-dev,