[Demudi-commits] r309 - in brutefir/trunk/debian: . patches

Thu, 09 Dec 2004 03:52:20 -0700

Author: free-guest
Date: 2004-12-09 03:52:13 -0700 (Thu, 09 Dec 2004)
New Revision: 309

Added:
   brutefir/trunk/debian/patches/10_sparc-v8.dpatch
Modified:
   brutefir/trunk/debian/changelog
Log:
brutefir:   
 * Bug fix: "brutefir: ftbfs [sparc] Requires v9|v9a|v9b", thanks to

Modified: brutefir/trunk/debian/changelog
===================================================================

--- brutefir/trunk/debian/changelog	2004-12-09 10:43:55 UTC (rev 308)
+++ brutefir/trunk/debian/changelog	2004-12-09 10:52:13 UTC (rev 309)
@@ -3,8 +3,10 @@
   * Using dpatch
   * Bug fix: "brutefir: FTBFS (amd64/gcc-4.0): invalid lvalue in
     assignment", thanks to Andreas Jochens (Closes: #284751).
+  * Bug fix: "brutefir: ftbfs [sparc] Requires v9|v9a|v9b", thanks to
+    Blars Blarson (Closes: #269715).
 
- --
+ -- Free Ekanayaka <free@agnula.org>  Thu,  9 Dec 2004 10:49:48 +0100
 
 brutefir (1.0-1) unstable; urgency=low
 

Added: brutefir/trunk/debian/patches/10_sparc-v8.dpatch
===================================================================
--- brutefir/trunk/debian/patches/10_sparc-v8.dpatch	2004-12-09 10:43:55 UTC (rev 308)
+++ brutefir/trunk/debian/patches/10_sparc-v8.dpatch	2004-12-09 10:52:13 UTC (rev 309)
@@ -0,0 +1,185 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_sparc-v8.dpatch by Free Ekanayaka <free@agnula.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad brutefir-1.0/Makefile /tmp/dpep.rSAnEB/brutefir-1.0/Makefile
+--- brutefir-1.0/Makefile	2004-10-30 13:30:15.000000000 +0200
++++ /tmp/dpep.rSAnEB/brutefir-1.0/Makefile	2004-12-09 10:48:47.000000000 +0100
+@@ -86,11 +86,13 @@
+ CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
+ -Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
+ -Wnested-externs
++BRUTEFIR_LIBS	+= -lrt -ldl
++endif
++
++# Sparc
+ ifeq ($(UNAME_P),sparc)
+ CC_FLAGS	+= -Wa,-xarch=v8plus
+ endif
+-BRUTEFIR_LIBS	+= -lrt -ldl
+-endif
+ 
+ # FreeBSD
+ ifeq ($(UNAME),FreeBSD)
+diff -urNad brutefir-1.0/Makefile~ /tmp/dpep.rSAnEB/brutefir-1.0/Makefile~
+--- brutefir-1.0/Makefile~	1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.rSAnEB/brutefir-1.0/Makefile~	2004-12-09 10:48:47.000000000 +0100
+@@ -0,0 +1,155 @@
++###################################
++# Where to install
++INSTALL_PREFIX	= $(DESTDIR)/usr
++
++###################################
++# Where to find libraries, and their header files.
++LIBPATHS	= -L/usr/lib
++INCLUDE		= -I/usr/include
++ifdef FFTW_PATH
++LIBPATHS	+= -L$(FFTW_PATH)/lib
++INCLUDE		+= -I$(FFTW_PATH)/include
++endif
++
++###################################
++# FFTW3 libraries for single and double precision
++FFTW_LIB	= -lfftw3 -lfftw3f
++
++###################################
++# Binaries
++FLEX	= flex
++LD	= ld
++CC	= gcc
++AS	= as
++
++###################################
++# Flags
++CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
++-Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
++-Wmissing-prototypes -Wmissing-declarations -Wnested-externs
++CC_FLAGS	= $(DEFINE) -O2
++CC_FPIC		= -fPIC
++LD_SHARED	= -shared
++
++###################################
++# Objects and libs for targets
++BRUTEFIR_LIBS	= $(FFTW_LIB) -lm
++BRUTEFIR_OBJS	= brutefir.o fftw_convolver.o bfconf.o bfrun.o \
++emalloc.o shmalloc.o dai.o bfconf_lexical.o inout.o dither.o delay.o 
++BRUTEFIR_IA32_OBJS = convolver_sse2.o convolver_sse.o \
++convolver_3dnow.o convolver_x87.o
++
++BFIO_FILE_OBJS	= bfio_file.fpic.o
++
++BFIO_ALSA_LIBS	= -lasound
++BFIO_ALSA_OBJS	= bfio_alsa.fpic.o emalloc.fpic.o inout.fpic.o
++
++BFIO_OSS_OBJS	= bfio_oss.fpic.o emalloc.fpic.o
++
++BFIO_JACK_LIBS	= -ljack
++BFIO_JACK_OBJS	= bfio_jack.fpic.o emalloc.fpic.o inout.fpic.o
++
++BFLOGIC_CLI_OBJS = bflogic_cli.fpic.o inout.fpic.o
++BFLOGIC_EQ_OBJS	= bflogic_eq.fpic.o emalloc.fpic.o shmalloc.fpic.o
++
++BIN_TARGETS	= brutefir
++LIB_TARGETS	= cli.bflogic eq.bflogic file.bfio
++
++###################################
++# System-specific settings
++
++UNAME		= $(shell uname)
++UNAME_P         = $(shell uname -p)
++UNAME_M         = $(shell uname -m)
++
++# Linux
++ifeq ($(UNAME),Linux)
++ifeq ($(UNAME_M),i386)
++BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
++endif
++ifeq ($(UNAME_M),i586)
++BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
++endif
++ifeq ($(UNAME_M),i686)
++BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
++endif
++BRUTEFIR_LIBS	+= -ldl
++LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
++# assume that we have alsa, osss and jack
++LIB_TARGETS	+= alsa.bfio
++LIB_TARGETS	+= oss.bfio
++LIB_TARGETS	+= jack.bfio
++endif
++
++# Solaris
++ifeq ($(UNAME),SunOS)
++CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
++-Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
++-Wnested-externs
++ifeq ($(UNAME_P),sparc)
++CC_FLAGS	+= -Wa,-xarch=v8plus
++endif
++BRUTEFIR_LIBS	+= -lrt -ldl
++endif
++
++# FreeBSD
++ifeq ($(UNAME),FreeBSD)
++ifeq ($(UNAME_M),i386)
++BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
++endif
++# assume that we have oss
++LIB_TARGETS	+= oss.bfio
++endif
++
++TARGETS		= $(BIN_TARGETS) $(LIB_TARGETS)
++
++###################################
++# Targets
++
++all: $(TARGETS)
++
++%.o: %.s
++	$(AS) -o $@			$<
++
++%.fpic.o: %.c
++	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
++
++%.o: %.c
++	$(CC) -o $@			-c $(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) $<
++
++%.c: %.lex
++	$(FLEX) -o$@ $<
++
++brutefir: $(BRUTEFIR_OBJS)
++	$(CC) $(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
++
++oss.bfio: $(BFIO_OSS_OBJS)
++	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
++
++jack.bfio: $(BFIO_JACK_OBJS)
++	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
++
++file.bfio: $(BFIO_FILE_OBJS)
++	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
++
++cli.bflogic: $(BFLOGIC_CLI_OBJS)
++	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
++
++eq.bflogic: $(BFLOGIC_EQ_OBJS)
++	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
++
++install: $(BIN_TARGETS) $(LIB_TARGETS)
++	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
++	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
++
++clean:
++	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \
++$(BFLOGIC_CLI_OBJS) $(BFLOGIC_EQ_OBJS) $(BFIO_ALSA_OBJS) $(BFIO_OSS_OBJS) \
++$(BFIO_JACK_OBJS) $(TARGETS)


Property changes on: brutefir/trunk/debian/patches/10_sparc-v8.dpatch
___________________________________________________________________
Name: svn:executable
   + *



