Thanks, applied as 752f24d63726100c02246c669056267b23be7117. Michael
[sent from post-receive hook] On Sun, 30 Jan 2022 16:49:45 +0100, Christian Melki <[email protected]> wrote: > Mostly bugfixes. Including the build fix previously included. > Remove patches. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch > b/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch > deleted file mode 100644 > index 270a358463fb..000000000000 > --- a/patches/dump1090fa-6.1/fix_cpufeatures_arch.patch > +++ /dev/null > @@ -1,61 +0,0 @@ > -From 059e48b82beb4fb920cca977b02db1ceb48facb9 Mon Sep 17 00:00:00 2001 > -From: Oliver Jowett <[email protected]> > -Date: Thu, 23 Sep 2021 13:23:17 +0800 > -Subject: [PATCH] Allow env vars (not only command line overrides) to set > - CPUFEATURES_{ARCH,UNAME}. Change CPUFEATURES_{ARCH,UNAME} defaults to use > - {ARCH,UNAME} values. > - > -Fixes #158 > ---- > - Makefile | 8 ++++++-- > - Makefile.cpufeatures | 4 ++-- > - 2 files changed, 8 insertions(+), 4 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index a85d154c5..9d81ed157 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -39,7 +39,11 @@ else > - LIMESDR ?= no > - endif > - > --UNAME := $(shell uname) > -+HOST_UNAME := $(shell uname) > -+HOST_ARCH := $(shell uname -m) > -+ > -+UNAME ?= $(HOST_UNAME) > -+ARCH ?= $(HOST_ARCH) > - > - ifeq ($(UNAME), Linux) > - CPPFLAGS += -D_DEFAULT_SOURCE > -@@ -150,7 +154,6 @@ endif > - ## starch (runtime DSP code selection) mix, architecture-specific > - ## > - > --ARCH ?= $(shell uname -m) > - ifneq ($(CPUFEATURES),yes) > - # need to be able to detect CPU features at runtime to enable any > non-standard compiler flags > - STARCH_MIX := generic > -@@ -180,6 +183,7 @@ include dsp/generated/makefile.$(STARCH_MIX) > - showconfig: > - @echo "Building with:" >&2 > - @echo " Version string: $(DUMP1090_VERSION)" >&2 > -+ @echo " Architecture: $(ARCH)" >&2 > - @echo " DSP mix: $(STARCH_MIX)" >&2 > - @echo " RTLSDR support: $(RTLSDR)" >&2 > - @echo " BladeRF support: $(BLADERF)" >&2 > -diff --git a/Makefile.cpufeatures b/Makefile.cpufeatures > -index 8c3b8418d..6b4289978 100644 > ---- a/Makefile.cpufeatures > -+++ b/Makefile.cpufeatures > -@@ -2,8 +2,8 @@ > - > - # cmake integration is a little tricky, so let's do this by hand for now > - > --CPUFEATURES_UNAME := $(shell uname) > --CPUFEATURES_ARCH := $(shell uname -m) > -+CPUFEATURES_UNAME ?= $(UNAME) > -+CPUFEATURES_ARCH ?= $(ARCH) > - > - CPUFEATURES_OBJS := cpu_features/src/filesystem.o > cpu_features/src/stack_line_reader.o cpu_features/src/string_view.o > - CPUFEATURES_CFLAGS := -std=c99 -O -g -DSTACK_LINE_READER_BUFFER_SIZE=1024 > -DNDEBUG > diff --git a/patches/dump1090fa-6.1/series b/patches/dump1090fa-6.1/series > deleted file mode 100644 > index cc3b46e66811..000000000000 > --- a/patches/dump1090fa-6.1/series > +++ /dev/null > @@ -1,2 +0,0 @@ > -fix_cpufeatures_arch.patch > - > diff --git a/rules/dump1090fa.make b/rules/dump1090fa.make > index c22e11c40f95..366209805727 100644 > --- a/rules/dump1090fa.make > +++ b/rules/dump1090fa.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_DUMP1090FA) += dump1090fa > # > # Paths and names > # > -DUMP1090FA_VERSION := 6.1 > -DUMP1090FA_MD5 := a7cb661bc23974f8bf7650ce26b6e0be > +DUMP1090FA_VERSION := 7.1 > +DUMP1090FA_MD5 := e50b888f2d9ec86a15cd39f997eb099b > DUMP1090FA := dump1090fa-$(DUMP1090FA_VERSION) > DUMP1090FA_SUFFIX := tar.gz > DUMP1090FA_URL := > https://github.com/flightaware/dump1090/archive/refs/tags/v$(DUMP1090FA_VERSION).$(DUMP1090FA_SUFFIX) _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
