diff options
-rw-r--r-- | media-sound/combine_wave/ChangeLog | 6 | ||||
-rw-r--r-- | media-sound/combine_wave/files/combine_wave-0.3.diff | 55 |
2 files changed, 5 insertions, 56 deletions
diff --git a/media-sound/combine_wave/ChangeLog b/media-sound/combine_wave/ChangeLog index c0dd8aea7797..940e42c41fb7 100644 --- a/media-sound/combine_wave/ChangeLog +++ b/media-sound/combine_wave/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-sound/combine_wave # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/combine_wave/ChangeLog,v 1.4 2010/07/20 23:55:38 sbriesen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/combine_wave/ChangeLog,v 1.5 2010/07/20 23:57:25 sbriesen Exp $ + + 20 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org> + -files/combine_wave-0.3.diff: + cleanup, take 2 20 Jul 2010; Stefan Briesenick <sbriesen@gentoo.org> combine_wave-0.3.1.ebuild: diff --git a/media-sound/combine_wave/files/combine_wave-0.3.diff b/media-sound/combine_wave/files/combine_wave-0.3.diff deleted file mode 100644 index c3e9c2dc6b5a..000000000000 --- a/media-sound/combine_wave/files/combine_wave-0.3.diff +++ /dev/null @@ -1,55 +0,0 @@ -diff -Naur combine_wave-0.3.orig/combine_wave.c combine_wave-0.3/combine_wave.c ---- combine_wave-0.3.orig/combine_wave.c 2005-10-06 14:44:10.000000000 +0200 -+++ combine_wave-0.3/combine_wave.c 2007-10-05 21:02:17.000000000 +0200 -@@ -19,8 +19,8 @@ - - void running_info() - { --fprintf(stderr,\ --" RUNNNING COMMANDS -+fprintf(stderr, -+" RUNNNING COMMANDS\n\ - b toggles move both channels / move right channel delay mode.\n\ - ESC exits.\n\ - 'z' 'x' 1 sample forward / backward.\n\ -@@ -39,8 +39,8 @@ - - void usage() - { --fprintf(stderr,\ --"Usage: -+fprintf(stderr, -+"Usage:\n\ - combine_wave [-a] [-d milli seconds delay right channel relative to left]\n\ - [-e samples delay right channel relative to left]\n\ - [-k] -l filename_left [-m] -o output_filename -r filename_right [s start seek offset].\n\ -diff -Naur combine_wave-0.3.orig/combine_wave.h combine_wave-0.3/combine_wave.h ---- combine_wave-0.3.orig/combine_wave.h 2005-10-06 14:44:10.000000000 +0200 -+++ combine_wave-0.3/combine_wave.h 2007-10-05 21:02:52.000000000 +0200 -@@ -5,6 +5,7 @@ - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - #include <signal.h> - #include <errno.h> -diff -Naur combine_wave-0.3.orig/Makefile combine_wave-0.3/Makefile ---- combine_wave-0.3.orig/Makefile 2005-10-06 14:44:10.000000000 +0200 -+++ combine_wave-0.3/Makefile 2007-10-05 21:00:43.000000000 +0200 -@@ -6,13 +6,13 @@ - CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 - - .c.o: -- gcc $(CFLAGS) -c $< -+ $(CC) $(CFLAGS) -c $< - - OBJECT =\ - combine_wave.o - - a.out : $(OBJECT) -- gcc -o combine_wave $(OBJECT) -+ $(CC) $(LDFLAGS) -o combine_wave $(OBJECT) - - # DEPENDENCIES - combine_wave.o : combine_wave.c combine_wave.h wave_header.h |