Author: malat Date: 2013-12-08 08:00:18 +0000 (Sun, 08 Dec 2013) New Revision: 15461
Added: trunk/packages/charls/trunk/debian/libcharls1.symbols trunk/packages/charls/trunk/debian/patches/add_visibility.patch Removed: trunk/packages/charls/trunk/debian/libcharls-dev.install trunk/packages/charls/trunk/debian/libcharls1.install Modified: trunk/packages/charls/trunk/debian/changelog trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch trunk/packages/charls/trunk/debian/patches/charls_fix_clang_compilation_issue.patch trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch trunk/packages/charls/trunk/debian/patches/series trunk/packages/charls/trunk/debian/rules Log: Next upload Modified: trunk/packages/charls/trunk/debian/changelog =================================================================== --- trunk/packages/charls/trunk/debian/changelog 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/changelog 2013-12-08 08:00:18 UTC (rev 15461) @@ -1,3 +1,10 @@ +charls (1.0-4) unstable; urgency=low + + * Do not set CMAKE_BUILD_TYPE. Closes: #731595 + * Fix exported symbols (add symbol file) + + -- Mathieu Malaterre <[email protected]> Sun, 08 Dec 2013 08:56:17 +0100 + charls (1.0-3) unstable; urgency=low * Team upload Deleted: trunk/packages/charls/trunk/debian/libcharls-dev.install =================================================================== --- trunk/packages/charls/trunk/debian/libcharls-dev.install 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/libcharls-dev.install 2013-12-08 08:00:18 UTC (rev 15461) @@ -1,2 +0,0 @@ -usr/include/CharLS/*.h -usr/lib/*/libCharLS.so Deleted: trunk/packages/charls/trunk/debian/libcharls1.install =================================================================== --- trunk/packages/charls/trunk/debian/libcharls1.install 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/libcharls1.install 2013-12-08 08:00:18 UTC (rev 15461) @@ -1,2 +0,0 @@ -usr/lib/*/libCharLS.so.1.0 -usr/lib/*/libCharLS.so.1 Added: trunk/packages/charls/trunk/debian/libcharls1.symbols =================================================================== --- trunk/packages/charls/trunk/debian/libcharls1.symbols (rev 0) +++ trunk/packages/charls/trunk/debian/libcharls1.symbols 2013-12-08 08:00:18 UTC (rev 15461) @@ -0,0 +1,17 @@ +libCharLS.so.1 libcharls1 #MINVER# + JpegLsDecode@Base 1.0 + JpegLsDecodeRect@Base 1.0 + JpegLsEncode@Base 1.0 + JpegLsReadHeader@Base 1.0 + JpegLsVerifyEncode@Base 1.0 + _ZNSt6vectorIaSaIaEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPaS1_EERKa@Base 1.0 + _ZNSt6vectorIaSaIaEE14_M_fill_insertEN9__gnu_cxx17__normal_iteratorIPaS1_EEmRKa@Base 1.0 + _ZNSt6vectorIaSaIaEED1Ev@Base 1.0 + _ZNSt6vectorIaSaIaEED2Ev@Base 1.0 + _ZNSt6vectorIcSaIcEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPcS1_EERKc@Base 1.0 + _ZNSt6vectorIhSaIhEE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPhS1_EERKh@Base 1.0 + _ZNSt6vectorIhSaIhEE15_M_range_insertIPhEEvN9__gnu_cxx17__normal_iteratorIS3_S1_EET_S7_St20forward_iterator_tag@Base 1.0 + _ZNSt6vectorIlSaIlEEC1EmRKlRKS0_@Base 1.0 + _ZNSt6vectorIlSaIlEEC2EmRKlRKS0_@Base 1.0 + _ZNSt6vectorItSaItEEC1EmRKtRKS0_@Base 1.0 + _ZNSt6vectorItSaItEEC2EmRKtRKS0_@Base 1.0 Added: trunk/packages/charls/trunk/debian/patches/add_visibility.patch =================================================================== --- trunk/packages/charls/trunk/debian/patches/add_visibility.patch (rev 0) +++ trunk/packages/charls/trunk/debian/patches/add_visibility.patch 2013-12-08 08:00:18 UTC (rev 15461) @@ -0,0 +1,30 @@ +Index: charls-1.0/interface.h +=================================================================== +--- charls-1.0.orig/interface.h 2013-12-08 08:37:24.697462239 +0100 ++++ charls-1.0/interface.h 2013-12-08 08:37:28.109462193 +0100 +@@ -14,8 +14,12 @@ + #endif + #else + #ifndef CHARLS_IMEXPORT ++#if __GNUC__ >= 4 ++#define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype ++#else + #define CHARLS_IMEXPORT(returntype) returntype + #endif ++#endif + #endif /* _WIN32 */ + + +Index: charls-1.0/interface.cpp +=================================================================== +--- charls-1.0.orig/interface.cpp 2013-12-08 08:37:23.629462252 +0100 ++++ charls-1.0/interface.cpp 2013-12-08 08:37:28.109462193 +0100 +@@ -6,6 +6,8 @@ + //implement correct linkage for win32 dlls + #if defined(_WIN32) + #define CHARLS_IMEXPORT(returntype) __declspec(dllexport) returntype __stdcall ++#else ++#define CHARLS_IMEXPORT(returntype) __attribute__ ((visibility ("default"))) returntype + #endif + + #include "config.h" Modified: trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch =================================================================== --- trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch 2013-12-08 08:00:18 UTC (rev 15461) @@ -4,9 +4,9 @@ Index: charls-1.0/CMakeLists.txt =================================================================== ---- charls-1.0.orig/CMakeLists.txt 2011-04-27 21:06:42.000000000 +0200 -+++ charls-1.0/CMakeLists.txt 2011-04-27 21:06:46.000000000 +0200 -@@ -20,8 +20,21 @@ +--- charls-1.0.orig/CMakeLists.txt 2013-06-09 17:37:59.930503819 +0200 ++++ charls-1.0/CMakeLists.txt 2013-06-09 17:39:15.794503768 +0200 +@@ -20,8 +20,23 @@ OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF) SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS}) @@ -24,12 +24,14 @@ + VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION} + SOVERSION ${CHARLS_LIB_MAJOR_VERSION} + ) ++ set_property(TARGET CharLS PROPERTY LINK_INTERFACE_LIBRARIES "") ++ + +ENDIF(BUILD_SHARED_LIBS) add_executable(charlstest test/main.cpp test/time.cpp test/util.cpp test/bitstreamdamage.cpp test/compliance.cpp test/performance.cpp test/dicomsamples.cpp) target_link_libraries (charlstest CharLS) -@@ -29,4 +42,8 @@ +@@ -29,4 +44,8 @@ # Installs the header files into the {build_dir}/include/libcharls directory install(FILES ${charls_HEADERS} DESTINATION include/CharLS) Modified: trunk/packages/charls/trunk/debian/patches/charls_fix_clang_compilation_issue.patch =================================================================== --- trunk/packages/charls/trunk/debian/patches/charls_fix_clang_compilation_issue.patch 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/patches/charls_fix_clang_compilation_issue.patch 2013-12-08 08:00:18 UTC (rev 15461) @@ -1,4 +1,4 @@ -Author: Mathieu Malaterre <[email protected]> +Author: Mathieu Malaterre <[email protected]> Last-Update: Wed Nov 27 10:33:27 2013 +0100 Bug-Debian: http://bugs.debian.org/730612 Description: Fix a compilation error with clang Modified: trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch =================================================================== --- trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch 2013-12-08 08:00:18 UTC (rev 15461) @@ -2,10 +2,8 @@ Forwarded: not-needed Author: Mathieu Malaterre <[email protected]> -Index: charls-1.0/defaulttraits.h -=================================================================== ---- charls-1.0.orig/defaulttraits.h 2011-04-27 21:06:39.000000000 +0200 -+++ charls-1.0/defaulttraits.h 2011-04-27 21:06:47.000000000 +0200 +--- charls-1.0.orig/defaulttraits.h ++++ charls-1.0/defaulttraits.h @@ -2,7 +2,7 @@ // (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use. // Modified: trunk/packages/charls/trunk/debian/patches/series =================================================================== --- trunk/packages/charls/trunk/debian/patches/series 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/patches/series 2013-12-08 08:00:18 UTC (rev 15461) @@ -2,3 +2,4 @@ charls_add_sharedlib_soname.patch charls_fix_tests.patch charls_fix_clang_compilation_issue.patch +add_visibility.patch Modified: trunk/packages/charls/trunk/debian/rules =================================================================== --- trunk/packages/charls/trunk/debian/rules 2013-12-07 22:52:12 UTC (rev 15460) +++ trunk/packages/charls/trunk/debian/rules 2013-12-08 08:00:18 UTC (rev 15461) @@ -1,9 +1,12 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_CFLAGS_MAINT_APPEND = -fvisibility=hidden +export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo \ +CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -Dcharls_BUILD_SHARED_LIBS:BOOL=ON \ -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" @@ -13,6 +16,16 @@ override_dh_auto_configure: dh_auto_configure -- $(CMAKE_EXTRA_FLAGS) +pkg_run = libcharls1 +pkg_dev = libcharls-dev + +override_dh_install-arch: + # Runtime Package + dh_install -p$(pkg_run) usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so.* + # Development Package + dh_install -p$(pkg_dev) usr/include + dh_install -p$(pkg_dev) usr/lib/$(DEB_HOST_MULTIARCH)/lib*.so + VER_MAJOR = 1 VER_MINOR = 0 VER_FULL = $(VER_MAJOR).$(VER_MINOR) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
