diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-06-07 18:58:42 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-06-07 18:58:42 +0000 |
| commit | 8f7620366cccbc35e44b5b74c7f62b5709467cdd (patch) | |
| tree | b94f8832bdc99b111e234d825d79667575dcb640 /media-video | |
| parent | RESTRICT=test because the test suite fails if the application is currently ru... (diff) | |
| download | gentoo-2-8f7620366cccbc35e44b5b74c7f62b5709467cdd.tar.gz gentoo-2-8f7620366cccbc35e44b5b74c7f62b5709467cdd.tar.bz2 gentoo-2-8f7620366cccbc35e44b5b74c7f62b5709467cdd.zip | |
Fix building with asneeded wrt #273018, thanks to Sander Sweers and Kevin DeKorte.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/gnome-mplayer/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch | 37 | ||||
| -rw-r--r-- | media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild | 9 |
3 files changed, 50 insertions, 3 deletions
diff --git a/media-video/gnome-mplayer/ChangeLog b/media-video/gnome-mplayer/ChangeLog index 91e0dfdb0d9f..3c922c0b50e2 100644 --- a/media-video/gnome-mplayer/ChangeLog +++ b/media-video/gnome-mplayer/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/gnome-mplayer # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.21 2009/06/07 17:18:33 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/ChangeLog,v 1.22 2009/06/07 18:58:42 ssuominen Exp $ + + 07 Jun 2009; Samuli Suominen <ssuominen@gentoo.org> + gnome-mplayer-0.9.6.ebuild, +files/gnome-mplayer-0.9.6-asneeded.patch: + Fix building with asneeded wrt #273018, thanks to Sander Sweers and Kevin + DeKorte. 07 Jun 2009; Tobias Klausmann <klausman@gentoo.org> gnome-mplayer-0.9.5-r2.ebuild: diff --git a/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch b/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch new file mode 100644 index 000000000000..34b7ac2e9aec --- /dev/null +++ b/media-video/gnome-mplayer/files/gnome-mplayer-0.9.6-asneeded.patch @@ -0,0 +1,37 @@ +diff -aurN gnome-mplayer-0.9.6.orig/src/Makefile.am gnome-mplayer-0.9.6/src/Makefile.am +--- gnome-mplayer-0.9.6.orig/src/Makefile.am 2009-06-07 10:34:12.000000000 +0200 ++++ gnome-mplayer-0.9.6/src/Makefile.am 2009-06-07 10:39:18.000000000 +0200 +@@ -59,11 +59,19 @@ + langlist.h + + +-gnome_mplayer_LDFLAGS = ++gnome_mplayer_LDFLAGS = + +-gnome_mplayer_LDADD = $(GTK_LIBS) $(GIO_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) $(ALSA_LIBS) $(NOTIFY_LIBS) $(GPOD_LIBS) $(MUSICBRAINZ_LIBS) \ +- libgmtk/libgmtk.la \ +- libgmlib/libgmlib.la ++gnome_mplayer_LDADD = \ ++ libgmtk/libgmtk.la \ ++ libgmlib/libgmlib.la \ ++ $(GTK_LIBS) \ ++ $(GIO_LIBS) \ ++ $(DBUS_LIBS) \ ++ $(GCONF_LIBS) \ ++ $(ALSA_LIBS) \ ++ $(NOTIFY_LIBS) \ ++ $(GPOD_LIBS) \ ++ $(MUSICBRAINZ_LIBS) + + if HAVE_NAUTILUS + +@@ -78,7 +86,8 @@ + libgnome_mplayer_properties_page_la_CFLAGS = \ + $(NAUTILUS_CFLAGS) \ + $(AM_CFLAGS) +- ++ ++libgnome_mplayer_properties_page_la_LDFLAGS = -module -avoid-version + + endif #HAVE_NAUTILUS + diff --git a/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild b/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild index d07d7d710701..3ae1d1239da8 100644 --- a/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild +++ b/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild,v 1.1 2009/06/07 09:20:29 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/gnome-mplayer/gnome-mplayer-0.9.6.ebuild,v 1.2 2009/06/07 18:58:42 ssuominen Exp $ EAPI=2 GCONF_DEBUG=no -inherit gnome2 +inherit autotools eutils gnome2 DESCRIPTION="MPlayer GUI for GNOME Desktop Environment" HOMEPAGE="http://code.google.com/p/gnome-mplayer" @@ -45,6 +45,11 @@ pkg_setup() { $(use_with musicbrainz libmusicbrainz3)" } +src_prepare() { + epatch "${FILESDIR}"/${P}-asneeded.patch + eautoreconf +} + src_install() { gnome2_src_install # remove duplicate doc dir |