[med-svn] [charls] 03/03: Import patch from 1.0 onto 1.1.0

[Mathieu Malaterre]

This is an automated email from the git hooks/post-receive script.

malat pushed a commit to branch master
in repository charls.

commit 19b45bffa000030336f0ed094599476697b1a851
Author: Mathieu Malaterre <malat at debian.org>
Date:   Fri May 20 15:50:49 2016 +0200

    Import patch from 1.0 onto 1.1.0
    
    The new release adds three new C++ symbols. Because the older symbols
    did not change the SONAME can remains the same.
    VERSION script has been updated to cope with the C++ symbols, symbols file
    also.
---
 debian/libcharls1.symbols             |  3 +++
 debian/patches/series                 |  6 ++----
 debian/patches/stl_symbols_hack.patch | 30 ++++++++++++++++++++++--------
 3 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/debian/libcharls1.symbols b/debian/libcharls1.symbols
index 37778aa..bef1959 100644
--- a/debian/libcharls1.symbols
+++ b/debian/libcharls1.symbols
@@ -4,3 +4,6 @@ libCharLS.so.1 libcharls1 #MINVER#
  JpegLsEncode at Base 1.0
  JpegLsReadHeader at Base 1.0
  JpegLsVerifyEncode at Base 1.0
+ _Z18JpegLsDecodeStream14ByteStreamInfoS_P13JlsParameters at Base 1.1.0
+ _Z18JpegLsEncodeStream14ByteStreamInfoPmS_P13JlsParameters at Base 1.1.0
+ _Z22JpegLsReadHeaderStream14ByteStreamInfoP13JlsParameters at Base 1.1.0
diff --git a/debian/patches/series b/debian/patches/series
index e4a2240..292cf52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-# charls_add_cmake_install_target.patch
-# charls_add_sharedlib_soname.patch
-# charls_fix_tests.patch
-# stl_symbols_hack.patch
+add_visibility.patch
+stl_symbols_hack.patch
diff --git a/debian/patches/stl_symbols_hack.patch b/debian/patches/stl_symbols_hack.patch
index eba3e12..4b0e889 100644
--- a/debian/patches/stl_symbols_hack.patch
+++ b/debian/patches/stl_symbols_hack.patch
@@ -1,22 +1,36 @@
 Description: Rework the symbol file to hide stl exported symbols
+ Also add missing header
 Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -34,6 +34,7 @@ IF(BUILD_SHARED_LIBS)
-                               SOVERSION ${CHARLS_LIB_MAJOR_VERSION}
-                               ) 
-                             set_property(TARGET CharLS PROPERTY LINK_INTERFACE_LIBRARIES "")
-+                            set_property(TARGET CharLS PROPERTY LINK_FLAGS "-Wl,--version-script=../exports.version")
-                              
+@@ -39,6 +39,7 @@
+ endif()
  
- ENDIF(BUILD_SHARED_LIBS)
+ set (charls_HEADERS
++src/interface.h
+ src/context.h         src/defaulttraits.h    src/jpegimagedatasegment.h  src/jpegsegment.h           src/lookuptable.h       src/publictypes.h
+ src/colortransform.h  src/contextrunmode.h   src/encoderstrategy.h       src/jpegmarker.h            src/losslesstraits.h    src/scan.h
+ src/config.h          src/decoderstrategy.h  src/header.h                src/jpegmarkersegment.h     src/jpegstreamwriter.h  src/processline.h     src/util.h)
+@@ -49,6 +50,8 @@
+ 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}
 --- /dev/null
 +++ b/exports.version
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,9 @@
 +{
 +global:
 +    JpegLs*;
++    extern "C++" {
++      JpegLs*;
++    };
 +local:
 +    *;
 +};

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/charls.git