[Demudi-commits] r313 - in brutefir/trunk: . debian debian/patches
Free Ekanayaka
free-guest@haydn.debian.org
Fri, 10 Dec 2004 02:19:03 -0700
Author: free-guest
Date: 2004-12-10 02:17:44 -0700 (Fri, 10 Dec 2004)
New Revision: 313
Removed:
brutefir/trunk/Makefile
brutefir/trunk/brutefir.1
Modified:
brutefir/trunk/debian/changelog
brutefir/trunk/debian/patches/00list.amd64
brutefir/trunk/debian/patches/00list.sparc
Log:
brutefir:
* Added dpatch for the Makefile
Deleted: brutefir/trunk/Makefile
===================================================================
--- brutefir/trunk/Makefile 2004-12-10 09:02:58 UTC (rev 312)
+++ brutefir/trunk/Makefile 2004-12-10 09:17:44 UTC (rev 313)
@@ -1,155 +0,0 @@
-###################################
-# 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)
Deleted: brutefir/trunk/brutefir.1
===================================================================
--- brutefir/trunk/brutefir.1 2004-12-10 09:02:58 UTC (rev 312)
+++ brutefir/trunk/brutefir.1 2004-12-10 09:17:44 UTC (rev 313)
@@ -1,69 +0,0 @@
-.\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $
-.\"
-.\" transcript compatibility for postscript use.
-.\"
-.\" synopsis: .P! <file.ps>
-.\"
-.de P!
-.fl
-\!!1 setgray
-.fl
-\\&.\"
-.fl
-\!!0 setgray
-.fl \" force out current output buffer
-\!!save /psv exch def currentpoint translate 0 0 moveto
-\!!/showpage{}def
-.fl \" prolog
-.sy sed \-e 's/^/!/' \\$1\" bring in postscript file
-\!!psv restore
-.
-.de pF
-.ie \\*(f1 .ds f1 \\n(.f
-.el .ie \\*(f2 .ds f2 \\n(.f
-.el .ie \\*(f3 .ds f3 \\n(.f
-.el .ie \\*(f4 .ds f4 \\n(.f
-.el .tm ? font overflow
-.ft \\$1
-..
-.de fP
-.ie !\\*(f4 \{\
-. ft \\*(f4
-. ds f4\"
-' br \}
-.el .ie !\\*(f3 \{\
-. ft \\*(f3
-. ds f3\"
-' br \}
-.el .ie !\\*(f2 \{\
-. ft \\*(f2
-. ds f2\"
-' br \}
-.el .ie !\\*(f1 \{\
-. ft \\*(f1
-. ds f1\"
-' br \}
-.el .tm ? font underflow
-..
-.ds f1\"
-.ds f2\"
-.ds f3\"
-.ds f4\"
-'\" t
-.ta 8n 16n 24n 32n 40n 48n 56n 64n 72n
-.TH "DeMuDi undocumented package" "1"
-.SH "NAME"
-brutefir \(em program included in the DeMuDi distribution
-.SH "DESCRIPTION"
-.PP
-This program was packaged by the AGNULA team for the
-DeMuDi project (http://www.agnula.org).
-.PP
-A manual page for this application has not been provided
-yet, but you can access the documentation under /usr/share/doc/brutefir/brutefir.html
-
-.SH "SEE ALSO"
-.PP
-info (1), whatis (1), apropos (1), dpkg (8), locate (1),
-find (1), updatedb (1), undocumented (2), man (7), missing (7)
-.\" created by instant / docbook-to-man, Thu 09 Dec 2004, 10:21
Modified: brutefir/trunk/debian/changelog
===================================================================
--- brutefir/trunk/debian/changelog 2004-12-10 09:02:58 UTC (rev 312)
+++ brutefir/trunk/debian/changelog 2004-12-10 09:17:44 UTC (rev 313)
@@ -1,6 +1,7 @@
brutefir (1.0-2) unstable; urgency=low
* Using dpatch
+ * Added dpatch for the Makefile
* 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
Modified: brutefir/trunk/debian/patches/00list.amd64
===================================================================
--- brutefir/trunk/debian/patches/00list.amd64 2004-12-10 09:02:58 UTC (rev 312)
+++ brutefir/trunk/debian/patches/00list.amd64 2004-12-10 09:17:44 UTC (rev 313)
@@ -1 +1 @@
-10_amd64_gcc-4.0.dpatch
+10_amd64_gcc-4.0
Modified: brutefir/trunk/debian/patches/00list.sparc
===================================================================
--- brutefir/trunk/debian/patches/00list.sparc 2004-12-10 09:02:58 UTC (rev 312)
+++ brutefir/trunk/debian/patches/00list.sparc 2004-12-10 09:17:44 UTC (rev 313)
@@ -1 +1 @@
-10_sparc-v8.dpatch
+10_sparc-v8