brutefir: update to 1.1.2

package/brutefir/Makefile

@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		brutefir
-PKG_VERSION:=		1.0o
-PKG_RELEASE:=		3
-PKG_HASH:=		caae4a933b53b55b29d6cb7e2803e20819f31def6d0e4e12f9a48351e6dbbe9f
+PKG_VERSION:=		1.1.2
+PKG_RELEASE:=		1
+PKG_HASH:=		9b2f0220dfcd24345ee023b2a2ea4ca85cfd040c7cc6d54674353914f1055eef
 PKG_DESCR:=		convolution engine
 PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		fftw alsa-lib
 PKG_BUILDDEP:=		flex-host fftw alsa-lib
-PKG_URL:=		https://www.ludd.ltu.se/~torger/brutefir.html
-PKG_SITES:=		https://www.ludd.ltu.se/~torger/files/
+PKG_URL:=		https://torger.se/anders/brutefir.html
+PKG_SITES:=		https://torger.se/anders/files/
 
 DISTFILES:=             $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
@@ -25,6 +25,8 @@ include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,BRUTEFIR,brutefir,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
 
+TARGET_CPPFLAGS+=	-D_XOPEN_SOURCE -D_GNU_SOURCE
+
 CONFIG_STYLE=		manual
 ifeq ($(ADK_TARGET_CPU_WITH_SSE2),y)
 TARGET_CFLAGS+=		-msse2

package/brutefir/patches/patch-Makefile

@@ -1,6 +1,6 @@
---- brutefir-1.0o.orig/Makefile	2016-11-15 13:39:48.000000000 +0100
-+++ brutefir-1.0o/Makefile	2017-03-27 06:25:27.528418184 +0200
-@@ -5,12 +5,12 @@ LDFLAGS +=
+--- brutefir-1.1.2.orig/Makefile	2026-01-20 19:11:21.000000000 +0100
++++ brutefir-1.1.2/Makefile	2026-05-16 11:26:24.233177385 +0200
+@@ -8,17 +8,13 @@ LDFLAGS +=
  
  ###################################
  # Where to install
@@ -8,87 +8,84 @@
 +INSTALL_PREFIX	= $(DESTDIR)/usr
  
  ###################################
- # Where to find libraries, and their header files.
+-# Where to find libraries, and their header files.
 -LIBPATHS	= -L/usr/local/lib
 -INCLUDE		= -I/usr/local/include
-+LIBPATHS	=
-+INCLUDE		=
  ifdef FFTW_PATH
  LIBPATHS	+= -L$(FFTW_PATH)/lib
  INCLUDE		+= -I$(FFTW_PATH)/include
-@@ -21,20 +21,16 @@ endif
- FFTW_LIB	= -lfftw3 -lfftw3f
+ endif
+-INCLUDE		+= -I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2
+ INCLUDE 	+= -I$(SRCDIR)
  
  ###################################
--# Binaries
--FLEX	= flex
+@@ -36,8 +32,8 @@ FFTW_LIB	= -lfftw3 -lfftw3f
+ ###################################
+ # Binaries
+ FLEX	= flex
 -LD	= gcc
 -CC	= gcc
--CHMOD	= chmod
++CC	?= gcc
++LD	?= $(CC)
+ CHMOD	= chmod
  
  ###################################
- # Flags
- CC_WARN		= -Wall -Wpointer-arith -Wshadow \
- -Wcast-align -Wwrite-strings -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
--CC_FLAGS	= $(DEFINE) -O2 $(CFLAGS) $(CPPFLAGS)
-+CC_FLAGS	= $(DEFINE) $(CFLAGS) $(CPPFLAGS)
- CC_FPIC		= -fPIC
- LD_SHARED	= -shared
-+CHMOD		= chmod
- CHMOD_REMOVEX	= -x
+@@ -88,25 +84,11 @@ BFLOGIC_EQ_OBJS = $(BUILDDIR)/bflogic_eq
+ BIN_TARGETS	= $(BUILDDIR)/brutefir
+ LIB_TARGETS	= $(BUILDDIR)/cli.bflogic $(BUILDDIR)/eq.bflogic $(BUILDDIR)/file.bfio
+ # These targets requires libs that are less portable
+-LIB_TARGETS	+= $(BUILDDIR)/alsa.bfio $(BUILDDIR)/jack.bfio $(BUILDDIR)/pipewire.bfio
++LIB_TARGETS	+= $(BUILDDIR)/alsa.bfio $(BUILDDIR)/jack.bfio
  
  ###################################
