[SCM] brutefir/master: Patches applied upstream.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Aug 9 18:37:23 UTC 2016
The following commit has been merged in the master branch:
commit 0961c7cb7db4f557b9af25b036b59a80642e41b3
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Aug 9 20:34:45 2016 +0200
Patches applied upstream.
diff --git a/debian/patches/10-makefile.patch b/debian/patches/10-makefile.patch
index 7ac9e8b..47dbb16 100644
--- a/debian/patches/10-makefile.patch
+++ b/debian/patches/10-makefile.patch
@@ -12,7 +12,8 @@ Index: brutefir/Makefile
===================================================================
--- brutefir.orig/Makefile
+++ brutefir/Makefile
-@@ -1,11 +1,11 @@
+@@ -5,12 +5,12 @@ LDFLAGS +=
+
###################################
# Where to install
-INSTALL_PREFIX = $(DESTDIR)/usr/local
@@ -27,7 +28,7 @@ Index: brutefir/Makefile
ifdef FFTW_PATH
LIBPATHS += -L$(FFTW_PATH)/lib
INCLUDE += -I$(FFTW_PATH)/include
-@@ -63,7 +63,7 @@ UNAME_P = $(shell uname -p)
+@@ -68,7 +68,7 @@ UNAME_P = $(shell uname -p)
UNAME_M = $(shell uname -m)
# Linux
@@ -36,15 +37,3 @@ Index: brutefir/Makefile
ifeq ($(UNAME_M),i586)
BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS)
CC_FLAGS += -msse
-@@ -78,8 +78,10 @@ CC_FLAGS += -msse
- endif
- BRUTEFIR_LIBS += -ldl
- LDMULTIPLEDEFS = -Xlinker --allow-multiple-definition
--# assume that we have alsa, osss and jack
-+# assume that we have oss and jack, alsa being linux-only
-+ifeq ($(UNAME),Linux)
- LIB_TARGETS += alsa.bfio
-+endif
- LIB_TARGETS += oss.bfio
- LIB_TARGETS += jack.bfio
- endif
diff --git a/debian/patches/11-sparc_v8.patch b/debian/patches/11-sparc_v8.patch
index 381426c..a95fe36 100644
--- a/debian/patches/11-sparc_v8.patch
+++ b/debian/patches/11-sparc_v8.patch
@@ -9,9 +9,9 @@ Index: brutefir/Makefile
===================================================================
--- brutefir.orig/Makefile
+++ brutefir/Makefile
-@@ -76,6 +76,9 @@ ifeq ($(UNAME_M),x86_64)
- BRUTEFIR_OBJS += $(BRUTEFIR_SSE_OBJS)
- CC_FLAGS += -msse
+@@ -84,6 +84,9 @@ endif
+ ifneq (,$(findstring sparc,$(UNAME_M)))
+ CC_FLAGS += -Wa,-xarch=v8plus
endif
+ifneq (,$(findstring sparc,$(UNAME_M)))
+CC_FLAGS += -Wa,-xarch=v8plus
diff --git a/debian/patches/12-spelling_errors.patch b/debian/patches/12-spelling_errors.patch
deleted file mode 100644
index cbd8142..0000000
--- a/debian/patches/12-spelling_errors.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Description: Fix spelling errors in the sources.
-Author: Alessio Treglia <alessio at debian.org>, Jaromír Mikeš <mira.mikes at seznam.cz>
-Forwarded: Anders Torger <torger at ludd.ltu.se>
----
- dai.c | 2 +-
- delay.c | 6 +++---
- raw2real.h | 2 +-
- real2raw.h | 2 +-
- 4 files changed, 6 insertions(+), 6 deletions(-)
-
-Index: brutefir/dai.c
-===================================================================
---- brutefir.orig/dai.c
-+++ brutefir/dai.c
-@@ -367,7 +367,7 @@ do_mute(struct subdev *sd,
- break;
- }
- default:
-- fprintf(stderr, "Sample byte size %d not suppported.\n",
-+ fprintf(stderr, "Sample byte size %d not supported.\n",
- sd->channels.sf.bytes);
- bf_exit(BF_EXIT_OTHER);
- break;
-@@ -1746,7 +1746,7 @@ process_callback(void **states[2],
- }
- return -1;
- case BF_CALLBACK_EVENT_ERROR:
-- fprintf(stderr, "An error occured in a callback I/O module.\n");
-+ fprintf(stderr, "An error occurred in a callback I/O module.\n");
- bf_exit(BF_EXIT_OTHER);
- break;
- case BF_CALLBACK_EVENT_NORMAL:
-Index: brutefir/delay.c
-===================================================================
---- brutefir.orig/delay.c
-+++ brutefir/delay.c
-@@ -118,7 +118,7 @@ copy_to_delaybuf(void *dbuf,
- }
- break;
- default:
-- fprintf(stderr, "Sample byte size %d not suppported.\n", sample_size);
-+ fprintf(stderr, "Sample byte size %d not supported.\n", sample_size);
- bf_exit(BF_EXIT_OTHER);
- break;
- }
-@@ -169,7 +169,7 @@ copy_from_delaybuf(void *buf,
- }
- break;
- default:
-- fprintf(stderr, "Sample byte size %d not suppported.\n", sample_size);
-+ fprintf(stderr, "Sample byte size %d not supported.\n", sample_size);
- bf_exit(BF_EXIT_OTHER);
- break;
- }
-@@ -218,7 +218,7 @@ shift_samples(void *buf,
- }
- break;
- default:
-- fprintf(stderr, "Sample byte size %d not suppported.\n", sample_size);
-+ fprintf(stderr, "Sample byte size %d not supported.\n", sample_size);
- bf_exit(BF_EXIT_OTHER);
- break;
- }
-Index: brutefir/raw2real.h
-===================================================================
---- brutefir.orig/raw2real.h
-+++ brutefir/raw2real.h
-@@ -153,7 +153,7 @@ RAW2REAL_NAME(void *_realbuf,
- break;
- default:
- raw2real_invalid_byte_size:
-- fprintf(stderr, "Sample byte size %d is not suppported.\n", bytes);
-+ fprintf(stderr, "Sample byte size %d is not supported.\n", bytes);
- bf_exit(BF_EXIT_OTHER);
- break;
- }
-Index: brutefir/real2raw.h
-===================================================================
---- brutefir.orig/real2raw.h
-+++ brutefir/real2raw.h
-@@ -244,7 +244,7 @@ REAL2RAW_NAME(void *_rawbuf,
- break;
- default:
- real2raw_invalid_byte_size:
-- fprintf(stderr, "Sample byte size %d is not suppported.\n", bytes);
-+ fprintf(stderr, "Sample byte size %d is not supported.\n", bytes);
- bf_exit(BF_EXIT_OTHER);
- break;
- }
-Index: brutefir/bflogic_eq.c
-===================================================================
---- brutefir.orig/bflogic_eq.c
-+++ brutefir/bflogic_eq.c
-@@ -534,7 +534,7 @@ bflogic_preinit(int *version_major,
- equalisers[n].coeff[1] == equalisers[i].coeff[1]))
- {
- fprintf(stderr, "EQ: At least two equalisers has at least one "
-- "coefficent set in common.\n");
-+ "coefficient set in common.\n");
- return -1;
- }
- }
-Index: brutefir/brutefir.html
-===================================================================
---- brutefir.orig/brutefir.html
-+++ brutefir/brutefir.html
-@@ -1365,7 +1365,7 @@ The coeff structure defines a set of fil
- becomes a FIR filter. There are several different file formats:
-
- <ul>
--<li><code>"text"</code> coefficents are listed in a text file, one
-+<li><code>"text"</code> coefficients are listed in a text file, one
- coefficient per line. They are parsed with the standard C library
- <code>strtod</code> function.
- <li>A sample format string describing a raw format, for example 16 bit
-@@ -1687,7 +1687,7 @@ memory and processing.
- If the <code>crossfade</code> setting is set to true, there will be a
- cross-fade when the coefficient is changed in runtime, making the
- coefficient change totally seamless. This means that when changing
--coefficent (using the CLI for example), the filter will convolve one
-+coefficient (using the CLI for example), the filter will convolve one
- block with the old coefficient, fade out that and mix it with a fade
- in block with the new coefficient. This means that at the
- time of coefficient change, there will be roughly twice the amount of
-@@ -1984,7 +1984,7 @@ will work as a line break, and thus sepa
- statements.
- <p>
- A typical use for atomic set of statements is to change filter
--coefficents and volume at the same time.
-+coefficients and volume at the same time.
- <p>
- The <code>sleep</code> function in the CLI allows for sleeping in seconds,
- milliseconds or blocks. One block is exactly the filter length in
-@@ -2172,10 +2172,10 @@ In run-time, equalisers can be modified
- at 20 Hz and +10 dB at 4000 Hz for equaliser for coeffient 0. Instead
- of <code>mag</code>, <code>phase</code> can be given. The command <code>lmc eq
- "eq-1" info</code> will list the current settings for the equaliser
--stored in the coefficent called "eq-1".
-+stored in the coefficient called "eq-1".
- <p>
- The more heavily loaded the computer is by convolution, the longer
--time it will take to render the new equaliser. If the coefficent set it
-+time it will take to render the new equaliser. If the coefficient set it
- renders to is very short, and the magnitude and phase response is very
- detailed (sharp edges etc) it will not be able to adapt to it fully.
-
diff --git a/debian/patches/20-debian_patches.patch b/debian/patches/20-debian_patches.patch
deleted file mode 100644
index 2f4adc9..0000000
--- a/debian/patches/20-debian_patches.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Author: ???
-Description: ???
-Forwarded: Anders Torger <torger at ludd.ltu.se>
-
-
----
- bfrun.c | 20 ++++++++++----------
- dai.c | 2 +-
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
---- brutefir.orig/dai.c
-+++ brutefir/dai.c
-@@ -61,7 +61,7 @@ struct subdev {
- struct {
- int iodelay_fill;
- int curbuf;
-- int frames_left;
-+ volatile int frames_left;
- } cb;
- };
-
---- brutefir.orig/bfrun.c
-+++ brutefir/bfrun.c
-@@ -96,20 +96,20 @@ struct debug_filter_process {
-
-
- struct intercomm_area {
-- bool_t doreset_overflow;
-+ volatile bool_t doreset_overflow;
- int sync[BF_MAXPROCESSES];
-- uint32_t period_us[BF_MAXPROCESSES];
-- double realtime_index;
-+ volatile uint32_t period_us[BF_MAXPROCESSES];
-+ volatile double realtime_index;
- struct bffilter_control fctrl[BF_MAXFILTERS];
- struct bfoverflow overflow[BF_MAXCHANNELS];
- uint32_t ismuted[2][BF_MAXCHANNELS/32];
-- int delay[2][BF_MAXCHANNELS];
-- int subdelay[2][BF_MAXCHANNELS];
-- int n_pids;
-- pid_t pids[BF_MAXPROCESSES];
-- int exit_status;
-- bool_t full_proc[BF_MAXPROCESSES];
-- bool_t ignore_rtprio;
-+ volatile int delay[2][BF_MAXCHANNELS];
-+ volatile int subdelay[2][BF_MAXCHANNELS];
-+ volatile int n_pids;
-+ volatile pid_t pids[BF_MAXPROCESSES];
-+ volatile int exit_status;
-+ volatile bool_t full_proc[BF_MAXPROCESSES];
-+ volatile bool_t ignore_rtprio;
-
- struct {
- uint64_t ts_start;
diff --git a/debian/patches/30-pass_hardening_flags.patch b/debian/patches/30-pass_hardening_flags.patch
deleted file mode 100644
index e557ae0..0000000
--- a/debian/patches/30-pass_hardening_flags.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>, Felipe Sateler <fsateler at debian.org>
-Description: Fix hardening. Flags are passed correctly now.
-Forwarded: Anders Torger <torger at ludd.ltu.se>
-
-Index: brutefir/Makefile
-===================================================================
---- brutefir.orig/Makefile
-+++ brutefir/Makefile
-@@ -1,4 +1,9 @@
- ###################################
-+CFLAGS +=
-+CPPFLAGS +=
-+LDFLAGS +=
-+
-+###################################
- # Where to install
- INSTALL_PREFIX = $(DESTDIR)/usr
-
-@@ -18,7 +23,7 @@ FFTW_LIB = -lfftw3 -lfftw3f
- ###################################
- # Binaries
- FLEX = flex
--LD = ld
-+LD = gcc
- CC = gcc
- CHMOD = chmod
-
-@@ -27,7 +32,7 @@ CHMOD = chmod
- 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) -O2 $(CFLAGS) $(CPPFLAGS)
- CC_FPIC = -fPIC
- LD_SHARED = -shared
- CHMOD_REMOVEX = -x
-@@ -106,43 +111,43 @@ TARGETS = $(BIN_TARGETS) $(LIB_TARGETS)
- all: $(TARGETS)
-
- %.fpic.o: %.c
-- $(CC) -o $@ -c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
-+ $(CC) -o $@ -c $(LDFLAGS) $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
-
- %.o: %.c
-- $(CC) -o $@ -c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
-+ $(CC) -o $@ -c $(LDFLAGS) $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
-
- # special rule to avoid to get warnings from code generated by flex
- bfconf_lexical.o: bfconf_lexical.c
-- $(CC) -o $@ -c $(INCLUDE) $(CC_FLAGS) $<
-+ $(CC) -o $@ -c $(LDFLAGS) $(INCLUDE) $(CC_FLAGS) $<
-
- %.c: %.lex
- $(FLEX) -o$@ $<
-
- brutefir: $(BRUTEFIR_OBJS)
-- $(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
-+ $(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) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS)
- $(CHMOD) $(CHMOD_REMOVEX) $@
-
- oss.bfio: $(BFIO_OSS_OBJS)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS)
- $(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) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS)
- $(CHMOD) $(CHMOD_REMOVEX) $@
-
- file.bfio: $(BFIO_FILE_OBJS)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS)
- $(CHMOD) $(CHMOD_REMOVEX) $@
-
- cli.bflogic: $(BFLOGIC_CLI_OBJS)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS)
- $(CHMOD) $(CHMOD_REMOVEX) $@
-
- eq.bflogic: $(BFLOGIC_EQ_OBJS)
-- $(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
-+ $(LD) $(LD_SHARED) $(LDFLAGS) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS)
- $(CHMOD) $(CHMOD_REMOVEX) $@
-
- install: $(BIN_TARGETS) $(LIB_TARGETS)
diff --git a/debian/patches/40-brutefir-no-sse.patch b/debian/patches/40-brutefir-no-sse.patch
deleted file mode 100644
index eeda0c4..0000000
--- a/debian/patches/40-brutefir-no-sse.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Description: Fix FTBFS on kfreebsd-i386
-Thanks to Steven Chamberlain <steven at pyro.eu.org>
-Forwarded: Anders Torger <torger at ludd.ltu.se>
-
-Index: brutefir/fftw_convolver.c
-===================================================================
---- brutefir.orig/fftw_convolver.c 2014-02-24 01:49:05.684702374 +0100
-+++ brutefir/fftw_convolver.c 2014-02-24 01:49:05.668702841 +0100
-@@ -265,7 +265,7 @@
- memcpy(_d, output_cbuf, n_fft * sizeof(real_t));
- */
- switch (opt_code) {
--#if defined(__ARCH_IA32__) || defined(__ARCH_X86_64__)
-+#if defined(__ARCH_X86_64__)
- case OPT_CODE_SSE:
- convolver_sse_convolve_add(input_cbuf, coeffs, output_cbuf,
- n_fft >> 3);
diff --git a/debian/patches/50-no-_init.patch b/debian/patches/50-no-_init.patch
deleted file mode 100644
index 88c8985..0000000
--- a/debian/patches/50-no-_init.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Author: Felipe Sateler <fsateler at debian.org>
-Description: Use constructor attribute instead of _init
-According to [1] the use of _init is dangerous, the constructor
-attribute should be used instead.
-
-This also enables the use of regular gcc instead of ld in linker lines
-in the makefile. This is useful to add support for LDFLAGS.
-
-[1] http://www.faqs.org/docs/Linux-HOWTO/Program-Library-HOWTO.html#INIT-AND-CLEANUP
-Forwarded: Anders Torger <torger at ludd.ltu.se>
---- a/bfio_alsa.c
-+++ b/bfio_alsa.c
-@@ -655,9 +655,10 @@ bfio_write(int fd,
- }
-
- void
--_init(void);
--void
--_init(void)
-+do_init(void);
-+
-+void __attribute__((constructor))
-+do_init(void)
- {
- memset(handles, 0, sizeof(handles));
- memset(n_handles, 0, sizeof(n_handles));
---- a/bfio_file.c
-+++ b/bfio_file.c
-@@ -604,9 +604,9 @@ bfio_stop(int io)
- }
-
- void
--_init(void);
--void
--_init(void)
-+do_init(void);
-+void __attribute__((constructor))
-+do_init(void)
- {
- char s[1024];
-
---- a/bfio_jack.c
-+++ b/bfio_jack.c
-@@ -569,9 +569,9 @@ bfio_synch_stop(void)
- }
-
- void
--_init(void);
--void
--_init(void)
-+do_init(void);
-+void __attribute__((constructor))
-+do_init(void)
- {
- memset(hasio, 0, sizeof(hasio));
- memset(handles, 0, sizeof(handles));
diff --git a/debian/patches/series b/debian/patches/series
index 7d12ca7..ec6f83d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
-20-debian_patches.patch
10-makefile.patch
11-sparc_v8.patch
-12-spelling_errors.patch
-30-pass_hardening_flags.patch
-40-brutefir-no-sse.patch
-50-no-_init.patch
--
brutefir packaging
More information about the pkg-multimedia-commits
mailing list