[med-svn] [Git][med-team/bart-view][master] 5 commits: recreate patches
Martin Uecker (@uecker-guest)
gitlab at salsa.debian.org
Tue Oct 25 18:15:11 BST 2022
Martin Uecker pushed to branch master at Debian Med / bart-view
Commits:
dac1130c by Martin Uecker at 2022-10-25T17:34:57+02:00
recreate patches
- - - - -
a32962fa by Martin Uecker at 2022-10-25T17:34:57+02:00
build depend on libbart-dev 0.8.00
- - - - -
b08379a8 by Martin Uecker at 2022-10-25T17:34:57+02:00
update watch file
- - - - -
f76b7e5e by Martin Uecker at 2022-10-25T17:34:57+02:00
update changlog (close RC bug)
- - - - -
7ae29168 by Martin Uecker at 2022-10-25T17:34:57+02:00
allow overwriting CFLAGS
- - - - -
11 changed files:
- debian/changelog
- debian/control
- debian/patches/0001-install-create-parent-directories.patch → debian/patches/0001-create-parent-directories.patch
- debian/patches/0002-don-t-build-cfl2png.patch
- debian/patches/0003-enable-cross-build.patch
- debian/patches/0004-workaround-for-GCC-11-compiler-bug-debian-bug-100250.patch
- debian/patches/0005-hardening.patch → debian/patches/0005-Enabling-hardening-options-to-fix-blhc.patch
- + debian/patches/0007-allow-overwriting-CFLAGS.patch
- debian/patches/series
- debian/rules
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,6 +1,7 @@
bart-view (0.2.00-1) UNRELEASED; urgency=medium
- * new upstream version.
+ * New upstream version (Closes: #1022324)
+ * Update watch file.
-- <uecker at tugraz.at> Mon, 24 Oct 2022 19:30:00 +0200
=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Martin Uecker <uecker at tugraz.at>
Section: science
Priority: optional
Build-Depends: debhelper-compat (= 13),
- libbart-dev,
+ libbart-dev (>= 0.8.00),
libgtk-3-dev
Standards-Version: 4.6.1.0
Vcs-Browser: https://salsa.debian.org/med-team/bart-view
=====================================
debian/patches/0001-install-create-parent-directories.patch → debian/patches/0001-create-parent-directories.patch
=====================================
@@ -1,17 +1,17 @@
-From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
-Date: Sat, 14 Jan 2017 22:16:38 +0100
-Subject: install: create parent directories
+From: Martin Uecker <uecker at tugraz.at>
+Date: Mon, 24 Oct 2022 19:38:17 +0200
+Subject: create parent directories
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 61381c7..5bfc09d 100644
+index 54e52a7..a2b8df3 100644
--- a/Makefile
+++ b/Makefile
-@@ -53,7 +53,7 @@ cfl2png: src/cfl2png.c src/view.[ch] src/draw.[ch] src/viewer.inc
- $(CC) $(CFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
+@@ -74,7 +74,7 @@ cfl2png: src/cfl2png.c src/view.[ch] src/draw.[ch] src/viewer.inc
+ $(CC) $(CFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
install:
- install view $(DESTDIR)/usr/lib/bart/commands/
=====================================
debian/patches/0002-don-t-build-cfl2png.patch
=====================================
@@ -1,5 +1,5 @@
-From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
-Date: Sat, 17 Feb 2018 17:49:43 +0100
+From: Martin Uecker <uecker at tugraz.at>
+Date: Mon, 24 Oct 2022 19:38:57 +0200
Subject: don't build cfl2png
---
@@ -7,11 +7,11 @@ Subject: don't build cfl2png
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 5bfc09d..d2a5187 100644
+index a2b8df3..508e8e3 100644
--- a/Makefile
+++ b/Makefile
-@@ -41,7 +41,9 @@ endif
- -include Makefile.local
+@@ -62,7 +62,9 @@ endif
+
-all: view cfl2png
=====================================
debian/patches/0003-enable-cross-build.patch
=====================================
@@ -1,19 +1,30 @@
+From: Martin Uecker <uecker at tugraz.at>
+Date: Mon, 24 Oct 2022 19:40:15 +0200
+Subject: enable cross build
+
+---
+ Makefile | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 508e8e3..cc409a1 100644
--- a/Makefile
+++ b/Makefile
-@@ -21,6 +21,7 @@
+@@ -2,6 +2,8 @@
+ -include Makefile.local
- CC ?= gcc
+PKG_CONFIG ?= pkg-config
- CFLAGS ?= -Wall -O2
- CFLAGS += -std=c11 -fopenmp
-
-@@ -49,7 +50,7 @@
++
+ CUDA?=0
+ CUDA_BASE ?= /usr/local/cuda
+ CUDA_LIB ?= lib
+@@ -70,7 +72,7 @@ src/viewer.inc: src/viewer.ui
@echo "STRINGIFY(`cat src/viewer.ui`)" > src/viewer.inc
view: src/main.c src/view.[ch] src/draw.[ch] src/viewer.inc
-- $(CC) $(CFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `pkg-config --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `pkg-config --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
-+ $(CC) $(CFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
+- $(CC) $(CFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `pkg-config --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `pkg-config --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
++ $(CC) $(CFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
cfl2png: src/cfl2png.c src/view.[ch] src/draw.[ch] src/viewer.inc
- $(CC) $(CFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
+ $(CC) $(CFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
=====================================
debian/patches/0004-workaround-for-GCC-11-compiler-bug-debian-bug-100250.patch
=====================================
@@ -1,5 +1,5 @@
-From: Martin Uecker <ma.uecker at gmail.com>
-Date: Wed, 29 Dec 2021 13:26:27 +0100
+From: Martin Uecker <uecker at tugraz.at>
+Date: Mon, 24 Oct 2022 19:41:28 +0200
Subject: workaround for GCC 11 compiler bug (debian bug #1002505)
---
@@ -7,12 +7,12 @@ Subject: workaround for GCC 11 compiler bug (debian bug #1002505)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/draw.h b/src/draw.h
-index 78d4dae..e45f4a9 100644
+index 143bf9a..b6b7bfd 100644
--- a/src/draw.h
+++ b/src/draw.h
-@@ -6,7 +6,7 @@ enum mode_t { MAGN, MAGN_VIRIDS, CMPL, CMPL_MYGBM, PHSE, PHSE_MYGBM, REAL, FLOW
+@@ -7,7 +7,7 @@ enum mode_t { MAGN, MAGN_VIRIDS, CMPL, CMPL_MYGBM, PHSE, PHSE_MYGBM, REAL, FLOW
enum flip_t { OO, XO, OY, XY };
- enum interp_t { NLINEAR, NEAREST };
+ enum interp_t { NLINEAR, NEAREST, LIINCO };
-extern complex float sample(int N, const float pos[N], const long dims[N], const long strs[N], enum interp_t interpolation, const complex float* in);
+extern complex float sample(int N, const float pos[/*N*/], const long dims[/*N*/], const long strs[/*N*/], enum interp_t interpolation, const complex float* in);
=====================================
debian/patches/0005-hardening.patch → debian/patches/0005-Enabling-hardening-options-to-fix-blhc.patch
=====================================
@@ -1,19 +1,25 @@
-Description: Enabling hardening options to fix blhc
-Author: Nilesh Patra <nilesh at debian.org>
-Last-Update: 2021-12-29
+From: Martin Uecker <uecker at tugraz.at>
+Date: Mon, 24 Oct 2022 19:42:47 +0200
+Subject: Enabling hardening options to fix blhc
+
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index cc409a1..a56a25e 100644
--- a/Makefile
+++ b/Makefile
-@@ -50,10 +50,11 @@
+@@ -72,10 +72,10 @@ src/viewer.inc: src/viewer.ui
@echo "STRINGIFY(`cat src/viewer.ui`)" > src/viewer.inc
view: src/main.c src/view.[ch] src/draw.[ch] src/viewer.inc
-- $(CC) $(CFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a \
-+ -lm -lpng $(LDFLAGS)
+- $(CC) $(CFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(EXPDYN) -o view -I$(TOOLBOX_INC) `$(PKG_CONFIG) --cflags gtk+-3.0` src/main.c src/view.c src/draw.c `$(PKG_CONFIG) --libs gtk+-3.0` $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
cfl2png: src/cfl2png.c src/view.[ch] src/draw.[ch] src/viewer.inc
-- $(CC) $(CFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libnum.a -lm -lpng
+- $(CC) $(CFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(EXPDYN) -o cfl2png -I$(TOOLBOX_INC) src/cfl2png.c src/draw.c $(TOOLBOX_LIB)/libmisc.a $(TOOLBOX_LIB)/libgeom.a $(TOOLBOX_LIB)/libnum.a $(CUDA_L) $(LDFLAGS)
install:
install -D view $(DESTDIR)/usr/lib/bart/commands/view
=====================================
debian/patches/0007-allow-overwriting-CFLAGS.patch
=====================================
@@ -0,0 +1,21 @@
+From: Martin Uecker <uecker at tugraz.at>
+Date: Tue, 25 Oct 2022 17:32:10 +0200
+Subject: allow overwriting CFLAGS
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a56a25e..f781bfe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -29,7 +29,7 @@ ifeq ($(origin CC), default)
+ CC = gcc
+ endif
+
+-CFLAGS = -Wall -O2
++CFLAGS ?= -Wall -O2
+
+
+ ifeq ($(BUILDTYPE), MacOSX)
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,6 @@
-0001-install-create-parent-directories.patch
+0001-create-parent-directories.patch
0002-don-t-build-cfl2png.patch
0003-enable-cross-build.patch
0004-workaround-for-GCC-11-compiler-bug-debian-bug-100250.patch
-0005-hardening.patch
+0005-Enabling-hardening-options-to-fix-blhc.patch
+0007-allow-overwriting-CFLAGS.patch
=====================================
debian/rules
=====================================
@@ -4,3 +4,5 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
%:
dh $@
+
+
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
version=4
-
-https://github.com/mrirecon/view/releases .*/v at ANY_VERSION@@ARCHIVE_EXT@
+opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/view-$1\.tar\.gz/ \
+ https://github.com/mrirecon/view/tags .*/v?(\d\S*)\.tar\.gz
View it on GitLab: https://salsa.debian.org/med-team/bart-view/-/compare/93970c9c9e8dda0a35e7e7a1638bef2752318250...7ae29168af3b7f381bd9bdb2826ed4bdad60658c
--
View it on GitLab: https://salsa.debian.org/med-team/bart-view/-/compare/93970c9c9e8dda0a35e7e7a1638bef2752318250...7ae29168af3b7f381bd9bdb2826ed4bdad60658c
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/20221025/344a8939/attachment-0001.htm>
More information about the debian-med-commit
mailing list