[med-svn] [Git][med-team/sight][master] 4 commits: Split package
Flavien Bridault
gitlab at salsa.debian.org
Sat Jul 20 15:10:23 BST 2019
Flavien Bridault pushed to branch master at Debian Med / sight
Commits:
e9e2ad28 by Flavien Bridault at 2019-07-20T09:13:43Z
Split package
- - - - -
ebeb05fe by Flavien Bridault at 2019-07-20T09:13:43Z
Fix launcher library path
- - - - -
aa548d9a by Flavien Bridault at 2019-07-20T15:42:39Z
Fix SDK install
- - - - -
5ca8b1cc by Flavien Bridault at 2019-07-20T15:42:39Z
Remove unecessary auto_install override
- - - - -
8 changed files:
- debian/control
- + debian/libsight-dev.install
- + debian/libsight.install
- + debian/patches/fix_launcher_library_path.patch
- debian/patches/series
- + debian/patches/skip_conan_deps.patch
- debian/rules
- + debian/vrrender.install
Changes:
=====================================
debian/control
=====================================
@@ -35,14 +35,16 @@ Vcs-Browser: https://salsa.debian.org/med-team/sight
Vcs-Git: https://salsa.debian.org/med-team/sight.git
Homepage: https://git.ircad.fr/Sight/sight
-Package: sight
+Package: libsight
Architecture: any
+Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
Conflicts: fw4spl
Provides: fw4spl
Replaces: fw4spl
-Description: The Surgical Image Guidance and
+Description: Sight libraries
+ The Surgical Image Guidance and
Healthcare Toolkit aims to ease the creation of
applications based on medical imaging. It includes
various features such as 2D and 3D digital image
@@ -56,3 +58,69 @@ Description: The Surgical Image Guidance and
in 2018, firstly to make its purpose clearer, and
secondly as part of a major change in design and in
the governance of the development team.
+ .
+ This package provides the shared libraries needed to
+ run C++ programs that use Sight.
+
+Package: libsight-dev
+Architecture: any
+Section: libdevel
+Depends: libsight (= ${binary:Version}),
+ libboost-all-dev,
+ zlib1g-dev,
+ libexpat1-dev,
+ libpng-dev,
+ libtiff5-dev,
+ libcppunit-dev,
+ libhdf5-dev,
+ libqt5opengl5-dev,
+ libqt5x11extras5-dev,
+ qttools5-dev,
+ libvtk7-dev,
+ libgdcm2-dev,
+ libinsighttoolkit4-dev,
+ libann-dev,
+ libvtkgdcm2-dev,
+ libvtk7.1-qt,
+ libvtk7-qt-dev,
+ libcamp0.7-dev,
+ libglm-dev,
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: Sight header files
+ The Surgical Image Guidance and
+ Healthcare Toolkit aims to ease the creation of
+ applications based on medical imaging. It includes
+ various features such as 2D and 3D digital image
+ processing, visualization, augmented reality and
+ medical interaction simulation. It runs on many
+ different environments (Windows, linux, macOS), is
+ written in C++, and features rapid interface design
+ using XML files.
+ .
+ Sight was formerly known as FW4SPL. It was renamed
+ in 2018, firstly to make its purpose clearer, and
+ secondly as part of a major change in design and in
+ the governance of the development team.
+ .
+ This package contains the development files.
+
+Package: vrrender
+Architecture: any
+Depends: libsight (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: DICOM viewer
+ Medical image viewer featuring negatoscope, multi-planar
+ reconstruction, and volume rendering.
+ .
+ Many image formats are handled such as DICOM, mhd,
+ inr.gz, vtk, vti,... Segmentations meshes can also
+ be imported from DICOM and vtk formats, and visualized
+ in mixed rendering with images.
+ .
+ Tools are provided to measure distances of
+ structures in the image and to place landmarks.
+ .
+ Last, VRRender can also connect directly to a PACS, and
+ then request, download or upload DICOM files.
=====================================
debian/libsight-dev.install
=====================================
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/*/sight/*.so
+usr/lib/cmake/
=====================================
debian/libsight.install
=====================================
@@ -0,0 +1,4 @@
+usr/bin/fwlauncher*
+usr/lib/*/sight/*.so.*
+usr/lib/*/sight/*/*.so.*
+usr/share/sight/[!V]*
=====================================
debian/patches/fix_launcher_library_path.patch
=====================================
@@ -0,0 +1,23 @@
+Author: Flavien Bridault <fbridault at ircad.fr>
+Description: Fix missing library path in the launcher
+
+--- sight.orig/CMake/install/linux/template.sh.in
++++ sight/CMake/install/linux/template.sh.in
+@@ -10,13 +10,15 @@
+ # Setup the directories
+ bindir="$me"
+ rootdir=`cd "$me/.." ; pwd`
+-libdir="$rootdir/lib"
++depslibdir="$rootdir/lib"
++libdir="$rootdir/@FWBUNDLE_LIB_PREFIX@"
+
+ bundledir="$rootdir/@FWBUNDLE_RC_PREFIX@"
+
+ # export LD_LIBRARY_PATH
+-LD_LIBRARY_PATH=$libdir:$libdir/sight:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
++LD_LIBRARY_PATH=$depslibdir:$libdir:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH
+
+ # Use CMAKE Variable of fwlauncher and Profile.xml path
+ exec "$bindir/@LAUNCHER@" \""$bundledir/@PROFILE_PATH@"\"
++
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,4 @@
+skip_conan_deps.patch
+fix_launcher_library_path.patch
fix_dcmtk_scp_cfg.patch
revert_qVTK_widget.patch
=====================================
debian/patches/skip_conan_deps.patch
=====================================
@@ -0,0 +1,74 @@
+--- sight.orig/CMake/install/linux_install.cmake
++++ sight/CMake/install/linux_install.cmake
+@@ -20,7 +20,7 @@
+ #Linux install
+ macro(linux_install PRJ_NAME)
+
+- if(NOT USE_SYSTEM_LIB AND NOT BUILD_SDK AND NOT USE_CONAN)
++ if(NOT USE_SYSTEM_LIB AND NOT BUILD_SDK AND NOT USE_CONAN AND NOT FW_BUILD_EXTERNAL)
+ findExtLibDir(EXTERNAL_LIBRARIES_DIRECTORIES)
+ endif()
+ set(CPACK_GENERATOR TGZ)
+@@ -73,28 +73,30 @@
+ endif()
+ endif()
+
+- if(NOT BUILD_SDK OR (BUILD_SDK AND ${PRJ_NAME} STREQUAL "sight") )
+- if(${PRJ_NAME} STREQUAL "sight")
+- # Needed for fixup_bundle first argument
+- set(LAUNCHER_PATH "bin/fwlauncher-${fwlauncher_VERSION}")
++ if(NOT USE_SYSTEM_LIB)
++ if(NOT BUILD_SDK OR (BUILD_SDK AND ${PRJ_NAME} STREQUAL "sight") )
++ if(${PRJ_NAME} STREQUAL "sight")
++ # Needed for fixup_bundle first argument
++ set(LAUNCHER_PATH "bin/fwlauncher-${fwlauncher_VERSION}")
++ endif()
++
++ if(NOT BUILD_SDK)
++ configure_file(${FWCMAKE_RESOURCE_PATH}/install/linux/linux_fixup.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/linux_fixup.cmake @ONLY)
++ install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/linux_fixup.cmake)
++ else()
++ installConanDepsForSDK()
++ endif()
++
++ set(CPACK_OUTPUT_FILE_PREFIX packages)
++ set(CPACK_INSTALLED_DIRECTORIES "${CMAKE_INSTALL_PREFIX};.") #look inside install dir for packaging
++
++ execute_process( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
++
++ set(CPACK_PACKAGE_FILE_NAME "${PRJ_NAME}-${VERSION}-linux_${ARCHITECTURE}")
++ set(CPACK_PACKAGE_VENDOR "IRCAD-IHU")
++ set(CPACK_PACKAGE_NAME "${PRJ_NAME}")
++ set(CPACK_PACKAGE_VERSION "${VERSION}")
+ endif()
+-
+- if(NOT BUILD_SDK)
+- configure_file(${FWCMAKE_RESOURCE_PATH}/install/linux/linux_fixup.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/linux_fixup.cmake @ONLY)
+- install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/linux_fixup.cmake)
+- else()
+- installConanDepsForSDK()
+- endif()
+-
+- set(CPACK_OUTPUT_FILE_PREFIX packages)
+- set(CPACK_INSTALLED_DIRECTORIES "${CMAKE_INSTALL_PREFIX};.") #look inside install dir for packaging
+-
+- execute_process( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
+-
+- set(CPACK_PACKAGE_FILE_NAME "${PRJ_NAME}-${VERSION}-linux_${ARCHITECTURE}")
+- set(CPACK_PACKAGE_VENDOR "IRCAD-IHU")
+- set(CPACK_PACKAGE_NAME "${PRJ_NAME}")
+- set(CPACK_PACKAGE_VERSION "${VERSION}")
+ endif()
+
+ if("${${PRJ_NAME}_TYPE}" STREQUAL "APP")
+--- sight.orig/CMake/build/SightConfig.cmake.in
++++ sight/CMake/build/SightConfig.cmake.in
+@@ -11,7 +11,7 @@
+ add_definitions(${CONAN_DEFINES})
+ set(FW_CONAN_CONFIGURED 1)
+ endif()
+-else()
++elif(NOT USE_SYSTEM_LIB)
+ set(EXTERNAL_LIBRARIES CACHE PATH "External libraries location (if not at a default location like /usr on Linux)")
+
+ file(TO_CMAKE_PATH ${EXTERNAL_LIBRARIES} FWEXTERNAL_LIBRARIES)
=====================================
debian/rules
=====================================
@@ -16,16 +16,11 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
dh $@
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DUSE_SYSTEM_LIB=ON -DPROJECTS_TO_BUILD="VRRender" -DPROJECTS_TO_INSTALL="VRRender" -DCMAKE_INSTALL_RPATH="/usr/lib/$(DEB_HOST_MULTIARCH)/sight" -Wno-dev -DENABLE_PCH=OFF -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release
-
-override_dh_auto_install:
- dh_auto_install --destdir=debian/sight
- rdfind -outputname /dev/null -makesymlinks true debian/sight/
- symlinks -r -s -c debian/sight
+ dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DUSE_SYSTEM_LIB=ON -DPROJECTS_TO_BUILD="VRRender" -DPROJECTS_TO_INSTALL="VRRender" -DCMAKE_INSTALL_RPATH="/usr/lib/$(DEB_HOST_MULTIARCH)/sight" -Wno-dev -DENABLE_PCH=OFF -DBUILD_TESTS=OFF -DBUILD_SDK=ON -DCMAKE_BUILD_TYPE=Release
override_dh_auto_test:
echo "test disabled"
override_dh_shlibdeps:
- dh_shlibdeps -v -l/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/sight:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/Bundles:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/gui_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/io_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ctrlSelection_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ioITK_0-1/
+ dh_shlibdeps -v -l/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/sight:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/Bundles:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/gui_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/io_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ctrlSelection_0-1/:/usr/lib/$(DEB_HOST_MULTIARCH)/sight/ioITK_0-1/
=====================================
debian/vrrender.install
=====================================
@@ -0,0 +1,2 @@
+usr/bin/vrrender
+usr/share/sight/VRRender*
View it on GitLab: https://salsa.debian.org/med-team/sight/compare/5bd20a005e24cb3eccab6bc3c83420b18e9dd3b1...5ca8b1cc5346551bcd49f80f6d10e1ab80ba4545
--
View it on GitLab: https://salsa.debian.org/med-team/sight/compare/5bd20a005e24cb3eccab6bc3c83420b18e9dd3b1...5ca8b1cc5346551bcd49f80f6d10e1ab80ba4545
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/20190720/6fb20d1f/attachment-0001.html>
More information about the debian-med-commit
mailing list