[med-svn] [Git][med-team/fast][master] 2 commits: Add further dependencies to enable chroot / cowbuilder to build

Shayan Doust gitlab at salsa.debian.org
Thu Aug 8 15:31:48 BST 2019 


Shayan Doust pushed to branch master at Debian Med / fast


Commits:
150e110f by Shayan Doust at 2019-08-08T13:47:09Z
Add further dependencies to enable chroot / cowbuilder to build
Further dependencies still to be encountered

- - - - -
1c628ddf by Shayan Doust at 2019-08-08T14:31:23Z
Add missing descriptions to the current patches

- - - - -


5 changed files:

- debian/control
- debian/patches/disable_tests.patch
- debian/patches/use_system_eigen.patch
- debian/patches/use_system_openslide.cmake
- debian/patches/use_system_zlib.patch


Changes:

=====================================
debian/control
=====================================
@@ -4,16 +4,17 @@ Uploaders: Shayan Doust <hello at shayandoust.me>
 Section: science
 Priority: optional
 Build-Depends: debhelper-compat (= 12),
-	       cmake,
-	       libfontconfig1-dev,
-	       libgstreamer-plugins-bad1.0-dev,
-	       libgstreamer-plugins-base1.0-dev,
-	       libgstreamer1.0-dev,
-	       zlib1g-dev,
-	       libeigen3-dev,
-	       opencl-c-headers,
-	       ocl-icd-opencl-dev,
-	       libopenslide-dev
+               cmake,
+               libfontconfig1-dev,
+               libgstreamer-plugins-bad1.0-dev,
+               libgstreamer-plugins-base1.0-dev,
+               libgstreamer1.0-dev,
+               zlib1g-dev,
+               libeigen3-dev,
+               opencl-c-headers,
+               ocl-icd-opencl-dev,
+               libopenslide-dev,
+	       git
 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
=====================================
@@ -1,7 +1,13 @@
+Description: disable source's test suite
+ This is problematic and is currently disabled to not hinder productivity until this is figured out.
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-08-08
+---
+
 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
+--- fast.orig/CMakeLists.txt	2019-08-08 15:28:56.276921985 +0100
++++ fast/CMakeLists.txt	2019-08-08 15:28:56.276921985 +0100
 @@ -15,8 +15,8 @@
  include(cmake/Macros.cmake)
  


=====================================
debian/patches/use_system_eigen.patch
=====================================
@@ -1,7 +1,13 @@
+Description: use libeigen-dev
+ This patch modifies some of the cmake files in order to use the system available libeigen-dev library instead of cmake downloading, building and linking.
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-08-08
+---
+
 Index: fast/cmake/ExternalEigen.cmake
 ===================================================================
---- fast.orig/cmake/ExternalEigen.cmake	2019-07-26 15:41:31.256881570 +0100
-+++ fast/cmake/ExternalEigen.cmake	2019-07-26 15:41:31.252881538 +0100
+--- fast.orig/cmake/ExternalEigen.cmake	2019-08-08 14:52:02.618696327 +0100
++++ fast/cmake/ExternalEigen.cmake	2019-08-08 14:52:02.614696293 +0100
 @@ -1,21 +1,21 @@
  # Download and set up Eigen
  
@@ -44,8 +50,8 @@ Index: fast/cmake/ExternalEigen.cmake
 +#list(APPEND FAST_EXTERNAL_DEPENDENCIES eigen)
 Index: fast/cmake/InstallFAST.cmake
 ===================================================================
---- fast.orig/cmake/InstallFAST.cmake	2019-07-26 15:41:31.256881570 +0100
-+++ fast/cmake/InstallFAST.cmake	2019-07-26 15:41:31.252881538 +0100
+--- fast.orig/cmake/InstallFAST.cmake	2019-08-08 14:52:02.618696327 +0100
++++ fast/cmake/InstallFAST.cmake	2019-08-08 14:52:02.614696293 +0100
 @@ -185,10 +185,10 @@
  )
  
@@ -63,8 +69,8 @@ Index: fast/cmake/InstallFAST.cmake
  		DESTINATION fast/licenses/zlib/
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-07-26 15:41:31.256881570 +0100
-+++ fast/CMakeLists.txt	2019-07-26 15:42:22.785300550 +0100
+--- fast.orig/CMakeLists.txt	2019-08-08 14:52:02.618696327 +0100
++++ fast/CMakeLists.txt	2019-08-08 14:52:02.614696293 +0100
 @@ -153,7 +153,7 @@
      endif()
  endif()