-@@ -63,17 +59,12 @@ LIB_TARGETS	= cli.bflogic eq.bflogic fil
- ###################################
  # System-specific settings
  
--UNAME		= $(shell uname)
--UNAME_P         = $(shell uname -p)
 -UNAME_M         = $(shell uname -m)
-+UNAME		= Linux
-+UNAME_M         ?=
- 
- # Linux
- ifeq ($(UNAME),Linux)
+-
 -ifeq ($(UNAME_M),i586)
 -BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
 -CC_FLAGS	+= -msse
 -endif
 -ifeq ($(UNAME_M),i686)
-+ifeq ($(UNAME_M),x86)
- BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
- CC_FLAGS	+= -msse
- endif
-@@ -127,27 +118,27 @@ brutefir: $(BRUTEFIR_OBJS)
+-BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+-CC_FLAGS	+= -msse
+-endif
+-ifeq ($(UNAME_M),x86_64)
+-BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+-CC_FLAGS	+= -msse
+-endif
+ BRUTEFIR_LIBS	+= -ldl
+ LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
+ 
+@@ -137,27 +119,27 @@ $(BUILDDIR)/brutefir: $(BRUTEFIR_OBJS)
  	$(CC) $(LDFLAGS) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
  
- alsa.bfio: $(BFIO_ALSA_OBJS)
+ $(BUILDDIR)/alsa.bfio: $(BFIO_ALSA_OBJS)
 -	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
 +	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
  	$(CHMOD) $(CHMOD_REMOVEX) $@
  
- oss.bfio: $(BFIO_OSS_OBJS)
--	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
-+	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
- 	$(CHMOD) $(CHMOD_REMOVEX) $@
- 
- jack.bfio: $(BFIO_JACK_OBJS)
+ $(BUILDDIR)/jack.bfio: $(BFIO_JACK_OBJS)
 -	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
 +	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
  	$(CHMOD) $(CHMOD_REMOVEX) $@
  
