[med-svn] [Git][med-team/sight][master] Update
Flavien Bridault (@fbridault-guest)
gitlab at salsa.debian.org
Fri Oct 1 14:07:04 BST 2021
Flavien Bridault pushed to branch master at Debian Med / sight
Commits:
82aae067 by Flavien Bridault at 2021-10-01T15:06:16+02:00
Update
- - - - -
13 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/libsight-dev.install
- debian/libsight.install
- + debian/not-installed
- − debian/patches/fix-i386-build.patch
- debian/patches/fix-module-path.patch
- debian/patches/series
- debian/rules
- + debian/sightcalibrator.install
- + debian/sightviewer.install
- − debian/vrrender.install
Changes:
=====================================
debian/changelog
=====================================
@@ -1,5 +1,10 @@
sight (21.0.0-1) UNRELEASED; urgency=medium
+ [Flavien Bridault]
+ * Rename vrrender package into sightviewer
+ * Add package for sightcalibrator
+ * d/p/: refresh patches
+ [Andreas Tille]
* Team upload.
* Fix watchfile to detect new versions on github
* New upstream version
=====================================
debian/control
=====================================
@@ -4,23 +4,19 @@ Uploaders: Flavien Bridault <fbridault at ircad.fr>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
- cmake,
+ cmake (>=3.19.0),
libboost-all-dev,
zlib1g-dev,
libexpat1-dev,
- libpng-dev,
- libtiff5-dev,
libcppunit-dev,
- libhdf5-dev,
libqt5opengl5-dev,
libqt5x11extras5-dev,
qttools5-dev,
- libvtk7-dev,
+ libvtk9-dev,
libgdcm-dev,
libinsighttoolkit4-dev,
- libann-dev,
libvtkgdcm-dev,
- libvtk7-qt-dev,
+ libvtk9-qt-dev,
libcamp-dev,
libglm-dev,
xvfb,
@@ -29,6 +25,9 @@ Build-Depends: debhelper-compat (= 13),
dbus-x11,
rdfind,
symlinks
+ libogre-1.12-dev,
+ zstd,
+ dcmtk
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/med-team/sight
Vcs-Git: https://salsa.debian.org/med-team/sight.git
@@ -76,14 +75,15 @@ Depends: libsight (= ${binary:Version}),
libqt5opengl5-dev,
libqt5x11extras5-dev,
qttools5-dev,
- libvtk7-dev,
+ libvtk9-dev,
libgdcm-dev,
libinsighttoolkit4-dev,
libann-dev,
libvtkgdcm-dev,
- libvtk7-qt-dev,
+ libvtk9-qt-dev,
libcamp-dev,
libglm-dev,
+ libogre-1.12-dev,
${shlibs:Depends},
${misc:Depends}
Description: Sight header files
@@ -104,11 +104,14 @@ Description: Sight header files
.
This package contains the development files.
-Package: vrrender
+Package: sightviewer
Architecture: any
Depends: libsight (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
+Conflicts: vrrender
+Provides: vrrender
+Replaces: vrrender
Description: DICOM viewer
Medical image viewer featuring negatoscope, multi-planar
reconstruction, and volume rendering.
@@ -121,5 +124,20 @@ Description: DICOM viewer
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
+ Last, SightViewer can also connect directly to a PACS, and
then request, download or upload DICOM files.
+
+Package: sightcalibrator
+Architecture: any
+Depends: libsight (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: Camera calibration software
+ User-friendly application to calibrate mono and stereo cameras.
+ .
+ SightCalibrator can take images, video files, or any supported
+ camera device as input. It detects the presence of a checkboard
+ in images. The parameters of the checkboard can be customized.
+ Individual images can then be marked to be used in the
+ computation of the calibration. Last, the intrinsic and extrinsic
+ parameters can be exported in OpenCV format, Yaml or XML.
=====================================
debian/copyright
=====================================
@@ -1,9 +1,10 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: sight
-Source: https://git.ircad.fr/Sight/sight
+Source: https://git.ircad.fr/sight/sight
Files: *
-Copyright: 2009-2019 IRCAD
+Copyright: 2009-2021 IRCAD
+ 2012-2020 IHU Strasbourg
License: LGPL-3+
Files: debian/*
@@ -17,11 +18,6 @@ License: GPL-3+
complete text of the GNU Lesser General Public License can be found in
`/usr/share/common-licenses/LGPL'.
-Files: CMake/cppunit/cppunit_main.cpp
-Copyright: 2004-2018 IRCAD France
- 2012-2018 IHU Strasbourg
-License: LGPL-3+
-
License: LGPL-3+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -41,7 +37,7 @@ License: LGPL-3+
On Debian systems, the complete text of the GNU Library General
Public License can be found in `/usr/share/common-licenses/LGPL-3'.
-Files: SrcLib/core/fwZip/*/minizip/*
+Files: libs/io/zip/minizip/*
Copyright: 1998-2010 Gilles Vollant
2009-2010 Mathias Svensson
2007-2008 Even Rouault
=====================================
debian/libsight-dev.install
=====================================
@@ -1,3 +1,3 @@
usr/include/*
-usr/lib/*/sight/*.so
+usr/lib/*/libsight*.so
usr/lib/cmake/
=====================================
debian/libsight.install
=====================================
@@ -1,4 +1,3 @@
-usr/bin/fwlauncher*
-usr/lib/*/sight/*.so.*
-usr/lib/*/sight/*/*.so.*
-usr/share/sight/[!V]*
+usr/bin/sightrun*
+usr/lib/*/libsight*.so.*
+usr/share/sight/[!S]*
=====================================
debian/not-installed
=====================================
@@ -0,0 +1,15 @@
+usr/bin/ex*
+usr/bin/tuto*
+usr/bin/DicomAnonymizer*
+usr/bin/NetworkProxy*
+usr/bin/networkproxy
+usr/bin/VersionGenerator*
+usr/bin/arucoMarker*
+usr/bin/arucomarker
+usr/bin/calDataGenerator*
+usr/bin/caldatagenerator
+usr/bin/charucoBoard*
+usr/bin/charucoboard
+usr/bin/dicomanonymizer*
+usr/bin/dicomxplorer*
+usr/bin/versiongenerator*
=====================================
debian/patches/fix-i386-build.patch deleted
=====================================
@@ -1,161 +0,0 @@
-Author: Flavien Bridault <fbridault at ircad.fr>
-Description: Fix build because of implicit conversions on i386.
-Forwarded: https://git.ircad.fr/sight/sight/-/issues/583
-
---- sight.orig/libs/core/fwData/include/fwData/Mesh.hpp
-+++ sight/libs/core/fwData/include/fwData/Mesh.hpp
-@@ -289,7 +289,7 @@
- fwCampMakeFriendDataMacro((fwData)(Mesh))
-
- typedef std::map< std::string, ::fwData::Array::sptr > ArrayMapType;
-- typedef std::uint64_t Id;
-+ typedef ::fwData::iterator::Id Id;
-
- [[deprecated("replaced by CellType (sight 22.0)")]] typedef enum
- {
---- sight.orig/libs/core/fwData/include/fwData/iterator/MeshIterators.hpp
-+++ sight/libs/core/fwData/include/fwData/iterator/MeshIterators.hpp
-@@ -36,6 +36,8 @@
- namespace iterator
- {
-
-+typedef size_t Id;
-+
- struct Point {
- float x;
- float y;
-@@ -100,9 +102,9 @@
- template<bool isConst>
- struct CellInfoBase {
-
-- typedef typename std::conditional<isConst, const std::uint64_t, std::uint64_t>::type cell_data_value_type;
-+ typedef typename std::conditional<isConst, const Id, Id>::type cell_data_value_type;
- typedef typename std::conditional<isConst, const CellType, CellType>::type cell_type_value_type;
-- typedef typename std::conditional<isConst, const std::uint64_t, std::uint64_t>::type cell_offset_value_type;
-+ typedef typename std::conditional<isConst, const Id, Id>::type cell_offset_value_type;
-
- typedef typename std::conditional<isConst, const RGBA, RGBA>::type rgba_value_type;
- typedef rgba_value_type& rgba_reference;
-@@ -338,7 +340,7 @@
- std::vector< ::fwMemory::BufferObject::Lock > m_locks;
- difference_type m_idx{0};
- difference_type m_numberOfElements{0};
-- std::uint64_t m_cellDataSize{0};
-+ size_t m_cellDataSize{0};
- difference_type m_currentOffset{0};
- };
-
---- sight.orig/libs/core/fwData/include/fwData/iterator/MeshIterators.hxx
-+++ sight/libs/core/fwData/include/fwData/iterator/MeshIterators.hxx
-@@ -727,7 +727,7 @@
- ++m_cellInfo->type;
- ++m_cellInfo->offset;
-
-- std::uint64_t offset;
-+ Id offset;
- if (m_idx < m_numberOfElements)
- {
- offset = *reinterpret_cast<typename CellInfo::cell_data_value_type*>(m_cellInfo->offset);
-@@ -740,7 +740,7 @@
- const difference_type newOffset = static_cast<difference_type>(offset);
- m_cellInfo->pointIdx += newOffset - m_currentOffset;
- m_currentOffset = newOffset;
-- std::uint64_t nextOffset;
-+ Id nextOffset;
- if (m_idx < m_numberOfElements-1)
- {
- nextOffset = *reinterpret_cast<typename CellInfo::cell_data_value_type*>(m_cellInfo->offset+1);
-@@ -800,7 +800,7 @@
-
- m_cellInfo->type += index;
- m_cellInfo->offset += index;
-- std::uint64_t offset;
-+ Id offset;
- if (m_idx < m_numberOfElements)
- {
- offset = *reinterpret_cast<typename CellInfo::cell_data_value_type*>(m_cellInfo->offset);
-@@ -812,7 +812,7 @@
- const difference_type newOffset = static_cast<difference_type>(offset);
- m_cellInfo->pointIdx += newOffset - m_currentOffset;
- m_currentOffset = newOffset;
-- std::uint64_t nextOffset;
-+ Id nextOffset;
- if (m_idx < m_numberOfElements-1)
- {
- nextOffset = *reinterpret_cast<typename CellInfo::cell_data_value_type*>(m_cellInfo->offset+1);
---- sight.orig/libs/core/fwDataIO/src/fwDataIO/reader/MeshReader.cpp
-+++ sight/libs/core/fwDataIO/src/fwDataIO/reader/MeshReader.cpp
-@@ -206,8 +206,6 @@
-
- SLM_ASSERT("Empty path for Trian file", !path.empty() );
-
-- std::streamsize length;
-- //char *buffer;
- std::string buf;
- std::ifstream file;
- file.open(path.string().c_str(), std::ios::binary );
-@@ -219,21 +217,21 @@
- }
-
- file.seekg(0, std::ios::end);
-- length = file.tellg();
-+ const auto length = file.tellg();
- file.seekg(0, std::ios::beg);
-
- //buffer = new char [length];
- buf.resize(static_cast<size_t>(length));
- char* buffer = &buf[0];
-
-- file.read(buffer, length);
-+ file.read(buffer, static_cast<size_t>(length));
- file.close();
-
- ::fwData::Mesh::sptr mesh = getConcreteObject();
-
- mesh->clear();
-
-- if (!parseTrian2(buffer, buffer+length, mesh))
-+ if (!parseTrian2(buffer, buffer+static_cast<size_t>(length), mesh))
- {
- SLM_ERROR( "Bad file format : " << path.string());
- throw std::ios_base::failure("Unable to open " + path.string() + " : Bad file format.");
---- sight.orig/libs/core/fwMedData/src/fwMedData/DicomSeries.cpp
-+++ sight/libs/core/fwMedData/src/fwMedData/DicomSeries.cpp
-@@ -108,9 +108,9 @@
- void DicomSeries::addDicomPath(std::size_t _instanceIndex, const std::filesystem::path& _path)
- {
- ::fwMemory::BufferObject::sptr buffer = ::fwMemory::BufferObject::New();
-- const size_t buffSize = std::filesystem::file_size(_path);
-+ const auto buffSize = std::filesystem::file_size(_path);
- buffer->setIStreamFactory( std::make_shared< ::fwMemory::stream::in::Raw >(_path),
-- buffSize, _path, ::fwMemory::RAW);
-+ static_cast<::fwMemory::BufferObject::SizeType>(buffSize), _path, ::fwMemory::RAW);
- m_dicomContainer[_instanceIndex] = buffer;
- }
-
---- sight.orig/libs/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
-+++ sight/libs/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
-@@ -292,7 +292,6 @@
- SLM_ASSERT("Empty path for dictionary file", !path.empty());
-
- // Reading of the file
-- std::streamsize length;
- std::string buf;
- std::ifstream file;
- file.open(path.string().c_str(), std::ios::binary );
-@@ -301,13 +300,13 @@
- FW_RAISE_IF(errorOpen, !file.is_open());
-
- file.seekg(0, std::ios::end);
-- length = file.tellg();
-+ const auto length = file.tellg();
- file.seekg(0, std::ios::beg);
-
- buf.resize(static_cast<size_t>(length));
- char* buffer = &buf[0];
-
-- file.read(buffer, length);
-+ file.read(buffer, static_cast<size_t>(length));
- file.close();
-
- std::vector < ::fwDataIO::line > dicolines;
=====================================
debian/patches/fix-module-path.patch
=====================================
@@ -3,16 +3,16 @@ Description: Fix vrrender launch.
Bug: https://git.ircad.fr/sight/sight/-/issues/680
Bug-Debian: http://bugs.debian.org/982262
---- sight.orig/libs/core/fwRuntime/src/detail/Runtime.cpp
-+++ sight/libs/core/fwRuntime/src/detail/Runtime.cpp
-@@ -55,8 +55,8 @@
- // The lib location is 'SIGHT_DIR/lib/libfwCore.dll'
- m_workingPath = fwRuntimePath.parent_path().parent_path();
- #else
-- // The lib location is 'SIGHT_DIR/lib/share/libfwCore.so'
-- m_workingPath = fwRuntimePath.parent_path().parent_path().parent_path();
-+ // The lib location is 'SIGHT_DIR/lib/x86_64-gnu-linux/libfwCore.so'
-+ m_workingPath = fwRuntimePath.parent_path().parent_path().parent_path().parent_path();
- #endif
+--- sight.orig/libs/core/core/runtime/detail/Runtime.cpp
++++ sight/libs/core/core/runtime/detail/Runtime.cpp
+@@ -58,8 +58,8 @@
+
+ Runtime::Runtime()
+ {
+- // The lib location is 'SIGHT_DIR/lib/sight_core.dll'
+- m_workingPath = ::boost::dll::program_location().parent_path().parent_path().string();
++ // The lib location is 'SIGHT_DIR/lib/x86_64-gnu-linux/sight_core.dll'
++ m_workingPath = ::boost::dll::program_location().parent_path().parent_path().parent_path().string();
}
+ //------------------------------------------------------------------------------
=====================================
debian/patches/series
=====================================
@@ -1,2 +1 @@
-fix-i386-build.patch
fix-module-path.patch
=====================================
debian/rules
=====================================
@@ -17,7 +17,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
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 -DBUILD_TESTS=OFF -DBUILD_SDK=ON -DGIT_TAG=$(DEB_VERSION_UPSTREAM) -DCMAKE_BUILD_TYPE=Release
+ dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DCMAKE_INSTALL_RPATH="/usr/lib/$(DEB_HOST_MULTIARCH)/sight" -Wno-dev -DBUILD_TESTS=OFF -DBUILD_SDK=ON -DGIT_TAG=$(DEB_VERSION_UPSTREAM) -DCMAKE_BUILD_TYPE=Release
override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -25,10 +25,10 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
endif
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/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
override_dh_install:
dh_install
sed -i -e 's@^me=.*$$@me=/usr/bin@' \
-e 's@^rootdir=.*$$@rootdir=/usr@' \
- debian/vrrender/usr/bin/vrrender
+ debian/sightviewer/usr/bin/sightviewer
=====================================
debian/sightcalibrator.install
=====================================
@@ -0,0 +1,2 @@
+usr/bin/sightcalibrator
+usr/share/sight/SightCalibrator*
=====================================
debian/sightviewer.install
=====================================
@@ -0,0 +1,2 @@
+usr/bin/sightviewer
+usr/share/sight/SightViewer*
=====================================
debian/vrrender.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/bin/vrrender
-usr/share/sight/VRRender*
View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/82aae067cd6cd4229f7790252d7ca872957ed023
--
View it on GitLab: https://salsa.debian.org/med-team/sight/-/commit/82aae067cd6cd4229f7790252d7ca872957ed023
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/20211001/f0e477f3/attachment-0001.htm>
More information about the debian-med-commit
mailing list