=====================================
debian/patches/use_system_openslide.cmake
=====================================
@@ -1,7 +1,13 @@
+Description: use libopenslide-dev
+ This patch will modify some of the cmake files in order to build using libopenslide-dev available on the system instead of cmake downloading, compiling and static linking.
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-08-08
+---
+
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-07-26 22:17:23.542012300 +0100
-+++ fast/CMakeLists.txt	2019-07-26 22:24:50.269644742 +0100
+--- fast.orig/CMakeLists.txt	2019-08-08 14:49:11.365300187 +0100
++++ fast/CMakeLists.txt	2019-08-08 14:49:11.357300122 +0100
 @@ -162,7 +162,7 @@
  generate_export_header(FAST EXPORT_FILE_NAME FASTExport.hpp)
  
@@ -13,8 +19,8 @@ Index: fast/CMakeLists.txt
  target_link_libraries(FAST PUBLIC ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES})
 Index: fast/cmake/ExternalOpenSlide.cmake
 ===================================================================
---- fast.orig/cmake/ExternalOpenSlide.cmake	2019-07-26 22:17:23.542012300 +0100
-+++ fast/cmake/ExternalOpenSlide.cmake	2019-07-26 22:22:53.392694417 +0100
+--- fast.orig/cmake/ExternalOpenSlide.cmake	2019-08-08 14:49:11.365300187 +0100
++++ fast/cmake/ExternalOpenSlide.cmake	2019-08-08 14:49:11.357300122 +0100
 @@ -1,17 +1,17 @@
  # Download and set up OpenSlide
  


=====================================
debian/patches/use_system_zlib.patch
=====================================
@@ -1,7 +1,13 @@
+Description: use system packaged libz
+ This patch modifies some of the cmake files to use the system available zlib library instead of cmake downloading, compiling and linking.
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-08-08
+---
+
 Index: fast/cmake/ExternalZlib.cmake
 ===================================================================
---- fast.orig/cmake/ExternalZlib.cmake	2019-07-26 23:27:52.236396403 +0100
-+++ fast/cmake/ExternalZlib.cmake	2019-07-26 23:27:52.232396370 +0100
+--- fast.orig/cmake/ExternalZlib.cmake	2019-08-08 14:54:10.139738764 +0100
++++ fast/cmake/ExternalZlib.cmake	2019-08-08 14:54:10.135738732 +0100
 @@ -1,24 +1,24 @@
  # Download and set up zlib
  
@@ -51,8 +57,8 @@ Index: fast/cmake/ExternalZlib.cmake
 +#list(APPEND FAST_EXTERNAL_DEPENDENCIES zlib)
 Index: fast/CMakeLists.txt
 ===================================================================
---- fast.orig/CMakeLists.txt	2019-07-26 23:27:52.236396403 +0100
-+++ fast/CMakeLists.txt	2019-07-26 23:27:52.232396370 +0100
+--- fast.orig/CMakeLists.txt	2019-08-08 14:54:10.139738764 +0100
++++ fast/CMakeLists.txt	2019-08-08 14:54:10.135738732 +0100
 @@ -166,6 +166,7 @@
  ## Link everything
  message("-- LIBS: ${LIBRARIES} ${FAST_SYSTEM_LIBRARIES}")
@@ -63,8 +69,8 @@ Index: fast/CMakeLists.txt
  endif()
 Index: fast/cmake/InstallFAST.cmake
 ===================================================================
---- fast.orig/cmake/InstallFAST.cmake	2019-07-26 23:27:46.208347389 +0100
-+++ fast/cmake/InstallFAST.cmake	2019-07-26 23:28:17.744603807 +0100
+--- fast.orig/cmake/InstallFAST.cmake	2019-08-08 14:54:10.139738764 +0100
++++ fast/cmake/InstallFAST.cmake	2019-08-08 14:54:10.135738732 +0100
 @@ -190,9 +190,9 @@
  #		DESTINATION fast/licenses/eigen/
  #)



View it on GitLab: https://salsa.debian.org/med-team/fast/compare/49e9f3399f361523df07275d096dbec45fdb5f06...1c628ddf4e5fe6686798c3d2e4b2ddd0fbc2a90b

-- 
View it on GitLab: https://salsa.debian.org/med-team/fast/compare/49e9f3399f361523df07275d096dbec45fdb5f06...1c628ddf4e5fe6686798c3d2e4b2ddd0fbc2a90b
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/20190808/c1d60ae2/attachment-0001.html>

More information about the debian-med-commit mailing list