[med-svn] [Git][med-team/fast][master] 3 commits: Use systemwide zlib

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / fast


Commits:
8fde58ec by Shayan Doust at 2019-07-26T09:34:40Z
Use systemwide zlib
Build fails at installation stage as cmake installation dirs still require editing

- - - - -
b0d89d0e by Shayan Doust at 2019-07-26T09:36:32Z
Add zlib1g-dev to the build dependency.

- - - - -
86bf0222 by Shayan Doust at 2019-07-26T09:38:58Z
Disable tests for now as they are problematic

- - - - -


4 changed files:

- debian/control
- + debian/patches/disable_tests.patch
- + debian/patches/series
- + debian/patches/use_system_zlib.patch


Changes:

=====================================
debian/control
=====================================
@@ -8,7 +8,8 @@ Build-Depends: debhelper-compat (= 12),
 	       libfontconfig1-dev,
 	       libgstreamer-plugins-bad1.0-dev,
 	       libgstreamer-plugins-base1.0-dev,
-	       libgstreamer1.0-dev
+	       libgstreamer1.0-dev,
+	       zlib1g-dev
 Standards-Version: 4.3.0
 Vcs-Browser: https://salsa.debian.org/med-team/fast
 Vcs-Git: https://salsa.debian.org/med-team/fast.git


=====================================
debian/patches/disable_tests.patch
=====================================
@@ -0,0 +1,15 @@
+Index: fast/CMakeLists.txt
+===================================================================
+--- fast.orig/CMakeLists.txt	2019-07-26 00:33:52.970078802 +0100
++++ fast/CMakeLists.txt	2019-07-26 02:58:25.548595558 +0100
+@@ -15,8 +15,8 @@
+ include(cmake/Macros.cmake)
+ 
+ #### Options
+-option(FAST_BUILD_TESTS "Build FAST tests." ON)
+-option(FAST_BUILD_EXAMPLES "Build examples." OFF)
++option(FAST_BUILD_TESTS "Build FAST tests." OFF)
++option(FAST_BUILD_EXAMPLES "Build examples." ON)
+ option(FAST_BUILD_TOOLS "Build tools." ON)
+ option(FAST_BUILD_DOCS "Build API documentation" OFF)
+ option(FAST_DOWNLOAD_TEST_DATA "Download test data automatically (> 1 GB)" OFF)


=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+use_system_zlib.patch
+disable_tests.patch


=====================================
debian/patches/use_system_zlib.patch
=====================================
@@ -0,0 +1,63 @@
+Index: fast/cmake/ExternalZlib.cmake
+===================================================================
+--- fast.orig/cmake/ExternalZlib.cmake	2019-07-26 09:34:34.497861993 +0100
++++ fast/cmake/ExternalZlib.cmake	2019-07-26 09:34:34.493861960 +0100
+@@ -1,24 +1,24 @@
+ # Download and set up zlib
+ 
+-include(cmake/Externals.cmake)
++#include(cmake/Externals.cmake)
+ 
+-ExternalProject_Add(zlib
+-        PREFIX ${FAST_EXTERNAL_BUILD_DIR}/zlib
+-        BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/zlib
+-        GIT_REPOSITORY "https://github.com/madler/zlib.git"
+-        GIT_TAG "v1.2.9"
+-        CMAKE_ARGS
+-            -DCMAKE_MACOSX_RPATH=ON
+-        CMAKE_CACHE_ARGS
+-            -DCMAKE_BUILD_TYPE:STRING=Release
+-            -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
+-            -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
+-            -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
+-)
+-if(WIN32)
+-	set(ZLIB_LIBRARY debug zlibd.lib optimized zlib.lib)
+-else(WIN32)
+-	set(ZLIB_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
+-endif(WIN32)
+-list(APPEND LIBRARIES ${ZLIB_LIBRARY})
+-list(APPEND FAST_EXTERNAL_DEPENDENCIES zlib)
+\ No newline at end of file
++#ExternalProject_Add(zlib
++#        PREFIX ${FAST_EXTERNAL_BUILD_DIR}/zlib
++#        BINARY_DIR ${FAST_EXTERNAL_BUILD_DIR}/zlib
++#        GIT_REPOSITORY "https://github.com/madler/zlib.git"
++#        GIT_TAG "v1.2.9"
++#        CMAKE_ARGS
++#            -DCMAKE_MACOSX_RPATH=ON
++#        CMAKE_CACHE_ARGS
++#            -DCMAKE_BUILD_TYPE:STRING=Release
++#            -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF
++#            -DCMAKE_INSTALL_MESSAGE:BOOL=LAZY
++#            -DCMAKE_INSTALL_PREFIX:STRING=${FAST_EXTERNAL_INSTALL_DIR}
++#)
++#if(WIN32)
++#	set(ZLIB_LIBRARY debug zlibd.lib optimized zlib.lib)
++#else(WIN32)
++#set(ZLIB_LIBRARY ${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX})
++	#endif(WIN32)
++list(APPEND LIBRARIES /usr/lib/x86_64-linux-gnu/libz.so)
++#list(APPEND FAST_EXTERNAL_DEPENDENCIES zlib)
+Index: fast/CMakeLists.txt
+===================================================================
+--- fast.orig/CMakeLists.txt	2019-07-26 09:34:34.497861993 +0100
++++ fast/CMakeLists.txt	2019-07-26 09:34:59.850068126 +0100
+@@ -166,6 +166,7 @@
+ ## Link everything
+ message("-- LIBS: ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES}")
+ target_link_libraries(FAST PUBLIC ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES})
++target_link_libraries(FAST PUBLIC z)
+ if(FAST_MODULE_Visualization AND FAST_BUILD_QT5)
+     qt5_use_modules(FAST Widgets OpenGL) # Add Qt 5 modules
+ endif()



View it on GitLab: https://salsa.debian.org/med-team/fast/compare/47b164411c24a2b446552235a8bbda8eb3037590...86bf022200d6c3c71d55f0f3b147f0663379344d

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/47b164411c24a2b446552235a8bbda8eb3037590...86bf022200d6c3c71d55f0f3b147f0663379344d
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/20190727/14cfd8be/attachment-0001.html>