Hello community, here is the log from the commit of package gdcm for openSUSE:Factory checked in at 2020-11-05 21:56:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdcm (Old) and /work/SRC/openSUSE:Factory/.gdcm.new.11331 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gdcm" Thu Nov 5 21:56:14 2020 rev:8 rq:846269 version:3.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/gdcm/gdcm.changes 2020-10-20 16:14:25.214123718 +0200 +++ /work/SRC/openSUSE:Factory/.gdcm.new.11331/gdcm.changes 2020-11-05 21:56:40.187948121 +0100 @@ -1,0 +2,12 @@ +Thu Nov 5 09:38:14 UTC 2020 - Axel Braun <axel.br...@gmx.de> + +- typo corrected: fix_charls_2.patch removed + +------------------------------------------------------------------- +Tue Nov 3 15:45:11 UTC 2020 - Axel Braun <axel.br...@gmx.de> + +- fixed build system + fix_charls2_patch removed + 0001-Fix-build-with-CharLS-2.1.0.patch added + +------------------------------------------------------------------- Old: ---- fix_charls_2.patch New: ---- 0001-Fix-build-with-CharLS-2.1.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdcm.spec ++++++ --- /var/tmp/diff_new_pack.icQHss/_old 2020-11-05 21:56:40.739946880 +0100 +++ /var/tmp/diff_new_pack.icQHss/_new 2020-11-05 21:56:40.739946880 +0100 @@ -27,8 +27,8 @@ Group: Productivity/Graphics/Other URL: http://gdcm.sourceforge.net/wiki/index.php/Main_Page Source0: http://sourceforge.net/projects/gdcm/files/gdcm%203.x/GDCM%20%{version}/%{name}-%{version}.tar.bz2 -Patch1: gdcm-2.4.0-usecopyright.patch -Patch2: fix_charls_2.patch +Patch1: 0001-Fix-build-with-CharLS-2.1.0.patch +Patch2: gdcm-2.4.0-usecopyright.patch BuildRequires: CharLS-devel >= 2.0 BuildRequires: cmake BuildRequires: docbook5-xsl-stylesheets ++++++ 0001-Fix-build-with-CharLS-2.1.0.patch ++++++ >From a979663a2cece68f5e42e5271a4bd9966cfe502a Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Tue, 3 Nov 2020 16:03:42 +0100 Subject: [PATCH] Fix build with CharLS 2.1.0 The gdcm build system has multiple issues that prevented finding charls 2.1.0 but also didn't report failures correctly. It then also failed to build due to an #include statement wrongly assuming the charls directory casing. --- CMake/FindCharLS.cmake | 42 ++++++++++++++++++---------------------- Utilities/gdcm_charls.h | 2 +- 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/CMake/FindCharLS.cmake b/CMake/FindCharLS.cmake index 8f6bf19..a0ea08b 100644 --- a/CMake/FindCharLS.cmake +++ b/CMake/FindCharLS.cmake @@ -6,35 +6,31 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # -find_path(CHARLS_INCLUDE_DIR CharLS/charls.h -/usr/local/include -/usr/include +find_path(CHARLS_INCLUDE_DIR charls.h + PATH_SUFFIXES + CharLS + charls ) find_library(CHARLS_LIBRARY - NAMES CharLS - PATHS /usr/lib /usr/local/lib - ) + NAMES CharLS charls +) + +include(FindPackageHandleStandardArgs) -if (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR) - set(CHARLS_LIBRARIES ${CHARLS_LIBRARY}) - set(CHARLS_INCLUDE_DIRS ${CHARLS_INCLUDE_DIR}) - set(CHARLS_FOUND "YES") -else () - set(CHARLS_FOUND "NO") -endif () +find_package_handle_standard_args(CharLS + FOUND_VAR CharLS_FOUND + REQUIRED_VARS CHARLS_INCLUDE_DIR CHARLS_LIBRARY +) -if (CHARLS_FOUND) - if (NOT CHARLS_FIND_QUIETLY) - message(STATUS "Found CHARLS: ${CHARLS_LIBRARIES}") - endif () -else () - if (CHARLS_FIND_REQUIRED) - message(FATAL_ERROR "Could not find CHARLS library") - endif () -endif () +# Legacy compatibility variables +set(CHARLS_FOUND ${CharLS_FOUND}) +set(CHARLS_LIBRARIES ${CHARLS_LIBRARY}) +set(CHARLS_INCLUDE_DIRS ${CHARLS_INCLUDE_DIR}) mark_as_advanced( CHARLS_LIBRARY CHARLS_INCLUDE_DIR - ) + CHARLS_LIBRARIES + CHARLS_INCLUDE_DIRS +) diff --git a/Utilities/gdcm_charls.h b/Utilities/gdcm_charls.h index b80451c..bdb108f 100644 --- a/Utilities/gdcm_charls.h +++ b/Utilities/gdcm_charls.h @@ -18,7 +18,7 @@ #include "gdcmTypes.h" #ifdef GDCM_USE_SYSTEM_CHARLS // It is expected that version 2.0.0 is used -# include <CharLS/charls.h> +# include <charls.h> #else #include "gdcmcharls/charls.h" #endif -- 2.29.1
