[med-svn] [Git][med-team/charls][master] 6 commits: d/patches: Refresh patches with minor cleanups

Mathieu Malaterre gitlab at salsa.debian.org
Thu Oct 29 16:59:36 GMT 2020 


Mathieu Malaterre pushed to branch master at Debian Med / charls


Commits:
b058375b by Mathieu Malaterre at 2020-10-29T17:35:32+01:00
d/patches: Refresh patches with minor cleanups

- - - - -
37c32dc2 by Mathieu Malaterre at 2020-10-29T17:56:11+01:00
d/patches: Remove old patch for visibility stuff on GCC

It has been incorporated upstream

- - - - -
62d2bf88 by Mathieu Malaterre at 2020-10-29T17:56:11+01:00
d/rules: Do not compile the SAMPLES/TESTS

This expose symbols that are not meant to be public

- - - - -
6383d95e by Mathieu Malaterre at 2020-10-29T17:56:11+01:00
d/patches: Really only expose the public symbols

Hide symbols there are meant to be internal.

- - - - -
b96ef251 by Mathieu Malaterre at 2020-10-29T17:57:16+01:00
d/rules: Remove reference to old LIB_SUFFIX cmake variable

- - - - -
4bcae65e by Mathieu Malaterre at 2020-10-29T17:58:30+01:00
d/changelog: Upload -5 to unstable

- - - - -


8 changed files:

- debian/changelog
- debian/libcharls2.symbols
- − debian/patches/add_visibility.patch
- debian/patches/change_library_name.patch
- debian/patches/noexplicitstd.patch
- debian/patches/series
- debian/patches/stl_symbols_hack.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+charls (2.1.0+dfsg-5) unstable; urgency=medium
+
+  * Team upload.
+  * d/patches: Refresh patches with minor cleanups
+  * d/patches: Remove old patch for visibility stuff on GCC
+  * d/rules: Do not compile the SAMPLES/TESTS
+  * d/patches: Really only expose the public symbols
+  * d/rules: Remove reference to old LIB_SUFFIX cmake variable
+
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 29 Oct 2020 17:58:11 +0100
+
 charls (2.1.0+dfsg-4) unstable; urgency=medium
 
   * Team upload.


=====================================
debian/libcharls2.symbols
=====================================
@@ -3,12 +3,21 @@ libCharLS.so.2 libcharls2 #MINVER#
  JpegLsDecodeRect at Base 2.0.0+dfsg
  JpegLsEncode at Base 2.0.0+dfsg
  JpegLsReadHeader at Base 2.0.0+dfsg
- _Z18JpegLsDecodeStream14ByteStreamInfoS_PK13JlsParameters at Base 2.1.0+dfsg
- (arch-bits=32)_Z18JpegLsEncodeStream14ByteStreamInfoRjS_RK13JlsParameters at Base 2.1.0+dfsg
- (arch-bits=64)_Z18JpegLsEncodeStream14ByteStreamInfoRmS_RK13JlsParameters at Base 2.1.0+dfsg
- _Z22JpegLsReadHeaderStream14ByteStreamInfoP13JlsParameters at Base 2.1.0+dfsg
  charls_get_error_message at Base 2.1.0+dfsg
  charls_get_jpegls_category at Base 2.1.0+dfsg
+ charls_get_version_number at Base 2.1.0+dfsg
+ charls_get_version_string at Base 2.1.0+dfsg
+ charls_jpegls_decoder_create at Base 2.1.0+dfsg
+ charls_jpegls_decoder_decode_to_buffer at Base 2.1.0+dfsg
+ charls_jpegls_decoder_destroy at Base 2.1.0+dfsg
+ charls_jpegls_decoder_get_destination_size at Base 2.1.0+dfsg
+ charls_jpegls_decoder_get_frame_info at Base 2.1.0+dfsg
+ charls_jpegls_decoder_get_interleave_mode at Base 2.1.0+dfsg
+ charls_jpegls_decoder_get_near_lossless at Base 2.1.0+dfsg
+ charls_jpegls_decoder_get_preset_coding_parameters at Base 2.1.0+dfsg
+ charls_jpegls_decoder_read_header at Base 2.1.0+dfsg
+ charls_jpegls_decoder_read_spiff_header at Base 2.1.0+dfsg
+ charls_jpegls_decoder_set_source_buffer at Base 2.1.0+dfsg
  charls_jpegls_encoder_create at Base 2.1.0+dfsg
  charls_jpegls_encoder_destroy at Base 2.1.0+dfsg
  charls_jpegls_encoder_encode_from_buffer at Base 2.1.0+dfsg


