[med-svn] [ismrmrd] 02/11: Update patch queue.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Sat Nov 26 11:58:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository ismrmrd.
commit 0990a6235c11dac5d49d38a7938b7b418f9b134f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Fri Nov 25 20:26:06 2016 +0000
Update patch queue.
- Drop Explicit-64-bit-shifts-for-flags.patch, applied upstream.
- Refresh Fix-HDF5-detection-with-CMake-3.6.patch.
- Refresh Use-Debian-CMake-find-module-location.patch.
- Drop hdf5-1.10.patch, applied upstream.
Gbp-Dch: full
---
.../patches/Explicit-64-bit-shifts-for-flags.patch | 89 ----------------------
.../Fix-HDF5-detection-with-CMake-3.6.patch | 12 +--
.../Use-Debian-CMake-find-module-location.patch | 4 +-
debian/patches/hdf5-1.10.patch | 21 -----
debian/patches/series | 2 -
5 files changed, 8 insertions(+), 120 deletions(-)
diff --git a/debian/patches/Explicit-64-bit-shifts-for-flags.patch b/debian/patches/Explicit-64-bit-shifts-for-flags.patch
deleted file mode 100644
index 1f244e0..0000000
--- a/debian/patches/Explicit-64-bit-shifts-for-flags.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From: Martyn Klassen <mklassen at robarts.ca>
-Date: Mon, 29 Jun 2015 17:00:46 -0400
-Subject: Explicit 64 bit shifts for flags
-
----
- libsrc/ismrmrd.c | 10 +++++-----
- tests/test_flags.cpp | 6 +++---
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/libsrc/ismrmrd.c b/libsrc/ismrmrd.c
-index 3fba17c..303a9a3 100644
---- a/libsrc/ismrmrd.c
-+++ b/libsrc/ismrmrd.c
-@@ -474,7 +474,7 @@ size_t ismrmrd_sizeof_data_type(int data_type)
-
- /* Misc. functions */
- bool ismrmrd_is_flag_set(const uint64_t flags, const uint64_t val) {
-- uint64_t bitmask = 1 << (val - 1);
-+ uint64_t bitmask = (uint64_t)(1) << (val - 1);
- return (flags & bitmask) > 0;
- }
-
-@@ -483,7 +483,7 @@ int ismrmrd_set_flag(uint64_t *flags, const uint64_t val) {
- if (flags==NULL) {
- return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer should not be NULL.");
- }
-- bitmask = 1 << (val - 1);
-+ bitmask = (uint64_t)(1) << (val - 1);
- *flags |= bitmask;
- return ISMRMRD_NOERROR;
- }
-@@ -501,7 +501,7 @@ int ismrmrd_clear_flag(uint64_t *flags, const uint64_t val) {
- if (flags==NULL) {
- return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer should not be NULL.");
- }
-- bitmask = 1 << (val - 1);
-+ bitmask = (uint64_t)(1) << (val - 1);
- *flags &= ~bitmask;
- return ISMRMRD_NOERROR;
- }
-@@ -520,7 +520,7 @@ bool ismrmrd_is_channel_on(const uint64_t channel_mask[ISMRMRD_CHANNEL_MASKS], c
- if (channel_mask==NULL) {
- return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer to channel_mask should not be NULL.");
- }
-- bitmask = 1 << (chan % 64);
-+ bitmask = (uint64_t)(1) << (chan % 64);
- offset = chan / 64;
- return (channel_mask[offset] & bitmask) > 0;
- }
-@@ -531,7 +531,7 @@ int ismrmrd_set_channel_on(uint64_t channel_mask[ISMRMRD_CHANNEL_MASKS], const u
- if (channel_mask==NULL) {
- return ISMRMRD_PUSH_ERR(ISMRMRD_RUNTIMEERROR, "Pointer to channel_mask should not be NULL.");
- }
-- bitmask = 1 << (chan % 64);
-+ bitmask = (uint64_t)(1) << (chan % 64);
- offset = chan / 64;
- channel_mask[offset] |= bitmask;
- return ISMRMRD_NOERROR;
-diff --git a/tests/test_flags.cpp b/tests/test_flags.cpp
-index 7402f0a..6c7dc32 100644
---- a/tests/test_flags.cpp
-+++ b/tests/test_flags.cpp
-@@ -15,7 +15,7 @@ BOOST_AUTO_TEST_CASE(test_is_flag_set)
- }
-
- for (int f = 1; f <= 64; f++) {
-- flags |= (1 << (f - 1));
-+ flags |= ((uint64_t)1 << (f - 1));
- BOOST_CHECK_EQUAL(ismrmrd_is_flag_set(flags, f), true);
- }
- }
-@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(test_set_flag)
-
- for (int f = 1; f <= 64; f++) {
- BOOST_CHECK_EQUAL(ismrmrd_set_flag(&flags, f), ISMRMRD_NOERROR);
-- BOOST_REQUIRE((flags & (1 << (f - 1))) != 0);
-+ BOOST_REQUIRE((flags & ((uint64_t)1 << (f - 1))) != 0);
- }
- }
-
-@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(test_clear_flag)
- BOOST_CHECK_EQUAL(ismrmrd_clear_flag(NULL, ISMRMRD_IMAGE_USER8), ISMRMRD_RUNTIMEERROR);
- for (int f = 1; f <= 64; f++) {
- BOOST_CHECK_EQUAL(ismrmrd_clear_flag(&flags, f), ISMRMRD_NOERROR);
-- BOOST_REQUIRE((flags & (1 << (f - 1))) == 0);
-+ BOOST_REQUIRE((flags & ((uint64_t)1 << (f - 1))) == 0);
- }
- }
-
diff --git a/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch b/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
index e312166..fc56011 100644
--- a/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
+++ b/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
@@ -7,24 +7,24 @@ Subject: Fix HDF5 detection with CMake 3.6.
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 456d4f4..ccdae44 100644
+index 665e106..5e9b1a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -97,7 +97,7 @@ find_package(HDF5 1.8 COMPONENTS C)
+@@ -111,7 +111,7 @@ find_package(HDF5 1.8 COMPONENTS C)
if (HDF5_FOUND)
set (ISMRMRD_DATASET_SUPPORT true)
set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
- set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
+ set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
- else (HDF5_FOUND)
+ else ()
set (ISMRMRD_DATASET_SUPPORT false)
-@@ -131,7 +131,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
+@@ -146,7 +146,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
if(DEFINED ENV{HDF5_ROOT})
set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin)
- else (DEFINED ENV{HDF5_ROOT})
+ else ()
- set(HDF5_BIN_DIR ${HDF5_C_INCLUDE_DIR}/../bin)
+ set(HDF5_BIN_DIR ${HDF5_INCLUDE_DIRS}/../bin)
- endif (DEFINED ENV{HDF5_ROOT})
+ endif ()
message("Install hdf5 libraries from ${HDF5_BIN_DIR} ")
install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION bin/.. FILES_MATCHING PATTERN "*.dll" )
diff --git a/debian/patches/Use-Debian-CMake-find-module-location.patch b/debian/patches/Use-Debian-CMake-find-module-location.patch
index 9644312..4dd5d96 100644
--- a/debian/patches/Use-Debian-CMake-find-module-location.patch
+++ b/debian/patches/Use-Debian-CMake-find-module-location.patch
@@ -7,12 +7,12 @@ Subject: Use Debian CMake find module location.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
-index 8988f17..3601f8f 100644
+index 778ab5a..a4d8136 100644
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@@ -7,7 +7,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
message(FATAL_ERROR "ISMRMRD_HOME environment variable must be defined")
- endif(NOT DEFINED ENV{ISMRMRD_HOME})
+ endif()
- list(APPEND CMAKE_MODULE_PATH "$ENV{ISMRMRD_HOME}/share/ismrmrd/cmake")
+ list(APPEND CMAKE_MODULE_PATH "$ENV{ISMRMRD_HOME}/lib/cmake/ismrmrd")
diff --git a/debian/patches/hdf5-1.10.patch b/debian/patches/hdf5-1.10.patch
deleted file mode 100644
index 2039af0..0000000
--- a/debian/patches/hdf5-1.10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: ismrmrd-1.3.2/include/ismrmrd/dataset.h
-===================================================================
---- ismrmrd-1.3.2.orig/include/ismrmrd/dataset.h
-+++ ismrmrd-1.3.2/include/ismrmrd/dataset.h
-@@ -9,6 +9,7 @@
- #define ISMRMRD_DATASET_H
-
- #include "ismrmrd/ismrmrd.h"
-+#include <hdf5.h>
-
- #ifdef __cplusplus
- #include <string>
-@@ -28,7 +29,7 @@ extern "C" {
- typedef struct ISMRMRD_Dataset {
- char *filename;
- char *groupname;
-- int fileid;
-+ hid_t fileid;
- } ISMRMRD_Dataset;
-
- /**
diff --git a/debian/patches/series b/debian/patches/series
index 2e63829..3934b8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
Disable-HTML-timestamps.patch
-Explicit-64-bit-shifts-for-flags.patch
Use-explicit-64-bit-shifts-in-testsuite.patch
Use-Debian-CMake-find-module-location.patch
Fix-HDF5-detection-with-CMake-3.6.patch
-hdf5-1.10.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ismrmrd.git
More information about the debian-med-commit
mailing list