summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2008-06-25 16:37:18 +0000
committerAlexis Ballier <aballier@gentoo.org>2008-06-25 16:37:18 +0000
commita7f512cc337d3dc4484cbe79b99fbf50c99f7ee5 (patch)
tree4db36bc1af023003183a694dcabf730893af457a /media-sound/meterbridge/files
parentamd64 stable, bug #229131 (diff)
downloadgentoo-2-a7f512cc337d3dc4484cbe79b99fbf50c99f7ee5.tar.gz
gentoo-2-a7f512cc337d3dc4484cbe79b99fbf50c99f7ee5.tar.bz2
gentoo-2-a7f512cc337d3dc4484cbe79b99fbf50c99f7ee5.zip
only patch Makefile.in and run eautoreconf, bug #226773. use emake instead of make, dont ignore cflags
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.7 x86_64)
Diffstat (limited to 'media-sound/meterbridge/files')
-rw-r--r--media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch22
-rw-r--r--media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch11
2 files changed, 11 insertions, 22 deletions
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch b/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch
index b2c79a09c6a5..18d742fbbf46 100644
--- a/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch
+++ b/media-sound/meterbridge/files/meterbridge-0.9.2-asneeded.patch
@@ -8,25 +8,3 @@ Index: meterbridge-0.9.2/src/Makefile.am
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
-meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
+meterbridge_LDADD = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
-Index: meterbridge-0.9.2/src/Makefile.in
-===================================================================
---- meterbridge-0.9.2.orig/src/Makefile.in
-+++ meterbridge-0.9.2/src/Makefile.in
-@@ -89,7 +89,7 @@ bin_PROGRAMS = meterbridge
- EXTRA_DIST = *.h
-
- 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
--meterbridge_LDFLAGS = -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
-+meterbridge_LDFLAGS =
- subdir = src
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = config.h
-@@ -102,7 +102,7 @@ am_meterbridge_OBJECTS = main.$(OBJEXT)
- jf_meters.$(OBJEXT) scope.$(OBJEXT) envelopes.$(OBJEXT) \
- find_image.$(OBJEXT)
- meterbridge_OBJECTS = $(am_meterbridge_OBJECTS)
--meterbridge_LDADD = $(LDADD)
-+meterbridge_LDADD = $(LDADD) -lm $(JACK_LIBS) $(SDL_LIBS) -lSDL_image
- meterbridge_DEPENDENCIES =
-
- DEFS = @DEFS@
diff --git a/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch b/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch
new file mode 100644
index 000000000000..fbd90b7b7aa0
--- /dev/null
+++ b/media-sound/meterbridge/files/meterbridge-0.9.2-cflags.patch
@@ -0,0 +1,11 @@
+Index: meterbridge-0.9.2/src/Makefile.am
+===================================================================
+--- meterbridge-0.9.2.orig/src/Makefile.am
++++ meterbridge-0.9.2/src/Makefile.am
+@@ -1,5 +1,5 @@
+ #CFLAGS = -O6 `sdl-config --cflags` -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+-CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
++AM_CFLAGS = -Wall -g $(SDL_CFLAGS) $(JACK_CFLAGS) -DPKG_DATA_DIR=\"$(pkgdatadir)\"
+
+ bin_PROGRAMS = meterbridge
+