Shayan Doust pushed to branch master at Debian Med / charls
Commits: 63986858 by Shayan Doust at 2020-09-29T13:54:19+01:00 Update patches including exports.version - - - - - 3 changed files: - debian/patches/noexplicitstd.patch - debian/patches/series - debian/patches/stl_symbols_hack.patch Changes: ===================================== debian/patches/noexplicitstd.patch ===================================== @@ -3,14 +3,21 @@ Author: Mathieu Malaterre <[email protected]> Forwarded: no Last-Update: 2019-01-03 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,7 +7,7 @@ if (CMAKE_COMPILER_IS_GNUCC) - # SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3 -Wall -Wextra -pedantic -fvisibility=hidden -fomit-frame-pointer -momit-leaf-frame-pointer -fweb -ftracer" ) - - # Define GNU C++ defines for both Debug and Release -- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall -Wextra") -+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra") - - # Define specific Debug settings. - set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g") +--- charls.orig/CMakeLists.txt ++++ charls/CMakeLists.txt +@@ -23,7 +23,7 @@ + option(CHARLS_THREAT_WARNINGS_AS_ERRORS "Treat Warnings as Errors." OFF) + + # CharLS requires C++14 or newer. +-set(CMAKE_CXX_STANDARD 14) ++#set(CMAKE_CXX_STANDARD 14) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_CXX_EXTENSIONS OFF) + +@@ -122,4 +122,4 @@ + + if(CHARLS_BUILD_SAMPLES) + add_subdirectory(samples) +-endif() +\ No newline at end of file ++endif() ===================================== debian/patches/series ===================================== @@ -1,3 +1,3 @@ -add_visibility.patch +#add_visibility.patch stl_symbols_hack.patch noexplicitstd.patch ===================================== debian/patches/stl_symbols_hack.patch ===================================== @@ -4,24 +4,41 @@ Author: Mathieu Malaterre <[email protected]> Forwarded: no --- /dev/null -+++ b/exports.version -@@ -0,0 +1,9 @@ ++++ charls/exports.version +@@ -0,0 +1,25 @@ +{ +global: + JpegLs*; ++ charls_jpegls_encoder_set*; ++ charls_jpegls_encoder_write*; ++ charls_jpegls_encoder_encode*; ++ charls_jpegls_encoder_get*; ++ charls_jpegls_encoder_destroy*; ++ charls_jpegls_encoder_create*; ++ charls_get_jpegls_category; ++ charls_get_error*; + extern "C++" { + JpegLs*; ++ charls_get_jpegls_category; ++ charls_jpegls_encoder_set*; ++ charls_jpegls_encoder_write*; ++ charls_jpegls_encoder_encode*; ++ charls_jpegls_encoder_get*; ++ charls_jpegls_encoder_destroy*; ++ charls_jpegls_encoder_create*; ++ charls_get_error*; + }; +local: + *; +}; ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,6 +46,7 @@ set (CHARLS_LIB_MINOR_VERSION 0) - set_target_properties(CharLS PROPERTIES - VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION} - SOVERSION ${CHARLS_LIB_MAJOR_VERSION}) -+set_property(TARGET CharLS PROPERTY LINK_FLAGS "-Wl,--version-script=../exports.version") - - install (TARGETS CharLS RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} +--- charls.orig/src/CMakeLists.txt ++++ charls/src/CMakeLists.txt +@@ -38,6 +38,8 @@ + set_target_properties(charls PROPERTIES CXX_VISIBILITY_PRESET hidden) + set_property(TARGET charls PROPERTY PUBLIC_HEADER ${CHARLS_PUBLIC_HEADERS}) + ++set_property(TARGET charls PROPERTY LINK_FLAGS "-Wl,--version-script=../exports.version") ++ + target_sources(charls + PUBLIC + ${CHARLS_PUBLIC_HEADERS} View it on GitLab: https://salsa.debian.org/med-team/charls/-/commit/6398685820d96ea624621a2de4bb433549d1fc3c -- View it on GitLab: https://salsa.debian.org/med-team/charls/-/commit/6398685820d96ea624621a2de4bb433549d1fc3c You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
