diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-06-25 16:37:18 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-06-25 16:37:18 +0000 |
| commit | a7f512cc337d3dc4484cbe79b99fbf50c99f7ee5 (patch) | |
| tree | 4db36bc1af023003183a694dcabf730893af457a /media-sound | |
| parent | amd64 stable, bug #229131 (diff) | |
| download | gentoo-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')
4 files changed, 24 insertions, 26 deletions
diff --git a/media-sound/meterbridge/ChangeLog b/media-sound/meterbridge/ChangeLog index 85d1dc7d30db..374d57128f74 100644 --- a/media-sound/meterbridge/ChangeLog +++ b/media-sound/meterbridge/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/meterbridge # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.19 2008/01/13 14:49:06 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/ChangeLog,v 1.20 2008/06/25 16:37:17 aballier Exp $ + + 25 Jun 2008; Alexis Ballier <aballier@gentoo.org> + files/meterbridge-0.9.2-asneeded.patch, + +files/meterbridge-0.9.2-cflags.patch, meterbridge-0.9.2.ebuild: + only patch Makefile.in and run eautoreconf, bug #226773. use emake instead + of make, dont ignore cflags 13 Jan 2008; Alexis Ballier <aballier@gentoo.org> meterbridge-0.9.2.ebuild: 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 + diff --git a/media-sound/meterbridge/meterbridge-0.9.2.ebuild b/media-sound/meterbridge/meterbridge-0.9.2.ebuild index 9951aeedeb6c..26862f93bc8f 100644 --- a/media-sound/meterbridge/meterbridge-0.9.2.ebuild +++ b/media-sound/meterbridge/meterbridge-0.9.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.14 2008/01/13 14:49:06 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/meterbridge/meterbridge-0.9.2.ebuild,v 1.15 2008/06/25 16:37:17 aballier Exp $ -inherit eutils +inherit eutils autotools IUSE="" @@ -21,11 +21,14 @@ DEPEND="${RDEPEND} src_unpack() { unpack ${A} + cd "${S}" epatch "${FILESDIR}"/${P}-gcc41.patch epatch "${FILESDIR}"/${P}-asneeded.patch + epatch "${FILESDIR}"/${P}-cflags.patch + eautoreconf } src_install() { - make DESTDIR="${D}" install || die + emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog } |