| 1 |
ssuominen 10/08/21 02:53:34 |
| 2 |
|
| 3 |
Modified: freebirth-0.3.2-gentoo-2.patch |
| 4 |
Log: |
| 5 |
Respect LDFLAGS wrt #333727 by Diego E. Pettenò. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: freebirth-0.3.2-gentoo-2.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/freebirth/files/freebirth-0.3.2-gentoo-2.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- freebirth-0.3.2-gentoo-2.patch 24 Jul 2007 15:08:41 -0000 1.2 |
| 22 |
+++ freebirth-0.3.2-gentoo-2.patch 21 Aug 2010 02:53:34 -0000 1.3 |
| 23 |
@@ -1,6 +1,5 @@ |
| 24 |
-diff -ur freebirth-0.3.2.orig/freebirth.c freebirth-0.3.2/freebirth.c |
| 25 |
---- freebirth-0.3.2.orig/freebirth.c 2000-01-13 20:42:26.000000000 +0200 |
| 26 |
-+++ freebirth-0.3.2/freebirth.c 2007-07-24 17:36:41.000000000 +0300 |
| 27 |
+--- freebirth.c |
| 28 |
++++ freebirth.c |
| 29 |
@@ -248,15 +248,15 @@ |
| 30 |
//bass_e = env_new(1025,10000,(sample_producer *)osc_blender); |
| 31 |
sl = g_slist_append(sl, bass_e); |
| 32 |
@@ -40,9 +39,8 @@ |
| 33 |
gtk_window_set_title(GTK_WINDOW (sample_freq_window), "Sample Pitch"); |
| 34 |
sample_freq_box = gtk_vbox_new(TRUE,10); |
| 35 |
gtk_widget_set_style(sample_freq_window,window_style); |
| 36 |
-diff -ur freebirth-0.3.2.orig/fuse_loops.c freebirth-0.3.2/fuse_loops.c |
| 37 |
---- freebirth-0.3.2.orig/fuse_loops.c 1999-02-27 04:02:23.000000000 +0200 |
| 38 |
-+++ freebirth-0.3.2/fuse_loops.c 2007-07-24 17:36:41.000000000 +0300 |
| 39 |
+--- fuse_loops.c |
| 40 |
++++ fuse_loops.c |
| 41 |
@@ -122,7 +122,18 @@ |
| 42 |
fprintf(file, "/* generated file -- don't edit */\n"); |
| 43 |
fprintf(file, "#include <unistd.h>\n"); |
| 44 |
@@ -72,9 +70,8 @@ |
| 45 |
fprintf(file, " write(fd, buffer, 2 * TBASS_BUFF_SIZE * sizeof(short));\n"); |
| 46 |
fprintf(file, "\n"); |
| 47 |
|
| 48 |
-diff -ur freebirth-0.3.2.orig/gtkdial.c freebirth-0.3.2/gtkdial.c |
| 49 |
---- freebirth-0.3.2.orig/gtkdial.c 1999-02-16 01:58:31.000000000 +0200 |
| 50 |
-+++ freebirth-0.3.2/gtkdial.c 2007-07-24 17:36:41.000000000 +0300 |
| 51 |
+--- gtkdial.c |
| 52 |
++++ gtkdial.c |
| 53 |
@@ -75,8 +75,6 @@ |
| 54 |
sizeof (GtkDialClass), |
| 55 |
(GtkClassInitFunc) gtk_dial_class_init, |
| 56 |
@@ -84,25 +81,44 @@ |
| 57 |
}; |
| 58 |
|
| 59 |
dial_type = gtk_type_unique (gtk_widget_get_type (), &dial_info); |
| 60 |
-diff -ur freebirth-0.3.2.orig/Makefile freebirth-0.3.2/Makefile |
| 61 |
---- freebirth-0.3.2.orig/Makefile 2000-01-13 01:37:14.000000000 +0200 |
| 62 |
-+++ freebirth-0.3.2/Makefile 2007-07-24 17:36:41.000000000 +0300 |
| 63 |
-@@ -2,9 +2,9 @@ |
| 64 |
+--- Makefile |
| 65 |
++++ Makefile |
| 66 |
+@@ -1,10 +1,9 @@ |
| 67 |
+ # Makefile for Freebirth |
| 68 |
# |
| 69 |
|
| 70 |
- CC=gcc |
| 71 |
+-CC=gcc |
| 72 |
-LOADLIBES=-lm $(shell gtk-config --libs) |
| 73 |
-CFLAGS=-g -O6 -Wall $(shell gtk-config --cflags) |
| 74 |
-LDFLAGS= |
| 75 |
-+LOADLIBES=-lm -L/usr/lib -lgtk-x11-2.0 |
| 76 |
-+CFLAGS=-g -Wall $(shell pkg-config --cflags gtk+-2.0) |
| 77 |
-+LDFLAGS=$(shell pkg-config --libs gtk+-2.0) |
| 78 |
++CC?=gcc |
| 79 |
++CFLAGS+=-Wall $(shell pkg-config --cflags gtk+-2.0) |
| 80 |
++LIBS=-lm $(shell pkg-config --libs gtk+-2.0) |
| 81 |
|
| 82 |
OFILES=\ |
| 83 |
oscillator.o sequencer.o envelope.o filter.o gtkdial.o mixer.o \ |
| 84 |
-diff -ur freebirth-0.3.2.orig/raw_wave.c freebirth-0.3.2/raw_wave.c |
| 85 |
---- freebirth-0.3.2.orig/raw_wave.c 2000-01-13 01:40:33.000000000 +0200 |
| 86 |
-+++ freebirth-0.3.2/raw_wave.c 2007-07-24 17:36:41.000000000 +0300 |
| 87 |
+@@ -22,16 +21,18 @@ |
| 88 |
+ -rm -f *.o freebirth fusebirth fused_loop.c Makefile.deps *~ |
| 89 |
+ |
| 90 |
+ freebirth: $(OFILES) fused_loop.o freebirth.o |
| 91 |
++ $(CC) $(LDFLAGS) $(CFLAGS) -o freebirth $(OFILES) fused_loop.o freebirth.o $(LIBS) |
| 92 |
+ |
| 93 |
+ fused_loop.c: fusebirth |
| 94 |
+ ./fusebirth > fused_loop.c 2>/dev/null |
| 95 |
+ |
| 96 |
+ fusebirth: $(OFILES) fuse_loops.o fusebirth.o |
| 97 |
++ $(CC) $(LDFLAGS) $(CFLAGS) -o fusebirth $(OFILES) fuse_loops.o fusebirth.o $(LIBS) |
| 98 |
+ |
| 99 |
+ fusebirth.o: freebirth.c |
| 100 |
+ $(CC) -c $(CFLAGS) -DFUSE_LOOPS -o fusebirth.o freebirth.c |
| 101 |
+ |
| 102 |
+ Makefile.deps: |
| 103 |
+- gcc -MM $(CFLAGS) $(CFILES) > Makefile.deps |
| 104 |
++ $(CC) -MM $(CFLAGS) $(CFILES) > Makefile.deps |
| 105 |
+ |
| 106 |
+ include Makefile.deps |
| 107 |
+--- raw_wave.c |
| 108 |
++++ raw_wave.c |
| 109 |
@@ -21,18 +21,36 @@ |
| 110 |
#include "raw_wave.h" |
| 111 |
#include <stdio.h> |
| 112 |
@@ -185,9 +201,8 @@ |
| 113 |
raw_wave_set_sample_file(out, filename); |
| 114 |
|
| 115 |
out->buffer = (sample *)malloc(sizeof(sample) * TBASS_BUFF_SIZE); |
| 116 |
-diff -ur freebirth-0.3.2.orig/raw_wave.h freebirth-0.3.2/raw_wave.h |
| 117 |
---- freebirth-0.3.2.orig/raw_wave.h 2000-01-13 20:44:05.000000000 +0200 |
| 118 |
-+++ freebirth-0.3.2/raw_wave.h 2007-07-24 17:41:14.000000000 +0300 |
| 119 |
+--- raw_wave.h |
| 120 |
++++ raw_wave.h |
| 121 |
@@ -62,7 +62,7 @@ |
| 122 |
event *event_pitch_change_new(int seq_handle, double pitch); |
Archives