summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-03-17 03:59:44 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2017-03-17 04:00:54 +0100
commit46e1c5e3ef185e3753bd18d145edda1c20c5efad (patch)
treebc8309e87f684e43423825329024a4f508f5bd62 /package
parent763fb502c1d94c33e4bd1034886cfd3522e44eff (diff)
brutefir: update to v1.0o
Diffstat (limited to 'package')
-rw-r--r--package/brutefir/Makefile9
-rw-r--r--package/brutefir/patches/patch-Makefile77
2 files changed, 44 insertions, 42 deletions
diff --git a/package/brutefir/Makefile b/package/brutefir/Makefile
index 1314f0517..ba43b06a4 100644
--- a/package/brutefir/Makefile
+++ b/package/brutefir/Makefile
@@ -4,14 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= brutefir
-PKG_VERSION:= 1.0m
-PKG_RELEASE:= 4
-PKG_HASH:= 23b80500fc8687be338bc2654ecc509eccc06fe9372815361b65ed9b1807ccca
+PKG_VERSION:= 1.0o
+PKG_RELEASE:= 1
+PKG_HASH:= caae4a933b53b55b29d6cb7e2803e20819f31def6d0e4e12f9a48351e6dbbe9f
PKG_DESCR:= convolution engine
PKG_SECTION:= mm/audio
PKG_DEPENDS:= fftw alsa-lib
PKG_BUILDDEP:= flex-host fftw alsa-lib
-PKG_SITES:= http://distfiles.openadk.org/
+PKG_URL:= https://www.ludd.ltu.se/~torger/brutefir.html
+PKG_SITES:= https://www.ludd.ltu.se/~torger/files/
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/package/brutefir/patches/patch-Makefile b/package/brutefir/patches/patch-Makefile
index a93fdeeb7..cbeeec4b6 100644
--- a/package/brutefir/patches/patch-Makefile
+++ b/package/brutefir/patches/patch-Makefile
@@ -1,6 +1,7 @@
---- brutefir-1.0m.orig/Makefile 2013-11-29 14:55:01.000000000 +0100
-+++ brutefir-1.0m/Makefile 2015-11-29 10:28:02.031683531 +0100
-@@ -1,11 +1,11 @@
+--- brutefir-1.0o.orig/Makefile 2016-11-15 13:39:48.000000000 +0100
++++ brutefir-1.0o/Makefile 2017-03-16 21:10:39.821793707 +0100
+@@ -5,12 +5,12 @@ LDFLAGS +=
+
###################################
# Where to install
-INSTALL_PREFIX = $(DESTDIR)/usr/local
@@ -10,40 +11,39 @@
# Where to find libraries, and their header files.
-LIBPATHS = -L/usr/local/lib
-INCLUDE = -I/usr/local/include
-+# 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
-@@ -17,17 +17,17 @@ FFTW_LIB = -lfftw3 -lfftw3f
+@@ -21,20 +21,16 @@ endif
+ FFTW_LIB = -lfftw3 -lfftw3f
###################################
- # Binaries
+-# Binaries
-FLEX = flex
--LD = ld
+-LD = gcc
-CC = gcc
--AS = as
-+#FLEX = flex
-+#CC = gcc
-+#LD = ld
-+#AS = as
+-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
-+CC_FLAGS = $(DEFINE) $(CFLAGS)
+-CC_FLAGS = $(DEFINE) -O2 $(CFLAGS) $(CPPFLAGS)
++CC_FLAGS = $(DEFINE) $(CFLAGS) $(CPPFLAGS)
CC_FPIC = -fPIC
LD_SHARED = -shared
++CHMOD = chmod
+ CHMOD_REMOVEX = -x
-@@ -59,15 +59,11 @@ LIB_TARGETS = cli.bflogic eq.bflogic fil
-
+ ###################################
+@@ -66,14 +62,11 @@ LIB_TARGETS = cli.bflogic eq.bflogic fil
UNAME = $(shell uname)
UNAME_P = $(shell uname -p)
--UNAME_M = $(shell uname -m)
-+UNAME_M ?=
+ UNAME_M = $(shell uname -m)
++UNAME_M ?=
# Linux
ifeq ($(UNAME),Linux)
@@ -56,36 +56,37 @@
BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS)
CC_FLAGS += -msse
endif
-@@ -127,25 +123,25 @@ bfconf_lexical.o: bfconf_lexical.c
- $(FLEX) -o$@ $<
-
- brutefir: $(BRUTEFIR_OBJS)
-- $(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
-+ $(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS) -lgcc
+@@ -127,27 +120,27 @@ brutefir: $(BRUTEFIR_OBJS)
+ $(CC) $(LDFLAGS) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
alsa.bfio: $(BFIO_ALSA_OBJS)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
-+ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc -lgcc
+- $(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) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc -lgcc
+- $(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)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
-+ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc -lgcc
+- $(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)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc -lgcc
+- $(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)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc -lgcc
+- $(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)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc -lgcc
+- $(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)
- install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir