From 1e57be252084af7a938d300caa29d56ae0fed7ef Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Fri, 2 Feb 2024 10:01:30 +0000 Subject: [PATCH 1/9] added debian dir --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 24 ++++++++++++++++++++++++ debian/copyright | 11 +++++++++++ debian/csdr.install | 3 +++ debian/rules | 7 +++++++ debian/source/format | 1 + debian/watch | 2 ++ 8 files changed, 54 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/csdr.install create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..f6905ced --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +csdr (0.12+git20160415-1) UNRELEASED; urgency=medium + + * Initial release. (Closes: #821115) + + -- Iain R. Learmonth Fri, 15 Apr 2016 18:24:27 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..ec635144 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..10790df5 --- /dev/null +++ b/debian/control @@ -0,0 +1,24 @@ +Source: csdr +Section: hamradio +Priority: optional +Maintainer: Debian Hamradio Maintainers +Uploaders: Iain R. Learmonth +Build-Depends: debhelper (>= 9), + fftw3-dev +Standards-Version: 3.9.7 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/csdr.git +Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/csdr.git +Homepage: https://github.com/simonyiszk/csdr + +Package: csdr +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: DSP library and command-line tool for Software Defined Radio + libcsdr is a set of simple DSP routines for Software Defined Radio. It + is mostly useful for AM/FM/SSB demodulation and spectrum display. The + package comes with a command-line tool csdr, which lets you build DSP + processing chains by shell pipes. The code of libcsdr was intended to + be easy to follow. libcsdr was designed to use auto-vectorization + available in gcc. It means that it can achieve some speedup by taking + advantage of SIMD command sets available in today's CPUs (e.g. SSE on + x86 and NEON on ARM). diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..481a200d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,11 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: +Source: + +Files: * +Copyright: (C) 20xx-20yy +License: + +Files: debian/* +Copyright: (C) 2015 maintainername +License: diff --git a/debian/csdr.install b/debian/csdr.install new file mode 100644 index 00000000..598f2bf1 --- /dev/null +++ b/debian/csdr.install @@ -0,0 +1,3 @@ +libcsdr.so /usr/lib +csdr /usr/bin +csdr-fm /usr/bin diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..ae2f4e16 --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_install: + echo "Installation handled by debian/*.install" diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 00000000..9d5c73fc --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +https://github.com/simonyiszk/csdr/releases .*/archive/v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz) From 179be38b253b1b34f9563707893dc7b21ee53832 Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Fri, 2 Feb 2024 10:04:17 +0000 Subject: [PATCH 2/9] fix fftw dependency --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 10790df5..1def8aa4 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Hamradio Maintainers Uploaders: Iain R. Learmonth Build-Depends: debhelper (>= 9), - fftw3-dev + libfftw3-dev Standards-Version: 3.9.7 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/csdr.git Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/csdr.git From 1e4256bb45893f288c87a00314cd102dc14784a2 Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Fri, 2 Feb 2024 10:06:18 +0000 Subject: [PATCH 3/9] bump version --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f6905ced..933fb24d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -csdr (0.12+git20160415-1) UNRELEASED; urgency=medium +csdr (0.15-1) UNRELEASED; urgency=medium - * Initial release. (Closes: #821115) + * Initial Rhizomatica release. - -- Iain R. Learmonth Fri, 15 Apr 2016 18:24:27 +0100 + -- Rafael Diniz Fri, 02 Feb 2024 10:02:22 +0000 From b2bc40efbfa7be15cdb5138618075d3cbb8c52d1 Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Fri, 2 Feb 2024 10:09:36 +0000 Subject: [PATCH 4/9] now .so has version --- debian/csdr.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/csdr.install b/debian/csdr.install index 598f2bf1..f6f1dd82 100644 --- a/debian/csdr.install +++ b/debian/csdr.install @@ -1,3 +1,4 @@ +libcsdr.so.0.15 /usr/lib libcsdr.so /usr/lib csdr /usr/bin csdr-fm /usr/bin From 8e0b50e889b2bca220a3edb8f22f7b40fac0e16d Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Fri, 2 Feb 2024 10:15:40 +0000 Subject: [PATCH 5/9] include the headers to the package --- debian/csdr.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/csdr.install b/debian/csdr.install index f6f1dd82..33712528 100644 --- a/debian/csdr.install +++ b/debian/csdr.install @@ -1,4 +1,5 @@ libcsdr.so.0.15 /usr/lib libcsdr.so /usr/lib +*.h /usr/include/csdr csdr /usr/bin csdr-fm /usr/bin From a8caf7c39644d73f7dc64fb4e0db26aed39dbb5e Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Fri, 2 Feb 2024 10:56:23 +0000 Subject: [PATCH 6/9] do not auto-identify arch, just hardcoded arm64 and amd64 flags --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4db95f1d..e8ffca03 100644 --- a/Makefile +++ b/Makefile @@ -29,11 +29,8 @@ LIBSOURCES = fft_fftw.c libcsdr_wrapper.c #SOURCES = csdr.c $(LIBSOURCES) cpufeature = $(if $(findstring $(1),$(shell cat /proc/cpuinfo)),$(2)) -PARAMS_SSE = $(call cpufeature,sse,-msse) $(call cpufeature,sse2,-msse2) $(call cpufeature,sse3,-msse3) $(call cpufeature,sse4a,-msse4a) $(call cpufeature,sse4_1,-msse4.1) $(call cpufeature,sse4_2,-msse4.2 -msse4) -mfpmath=sse -PARAMS_NEON = -mfloat-abi=hard -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -funsafe-math-optimizations -Wformat=0 -DNEON_OPTS -#tnx Jan Szumiec for the Raspberry Pi support -PARAMS_RASPI = -mfloat-abi=hard -mcpu=arm1176jzf-s -mfpu=vfp -funsafe-math-optimizations -Wformat=0 -PARAMS_ARM = $(if $(call cpufeature,BCM2708,dummy-text),$(PARAMS_RASPI),$(PARAMS_NEON)) +PARAMS_SSE = -march=x86-64-v2 +PARAMS_ARM = -march=armv8-a+crc PARAMS_SIMD = $(if $(call cpufeature,sse,dummy-text),$(PARAMS_SSE),$(PARAMS_ARM)) PARAMS_LOOPVECT = -O3 -ffast-math -fdump-tree-vect-details -dumpbase dumpvect PARAMS_LIBS = -g -lm -lrt -lfftw3f -DUSE_FFTW -DLIBCSDR_GPL -DUSE_IMA_ADPCM From a4c1f3387a6a75b39b6c33b238070ad1b28c0c08 Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Sun, 4 Feb 2024 11:44:15 +0000 Subject: [PATCH 7/9] disable debug symbols by default --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e8ffca03..652f9e75 100644 --- a/Makefile +++ b/Makefile @@ -33,12 +33,10 @@ PARAMS_SSE = -march=x86-64-v2 PARAMS_ARM = -march=armv8-a+crc PARAMS_SIMD = $(if $(call cpufeature,sse,dummy-text),$(PARAMS_SSE),$(PARAMS_ARM)) PARAMS_LOOPVECT = -O3 -ffast-math -fdump-tree-vect-details -dumpbase dumpvect -PARAMS_LIBS = -g -lm -lrt -lfftw3f -DUSE_FFTW -DLIBCSDR_GPL -DUSE_IMA_ADPCM +PARAMS_LIBS = -lm -lrt -lfftw3f -DUSE_FFTW -DLIBCSDR_GPL -DUSE_IMA_ADPCM PARAMS_SO = -fpic PARAMS_MISC = -Wno-unused-result -#DEBUG_ON = 0 #debug is always on by now (anyway it could be compiled with `make DEBUG_ON=1`) -#PARAMS_DEBUG = $(if $(DEBUG_ON),-g,) -FFTW_PACKAGE = fftw-3.3.3 +FFTW_PACKAGE = fftw-3.3.10 PREFIX ?= /usr SOVERSION = 0.15 PARSEVECT ?= yes From a0d9227203af4826ed9d13e34f7347f288d8ce79 Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Sun, 4 Feb 2024 13:28:40 +0000 Subject: [PATCH 8/9] add nmux to the package --- debian/csdr.install | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/csdr.install b/debian/csdr.install index 33712528..7df0a409 100644 --- a/debian/csdr.install +++ b/debian/csdr.install @@ -3,3 +3,4 @@ libcsdr.so /usr/lib *.h /usr/include/csdr csdr /usr/bin csdr-fm /usr/bin +nmux /usr/bin From 3b6a9a8adea8501eea9292fc215fcb4b8289398d Mon Sep 17 00:00:00 2001 From: Rafael Diniz Date: Tue, 6 Feb 2024 12:13:19 +0000 Subject: [PATCH 9/9] bump version --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 933fb24d..6ceddf93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +csdr (0.15-2) UNRELEASED; urgency=medium + + * Bump version + + -- Rafael Diniz Tue, 06 Feb 2024 12:32:42 +0000 + csdr (0.15-1) UNRELEASED; urgency=medium * Initial Rhizomatica release.