[med-svn] [Git][med-team/charls][master] 3 commits: Refresh patch for v2.0.0

Thu Jan 3 13:56:06 GMT 2019

Mathieu Malaterre pushed to branch master at Debian Med / charls


Commits:
4766801f by Mathieu Malaterre at 2019-01-02T19:09:29Z
Refresh patch for v2.0.0

- - - - -
d10b1daf by Mathieu Malaterre at 2019-01-02T19:13:05Z
Use default c++ standard used by gcc when compiling

- - - - -
3f15f491 by Mathieu Malaterre at 2019-01-02T19:19:33Z
Update to match SOVERSION

- - - - -


7 changed files:

- debian/control
- + debian/libcharls2.symbols
- debian/patches/add_visibility.patch
- + debian/patches/noexplicitstd.patch
- debian/patches/series
- debian/patches/stl_symbols_hack.patch
- debian/rules


Changes:

=====================================
debian/control
=====================================
@@ -14,7 +14,7 @@ Package: libcharls-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libcharls1 (= ${binary:Version}),
+Depends: libcharls2 (= ${binary:Version}),
          ${misc:Depends}
 Description: Implementation of the JPEG-LS standard (development libraries)
  CharLS is an optimized implementation of the JPEG-LS standard for lossless and
@@ -28,7 +28,7 @@ Description: Implementation of the JPEG-LS standard (development libraries)
  .
  This package contains the development files.
 
-Package: libcharls1
+Package: libcharls2
 Architecture: any
 Multi-Arch: same
 Section: libs


=====================================
debian/libcharls2.symbols
=====================================
@@ -0,0 +1,10 @@
+libCharLS.so.2 libcharls2 #MINVER#
+ JpegLsDecode at Base 2.0.0+dfsg
+ JpegLsDecodeRect at Base 2.0.0+dfsg
+ JpegLsEncode at Base 2.0.0+dfsg
+ JpegLsReadHeader at Base 2.0.0+dfsg
+ JpegLsVerifyEncode at Base 2.0.0+dfsg
+ _Z18JpegLsDecodeStream14ByteStreamInfoS_PK13JlsParametersPc at Base 2.0.0+dfsg
+ (arch-bits=64)_Z18JpegLsEncodeStream14ByteStreamInfoRmS_RK13JlsParametersPc at Base 2.0.0+dfsg
+ (arch-bits=32)_Z18JpegLsEncodeStream14ByteStreamInfoRjS_RK13JlsParametersPc at Base 2.0.0+dfsg
+ _Z22JpegLsReadHeaderStream14ByteStreamInfoP13JlsParametersPc at Base 2.0.0+dfsg


=====================================
debian/patches/add_visibility.patch
=====================================
@@ -1,26 +1,16 @@
 Description: Use GCC Visibility
 Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: no
+Last-Update: 2019-01-03
 
---- charls-1.1.0+dfsg.orig/src/interface.cpp
-+++ charls-1.1.0+dfsg/src/interface.cpp
-@@ -7,7 +7,7 @@
- #if defined(WIN32) && defined(CHARLS_DLL)
- #define CHARLS_IMEXPORT(returntype) __declspec(dllexport) returntype __stdcall
- #else
--#define CHARLS_IMEXPORT(returntype) returntype
-+#define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype
- #endif
- 
- #include "config.h"
---- charls-1.1.0+dfsg.orig/src/interface.h
-+++ charls-1.1.0+dfsg/src/interface.h
-@@ -20,7 +20,7 @@
+--- charls-2.0.0+dfsg.orig/src/charls.h
++++ charls-2.0.0+dfsg/src/charls.h
+@@ -15,7 +15,7 @@
  
- /* windows dll */
- #if !defined(CHARLS_IMEXPORT) && defined(CHARLS_DLL)
--#  define CHARLS_IMEXPORT(returntype) __declspec(dllimport) returntype __stdcall
-+#define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype
+ // Non-windows (static linking)
+ #if !defined(CHARLS_IMEXPORT) && !defined(_WIN32)
+-#  define CHARLS_IMEXPORT(returntype) returntype
++#  define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype
  #endif
  
- #if !defined(CHARLS_IMEXPORT)
+ // Windows static linking


=====================================
debian/patches/noexplicitstd.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Debian buildd wants to use the default c++ standard always (not hardcoded)
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+Last-Update: 2019-01-03
+
+--- charls-2.0.0+dfsg.orig/CMakeLists.txt
++++ charls-2.0.0+dfsg/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")


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
-# add_visibility.patch
-# stl_symbols_hack.patch
+add_visibility.patch
+stl_symbols_hack.patch
+noexplicitstd.patch


=====================================
debian/patches/stl_symbols_hack.patch
=====================================
@@ -3,27 +3,10 @@ Description: Rework the symbol file to hide stl exported symbols
 Author: Mathieu Malaterre <malat at debian.org>
 Forwarded: no
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,6 +39,7 @@
- endif()
- 
- 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}
+Index: charls/exports.version
+===================================================================
 --- /dev/null
-+++ b/exports.version
++++ charls/exports.version
 @@ -0,0 +1,9 @@
 +{
 +global:
@@ -34,3 +17,15 @@ Forwarded: no
 +local:
 +    *;
 +};
+Index: charls/CMakeLists.txt
+===================================================================
+--- charls.orig/CMakeLists.txt
++++ charls/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}


=====================================
debian/rules
=====================================
@@ -19,7 +19,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
-pkg_run = libcharls1
+pkg_run = libcharls2
 pkg_dev = libcharls-dev
 
 override_dh_install-arch:



View it on GitLab: https://salsa.debian.org/med-team/charls/compare/bd831e642d3462729c27027f73616fe66e552443...3f15f491eef6d3753453c720e7c20491b995ff69

-- 
View it on GitLab: https://salsa.debian.org/med-team/charls/compare/bd831e642d3462729c27027f73616fe66e552443...3f15f491eef6d3753453c720e7c20491b995ff69
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/20190103/639667db/attachment-0001.html>
