1 |
aballier 08/06/25 16:37:18 |
2 |
|
3 |
Modified: meterbridge-0.9.2-asneeded.patch |
4 |
Added: meterbridge-0.9.2-cflags.patch |
5 |
Log: |
6 |
only patch Makefile.in and run eautoreconf, bug #226773. use emake instead of make, dont ignore cflags |
7 |
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: meterbridge-0.9.2-asneeded.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- meterbridge-0.9.2-asneeded.patch 13 Jan 2008 14:47:09 -0000 1.1 |
23 |
+++ meterbridge-0.9.2-asneeded.patch 25 Jun 2008 16:37:18 -0000 1.2 |
24 |
@@ -8,25 +8,3 @@ |
25 |
meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c |
26 |
-meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image |
27 |
+meterbridge_LDADD = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image |
28 |
-Index: meterbridge-0.9.2/src/Makefile.in |
29 |
-=================================================================== |
30 |
---- meterbridge-0.9.2.orig/src/Makefile.in |
31 |
-+++ meterbridge-0.9.2/src/Makefile.in |
32 |
-@@ -89,7 +89,7 @@ bin_PROGRAMS = meterbridge |
33 |
- EXTRA_DIST = *.h |
34 |
- |
35 |
- meterbridge_SOURCES = main.c linedraw.c vu_meters.c ppm_meters.c dpm_meters.c jf_meters.c scope.c envelopes.c find_image.c |
36 |
--meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image |
37 |
-+meterbridge_LDFLAGS = |
38 |
- subdir = src |
39 |
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |
40 |
- CONFIG_HEADER = config.h |
41 |
-@@ -102,7 +102,7 @@ am_meterbridge_OBJECTS = main.$(OBJEXT) |
42 |
- jf_meters.$(OBJEXT) scope.$(OBJEXT) envelopes.$(OBJEXT) \ |
43 |
- find_image.$(OBJEXT) |
44 |
- meterbridge_OBJECTS = $(am_meterbridge_OBJECTS) |
45 |
--meterbridge_LDADD = $(LDADD) |
46 |
-+meterbridge_LDADD = $(LDADD) -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image |
47 |
- meterbridge_DEPENDENCIES = |
48 |
- |
49 |
- DEFS = @DEFS@ |
50 |
|
51 |
|
52 |
|
53 |
1.1 media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch |
54 |
|
55 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch?rev=1.1&view=markup |
56 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch?rev=1.1&content-type=text/plain |
57 |
|
58 |
Index: meterbridge-0.9.2-cflags.patch |
59 |
=================================================================== |
60 |
Index: meterbridge-0.9.2/src/Makefile.am |
61 |
=================================================================== |
62 |
--- meterbridge-0.9.2.orig/src/Makefile.am |
63 |
+++ meterbridge-0.9.2/src/Makefile.am |
64 |
@@ -1,5 +1,5 @@ |
65 |
#CFLAGS = -O6 `sdl-config --cflags` -DPKG_DATA_DIR=\"$(pkgdatadir)\" |
66 |
-CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\" |
67 |
+AM_CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\" |
68 |
|
69 |
bin_PROGRAMS = meterbridge |
70 |
|
71 |
|
72 |
|
73 |
|
74 |
-- |
75 |
gentoo-commits@l.g.o mailing list |