=====================================
debian/patches/add_visibility.patch deleted
=====================================
@@ -1,16 +0,0 @@
-Description: Use GCC Visibility
-Author: Mathieu Malaterre <malat at debian.org>
-Forwarded: no
-Last-Update: 2019-01-03
-
---- charls-2.0.0+dfsg.orig/src/charls.h
-+++ charls-2.0.0+dfsg/src/charls.h
-@@ -15,7 +15,7 @@
- 
- // Non-windows (static linking)
- #if !defined(CHARLS_IMEXPORT) && !defined(_WIN32)
--#  define CHARLS_IMEXPORT(returntype) returntype
-+#  define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype
- #endif
- 
- // Windows static linking


=====================================
debian/patches/change_library_name.patch
=====================================
@@ -6,17 +6,11 @@ Bug-Debian: https://bugs.debian.org/971435/
 Last-Update: 2020-09-30
 ---
 
+Index: charls/src/CMakeLists.txt
+===================================================================
 --- charls.orig/src/CMakeLists.txt
 +++ charls/src/CMakeLists.txt
-@@ -14,12 +14,14 @@
- 
- if(WIN32 AND BUILD_SHARED_LIBS)
-   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
--    set_target_properties(charls PROPERTIES OUTPUT_NAME "charls-2-x64")
-+	  set_target_properties(charls PROPERTIES OUTPUT_NAME "charls-2-x64")
-   else()
--    set_target_properties(charls PROPERTIES OUTPUT_NAME "charls-2-x86")
-+	  set_target_properties(charls PROPERTIES OUTPUT_NAME "charls-2-x86")
+@@ -20,6 +20,8 @@ if(WIN32 AND BUILD_SHARED_LIBS)
    endif()
  endif()
  


=====================================
debian/patches/noexplicitstd.patch
=====================================
@@ -14,10 +14,3 @@ Last-Update: 2019-01-03
  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,4 +1,3 @@
-#add_visibility.patch
 change_library_name.patch
 stl_symbols_hack.patch
 noexplicitstd.patch


=====================================
debian/patches/stl_symbols_hack.patch
=====================================
@@ -3,37 +3,37 @@ Description: Rework the symbol file to hide stl exported symbols
 Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: no
 
+Index: charls/exports.version
+===================================================================
 --- /dev/null
 +++ charls/exports.version
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,21 @@
 +{
 +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*;
++    JpegLsDecode;
++    JpegLsDecodeRect;
++    JpegLsEncode;
++    JpegLsReadHeader;
++    charls_get*;
++    charls_jpegls_encoder*;
++    charls_jpegls_decoder*;
 +    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*;
++      JpegLsDecode;
++      JpegLsDecodeRect;
++      JpegLsEncode;
++      JpegLsReadHeader;
++      charls_get*;
++      charls_jpegls_encoder*;
++      charls_jpegls_decoder*;
 +    };
 +local:
 +    *;
 +};
+Index: charls/src/CMakeLists.txt
+===================================================================
 --- charls.orig/src/CMakeLists.txt
 +++ charls/src/CMakeLists.txt
-@@ -38,6 +38,8 @@
+@@ -40,6 +40,8 @@ set(CHARLS_PUBLIC_HEADERS
  set_target_properties(charls PROPERTIES CXX_VISIBILITY_PRESET hidden)
  set_property(TARGET charls PROPERTY PUBLIC_HEADER ${CHARLS_PUBLIC_HEADERS})
  


=====================================
debian/rules
=====================================
@@ -9,9 +9,12 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
+# SAMPLES/TESTS should be OFF by default:
+# https://github.com/team-charls/charls/issues/81#issuecomment-716385532
 CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DBUILD_SHARED_LIBS:BOOL=ON \
- -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)"
+ -DCHARLS_BUILD_SAMPLES:BOOL=OFF \
+ -DCHARLS_BUILD_TESTS:BOOL=OFF \
 
 %:
 	dh $@ --buildsystem=cmake



View it on GitLab: https://salsa.debian.org/med-team/charls/-/compare/e33eb998642e347e3f631993e89e14d517266757...4bcae65e2314fad0059c76dcb61beec8f1f60a08

-- 
View it on GitLab: https://salsa.debian.org/med-team/charls/-/compare/e33eb998642e347e3f631993e89e14d517266757...4bcae65e2314fad0059c76dcb61beec8f1f60a08
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201029/a3078473/attachment-0001.html>

More information about the debian-med-commit mailing list