[med-svn] r6683 - in trunk/packages/charls/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Wed Apr 27 18:58:22 UTC 2011
Author: malat-guest
Date: 2011-04-27 18:58:21 +0000 (Wed, 27 Apr 2011)
New Revision: 6683
Added:
trunk/packages/charls/trunk/debian/patches/
trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
trunk/packages/charls/trunk/debian/patches/series
Modified:
trunk/packages/charls/trunk/debian/control
trunk/packages/charls/trunk/debian/rules
Log:
Add patch to cmake build system
Modified: trunk/packages/charls/trunk/debian/control
===================================================================
--- trunk/packages/charls/trunk/debian/control 2011-04-27 16:54:06 UTC (rev 6682)
+++ trunk/packages/charls/trunk/debian/control 2011-04-27 18:58:21 UTC (rev 6683)
@@ -2,7 +2,7 @@
Section: unknown
Priority: extra
Maintainer: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), cmake
+Build-Depends: debhelper (>= 7.0.50~), cmake, quilt
Standards-Version: 3.8.4
Homepage: <insert the upstream URL, if relevant>
#Vcs-Git: git://git.debian.org/collab-maint/charls.git
Added: trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch
===================================================================
--- trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch (rev 0)
+++ trunk/packages/charls/trunk/debian/patches/charls_add_cmake_install_target.patch 2011-04-27 18:58:21 UTC (rev 6683)
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8304f0d..88f0949 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -12,6 +12,11 @@ SET(CMAKE_CXX_FLAGS "-D NDEBUG -O3" )
+ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+ ENDIF(NOT CMAKE_BUILD_TYPE)
+
++SET( charls_HEADERS "colortransform.h" "context.h" "decoderstrategy.h" "encoderstrategy.h" "interface.h"
++ "losslesstraits.h" "scan.h" "streams.h" "config.h" "contextrunmode.h" "defaulttraits.h"
++ "header.h" "lookuptable.h" "processline.h" "util.h" "publictypes.h"
++)
++
+ OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
+ SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
+
+@@ -21,3 +26,7 @@ add_library(CharLS header.cpp interface.cpp jpegls.cpp )
+ 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)
+
++# Installs the header files into the {build_dir}/include/libcharls directory
++install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
++
++
Added: trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch
===================================================================
--- trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch (rev 0)
+++ trunk/packages/charls/trunk/debian/patches/charls_add_sharedlib_soname.patch 2011-04-27 18:58:21 UTC (rev 6683)
@@ -0,0 +1,36 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88f0949..c57ef72 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,8 +20,21 @@ SET( charls_HEADERS "colortransform.h" "context.h" "decoderstrategy.h" "encode
+ OPTION(charls_BUILD_SHARED_LIBS "Build CharLS with shared libraries." OFF)
+ SET(BUILD_SHARED_LIBS ${charls_BUILD_SHARED_LIBS})
+
+-add_library(CharLS header.cpp interface.cpp jpegls.cpp )
++# Add soname to generated shared lib
+
++SET(CHARLS_LIB_MAJOR_VERSION 1)
++SET(CHARLS_LIB_MINOR_VERSION 0)
++
++IF(BUILD_SHARED_LIBS)
++ add_library(CharLS SHARED header.cpp interface.cpp jpegls.cpp
++ stdafx.cpp
++ )
++ set_target_properties( CharLS PROPERTIES
++ VERSION ${CHARLS_LIB_MAJOR_VERSION}.${CHARLS_LIB_MINOR_VERSION}
++ SOVERSION ${CHARLS_LIB_MAJOR_VERSION}
++ )
++
++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 @@ target_link_libraries (charlstest CharLS)
+ # Installs the header files into the {build_dir}/include/libcharls directory
+ install(FILES ${charls_HEADERS} DESTINATION include/CharLS)
+
++# Installs the target file (libCharLS.so) into the {build_dir}/lib directory
++install(TARGETS CharLS LIBRARY DESTINATION lib${LIB_SUFFIX})
++
++
+
Added: trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch
===================================================================
--- trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch (rev 0)
+++ trunk/packages/charls/trunk/debian/patches/charls_fix_tests.patch 2011-04-27 18:58:21 UTC (rev 6683)
@@ -0,0 +1,13 @@
+diff --git a/defaulttraits.h b/defaulttraits.h
+index 5032f7d..734bcea 100644
+--- a/defaulttraits.h
++++ b/defaulttraits.h
+@@ -2,7 +2,7 @@
+ // (C) Jan de Vaan 2007-2010, all rights reserved. See the accompanying "License.txt" for licensed use.
+ //
+
+-
++#include "header.h"
+ #ifndef CHARLS_DEFAULTTRAITS
+ #define CHARLS_DEFAULTTRAITS
+
Added: trunk/packages/charls/trunk/debian/patches/series
===================================================================
--- trunk/packages/charls/trunk/debian/patches/series (rev 0)
+++ trunk/packages/charls/trunk/debian/patches/series 2011-04-27 18:58:21 UTC (rev 6683)
@@ -0,0 +1,3 @@
+charls_add_cmake_install_target.patch
+charls_add_sharedlib_soname.patch
+charls_fix_tests.patch
Modified: trunk/packages/charls/trunk/debian/rules
===================================================================
--- trunk/packages/charls/trunk/debian/rules 2011-04-27 16:54:06 UTC (rev 6682)
+++ trunk/packages/charls/trunk/debian/rules 2011-04-27 18:58:21 UTC (rev 6683)
@@ -20,6 +20,9 @@
%:
dh --parallel --with quilt --buildsystem=cmake $@
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE:STRING=Release -Dcharls_BUILD_SHARED_LIBS:BOOL=ON
+
VER_MAJOR = 1
VER_MINOR = 0
VER_FULL = $(VER_MAJOR).$(VER_MINOR)
More information about the debian-med-commit
mailing list