Skip to content

Commits on Source 3

Show whitespace changes
Inline Side-by-side
debian/control
View file @ 3f15f491
......@@ -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 → 100644
View file @ 3f15f491
libCharLS.so.2 libcharls2 #MINVER#
JpegLsDecode@Base 2.0.0+dfsg
JpegLsDecodeRect@Base 2.0.0+dfsg
JpegLsEncode@Base 2.0.0+dfsg
JpegLsReadHeader@Base 2.0.0+dfsg
JpegLsVerifyEncode@Base 2.0.0+dfsg
_Z18JpegLsDecodeStream14ByteStreamInfoS_PK13JlsParametersPc@Base 2.0.0+dfsg
(arch-bits=64)_Z18JpegLsEncodeStream14ByteStreamInfoRmS_RK13JlsParametersPc@Base 2.0.0+dfsg
(arch-bits=32)_Z18JpegLsEncodeStream14ByteStreamInfoRjS_RK13JlsParametersPc@Base 2.0.0+dfsg
_Z22JpegLsReadHeaderStream14ByteStreamInfoP13JlsParametersPc@Base 2.0.0+dfsg
debian/patches/add_visibility.patch
View file @ 3f15f491
Description: Use GCC Visibility
Author: Mathieu Malaterre <malat@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
--- charls-2.0.0+dfsg.orig/src/charls.h
+++ charls-2.0.0+dfsg/src/charls.h
@@ -15,7 +15,7 @@
#include "config.h"
--- charls-1.1.0+dfsg.orig/src/interface.h
+++ charls-1.1.0+dfsg/src/interface.h
@@ -20,7 +20,7 @@
/* windows dll */
#if !defined(CHARLS_IMEXPORT) && defined(CHARLS_DLL)
-# define CHARLS_IMEXPORT(returntype) __declspec(dllimport) returntype __stdcall
// 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 → 100644
View file @ 3f15f491
Description: Debian buildd wants to use the default c++ standard always (not hardcoded)
Author: Mathieu Malaterre <malat@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
View file @ 3f15f491
# add_visibility.patch
# stl_symbols_hack.patch
add_visibility.patch
stl_symbols_hack.patch
noexplicitstd.patch
debian/patches/stl_symbols_hack.patch
View file @ 3f15f491
......@@ -3,27 +3,10 @@ Description: Rework the symbol file to hide stl exported symbols
Author: Mathieu Malaterre <malat@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
View file @ 3f15f491
......@@ -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:
......