mr_bones_ 14/07/24 18:39:36 Modified: scummvm-1.7.0.ebuild ChangeLog Log: add back the fluidsynth workaround (bug #518004) (Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path 1.2 games-engines/scummvm/scummvm-1.7.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/scummvm-1.7.0.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/scummvm-1.7.0.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/scummvm-1.7.0.ebuild?r1=1.1&r2=1.2 Index: scummvm-1.7.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.7.0.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scummvm-1.7.0.ebuild 23 Jul 2014 06:00:08 -0000 1.1 +++ scummvm-1.7.0.ebuild 24 Jul 2014 18:39:36 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.7.0.ebuild,v 1.1 2014/07/23 06:00:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/scummvm-1.7.0.ebuild,v 1.2 2014/07/24 18:39:36 mr_bones_ Exp $ EAPI=5 inherit eutils flag-o-matic gnome2-utils toolchain-funcs games @@ -47,6 +47,11 @@ } src_configure() { + local myconf + + # bug #137547 + use fluidsynth || myconf="${myconf} --disable-fluidsynth" + use x86 && append-ldflags -Wl,-z,noexecstack # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF @@ -70,10 +75,10 @@ $(use_enable flac) \ $(use_enable opengl) \ $(use_enable vorbis) \ - $(use_enable fluidsynth) \ $(use_enable theora theoradec) \ $(use_enable truetype freetype2) \ - $(use_enable x86 nasm) || die + $(use_enable x86 nasm) \ + ${myconf} || die } src_compile() { 1.132 games-engines/scummvm/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?rev=1.132&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?rev=1.132&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-engines/scummvm/ChangeLog?r1=1.131&r2=1.132 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- ChangeLog 23 Jul 2014 06:00:08 -0000 1.131 +++ ChangeLog 24 Jul 2014 18:39:36 -0000 1.132 @@ -1,6 +1,9 @@ # ChangeLog for games-engines/scummvm # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.131 2014/07/23 06:00:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-engines/scummvm/ChangeLog,v 1.132 2014/07/24 18:39:36 mr_bones_ Exp $ + + 24 Jul 2014; Michael Sterrett <mr_bon...@gentoo.org> scummvm-1.7.0.ebuild: + add back the fluidsynth workaround (bug #518004) *scummvm-1.7.0 (23 Jul 2014)
