From ab19bd394eb053c642eede652b0c7514db89bf71 Mon Sep 17 00:00:00 2001
From: Thibaut ROMAIN <thibaut.romain@cs-soprasteria.com>
Date: Wed, 16 Oct 2024 11:34:59 +0200
Subject: [PATCH] COMP: update libpng
---
SuperBuild/CMake/External_png.cmake | 5 +-
SuperBuild/patches/PNG/png-1-fixes-all.diff | 106 --------------------
2 files changed, 1 insertion(+), 110 deletions(-)
delete mode 100644 SuperBuild/patches/PNG/png-1-fixes-all.diff
diff --git a/SuperBuild/CMake/External_png.cmake b/SuperBuild/CMake/External_png.cmake
index 905bbfe9a0..a875fb729d 100644
--- a/SuperBuild/CMake/External_png.cmake
+++ b/SuperBuild/CMake/External_png.cmake
@@ -38,11 +38,10 @@ ExternalProject_Add(PNG
DEPENDS ${PNG_DEPENDENCIES}
CMAKE_CACHE_ARGS
${SB_CMAKE_CACHE_ARGS}
- -DPNG_BUILD_ZLIB:BOOL=ON
+ -DZLIB_ROOT:PATH=${SB_INSTALL_PREFIX}
-DPNG_STATIC:BOOL=OFF
-DPNG_SHARED:BOOL=ON
-DPNG_TESTS:BOOL=OFF
- -DVERSIONED_OUTPUT_LIB:BOOL=OFF
-DSKIP_INSTALL_FILES:BOOL=ON
-DSKIP_INSTALL_EXPORT:BOOL=ON
-DSKIP_INSTALL_EXECUTABLES:BOOL=OFF
@@ -56,6 +55,4 @@ ExternalProject_Add(PNG
)
set(_SB_PNG_PNG_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
-SUPERBUILD_PATCH_SOURCE(PNG)
-
SUPERBUILD_UPDATE_CMAKE_VARIABLES(PNG TRUE)
diff --git a/SuperBuild/patches/PNG/png-1-fixes-all.diff b/SuperBuild/patches/PNG/png-1-fixes-all.diff
deleted file mode 100644
index 8807cb0a04..0000000000
--- a/SuperBuild/patches/PNG/png-1-fixes-all.diff
+++ /dev/null
@@ -1,106 +0,0 @@
-diff -burN libpng-1.6.37.orig/CMakeLists.txt libpng-1.6.37/CMakeLists.txt
---- libpng-1.6.37.orig/CMakeLists.txt 2019-04-14 20:10:32.000000000 +0200
-+++ libpng-1.6.37/CMakeLists.txt 2021-04-23 10:10:21.560899662 +0200
-@@ -27,7 +27,16 @@
- set(PNGLIB_MAJOR 1)
- set(PNGLIB_MINOR 6)
- set(PNGLIB_RELEASE 37)
--set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-+
-+option(VERSIONED_OUTPUT_LIB "create output library with major.minor suffix" OFF)
-+
-+set(PNGLIB_NAME libpng)
-+set(PNG_LIB_NAME png)
-+if(VERSIONED_OUTPUT_LIB)
-+ set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
-+ set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-+endif()
-+
- set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
-
- include(GNUInstallDirs)
-@@ -196,11 +205,9 @@
-
- endif(PNG_HARDWARE_OPTIMIZATIONS)
-
--# SET LIBNAME
--set(PNG_LIB_NAME png${PNGLIB_MAJOR}${PNGLIB_MINOR})
-
- # to distinguish between debug and release lib
--set(CMAKE_DEBUG_POSTFIX "d")
-+#set(CMAKE_DEBUG_POSTFIX "d")
-
- include(CheckCSourceCompiles)
- option(ld-version-script "Enable linker version script" ON)
-@@ -525,7 +532,6 @@
- include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR})
-
- unset(PNG_LIB_TARGETS)
--
- if(PNG_SHARED)
- add_library(png SHARED ${libpng_sources})
- set(PNG_LIB_TARGETS png)
-@@ -838,9 +844,8 @@
- # SET UP LINKS
- if(PNG_SHARED)
- set_target_properties(png PROPERTIES
--# VERSION 16.${PNGLIB_RELEASE}.1.6.37
-- VERSION 16.${PNGLIB_RELEASE}.0
-- SOVERSION 16
-+ VERSION ${PNGLIB_VERSION}
-+ SOVERSION ${PNGLIB_MAJOR}
- CLEAN_DIRECT_OUTPUT 1)
- endif()
-
-@@ -852,29 +857,30 @@
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ if(VERSIONED_OUTPUT_LIB)
-+ if(PNG_SHARED)
-+ # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-+ if(CYGWIN OR MINGW)
-+ create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-+ install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ endif()
-
-- if(PNG_SHARED)
-- # Create a symlink for libpng.dll.a => libpng16.dll.a on Cygwin
-- if(CYGWIN OR MINGW)
-- create_symlink(libpng${CMAKE_IMPORT_LIBRARY_SUFFIX} TARGET png)
-- install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_IMPORT_LIBRARY_SUFFIX}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- endif()
--
-- if(NOT WIN32)
-- create_symlink(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png)
-- install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- endif()
-- endif()
-+ if(NOT WIN32)
-+ create_symlink(libpng${CMAKE_SHARED_LIBRARY_SUFFIX} TARGET png)
-+ install(FILES $<TARGET_LINKER_FILE_DIR:png>/libpng${CMAKE_SHARED_LIBRARY_SUFFIX}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ endif()
-+ endif(PNG_SHARED)
-
-- if(PNG_STATIC)
-- if(NOT WIN32 OR CYGWIN OR MINGW)
-- create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-- install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR})
-- endif()
-- endif()
-+ if(PNG_STATIC)
-+ if(NOT WIN32 OR CYGWIN OR MINGW)
-+ create_symlink(libpng${CMAKE_STATIC_LIBRARY_SUFFIX} TARGET png_static)
-+ install(FILES $<TARGET_LINKER_FILE_DIR:png_static>/libpng${CMAKE_STATIC_LIBRARY_SUFFIX}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+ endif()
-+ endif(PNG_STATIC)
-+ endif(VERSIONED_OUTPUT_LIB)
- endif()
-
- if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL)
--
GitLab