- file.bfio: $(BFIO_FILE_OBJS)
+ $(BUILDDIR)/pipewire.bfio: $(BFIO_PIPEWIRE_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_PIPEWIRE_OBJS) $(BFIO_PIPEWIRE_LIBS) -lc
++	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_PIPEWIRE_OBJS) $(BFIO_PIPEWIRE_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ $(BUILDDIR)/file.bfio: $(BFIO_FILE_OBJS)
 -	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
 +	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
  	$(CHMOD) $(CHMOD_REMOVEX) $@
  
- cli.bflogic: $(BFLOGIC_CLI_OBJS)
+ $(BUILDDIR)/cli.bflogic: $(BFLOGIC_CLI_OBJS)
 -	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
 +	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
  	$(CHMOD) $(CHMOD_REMOVEX) $@
  
- eq.bflogic: $(BFLOGIC_EQ_OBJS)
+ $(BUILDDIR)/eq.bflogic: $(BFLOGIC_EQ_OBJS)
 -	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
 +	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
  	$(CHMOD) $(CHMOD_REMOVEX) $@

package/brutefir/patches/patch-Makefile.orig

@@ -0,0 +1,90 @@
+--- brutefir-1.1.2.orig/Makefile	2026-01-20 19:11:21.000000000 +0100
++++ brutefir-1.1.2/Makefile	2026-05-16 11:25:22.289049837 +0200
+@@ -8,12 +8,12 @@ LDFLAGS +=
+ 
+ ###################################
+ # Where to install
+-INSTALL_PREFIX	= $(DESTDIR)/usr/local
++INSTALL_PREFIX	= $(DESTDIR)/usr
+ 
+ ###################################
+ # Where to find libraries, and their header files.
+-LIBPATHS	= -L/usr/local/lib
+-INCLUDE		= -I/usr/local/include
++LIBPATHS	= -L/usr/lib
++INCLUDE		= -I/usr/include
+ ifdef FFTW_PATH
+ LIBPATHS	+= -L$(FFTW_PATH)/lib
+ INCLUDE		+= -I$(FFTW_PATH)/include
+@@ -36,8 +36,8 @@ FFTW_LIB	= -lfftw3 -lfftw3f
+ ###################################
+ # Binaries
+ FLEX	= flex
+-LD	= gcc
+-CC	= gcc
++CC	?= gcc
++LD	?= $(CC)
+ CHMOD	= chmod
+ 
+ ###################################
+@@ -88,25 +88,11 @@ BFLOGIC_EQ_OBJS = $(BUILDDIR)/bflogic_eq
+ BIN_TARGETS	= $(BUILDDIR)/brutefir
+ LIB_TARGETS	= $(BUILDDIR)/cli.bflogic $(BUILDDIR)/eq.bflogic $(BUILDDIR)/file.bfio
+ # These targets requires libs that are less portable
+-LIB_TARGETS	+= $(BUILDDIR)/alsa.bfio $(BUILDDIR)/jack.bfio $(BUILDDIR)/pipewire.bfio
++LIB_TARGETS	+= $(BUILDDIR)/alsa.bfio $(BUILDDIR)/jack.bfio
+ 
+ ###################################
+ # System-specific settings
+ 
+-UNAME_M         = $(shell uname -m)
+-
+-ifeq ($(UNAME_M),i586)
+-BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+-CC_FLAGS	+= -msse
+-endif
+-ifeq ($(UNAME_M),i686)
+-BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+-CC_FLAGS	+= -msse
+-endif
+-ifeq ($(UNAME_M),x86_64)
+-BRUTEFIR_OBJS	+= $(BRUTEFIR_SSE_OBJS)
+-CC_FLAGS	+= -msse
+-endif
+ BRUTEFIR_LIBS	+= -ldl
+ LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
+ 
+@@ -137,27 +123,27 @@ $(BUILDDIR)/brutefir: $(BRUTEFIR_OBJS)
+ 	$(CC) $(LDFLAGS) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
+ 
+ $(BUILDDIR)/alsa.bfio: $(BFIO_ALSA_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
++	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ $(BUILDDIR)/jack.bfio: $(BFIO_JACK_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
++	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ $(BUILDDIR)/pipewire.bfio: $(BFIO_PIPEWIRE_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_PIPEWIRE_OBJS) $(BFIO_PIPEWIRE_LIBS) -lc
++	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_PIPEWIRE_OBJS) $(BFIO_PIPEWIRE_LIBS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ $(BUILDDIR)/file.bfio: $(BFIO_FILE_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
++	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ $(BUILDDIR)/cli.bflogic: $(BFLOGIC_CLI_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
++	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ $(BUILDDIR)/eq.bflogic: $(BFLOGIC_EQ_OBJS)
+-	$(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
++	$(CC) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
+ 	$(CHMOD) $(CHMOD_REMOVEX) $@
+ 
+ install: $(BIN_TARGETS) $(LIB_TARGETS)

package/brutefir/patches/patch-emalloc_c

@@ -1,11 +0,0 @@
---- brutefir-1.0o.orig/emalloc.c	2016-11-15 13:39:48.000000000 +0100
-+++ brutefir-1.0o/emalloc.c	2017-03-17 19:15:58.601456985 +0100
-@@ -75,7 +75,7 @@ emallocaligned(size_t size)
-     }
-     check_avail(size);
- #if defined(__OS_LINUX__)
--#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 3)
-+#if (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 3) && !__UCLIBC__
-     /* use old memalign, posix_memalign may be buggy in these glibc versions */
-     p = memalign(ALIGNMENT, size < ALIGNMENT ? ALIGNMENT : size);
-     err = !p;