diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2014-07-24 18:39:41 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2014-07-24 18:39:41 +0000 |
| commit | 8c31d57cbed22108199b0c4790d16d41fb45f9f7 (patch) | |
| tree | 26ba5a758febbda1cdaa24cab09d179092ff1615 /games-engines/scummvm | |
| parent | Use virtual/libgudev instead of virtual/udev. (diff) | |
| download | historical-8c31d57cbed22108199b0c4790d16d41fb45f9f7.tar.gz historical-8c31d57cbed22108199b0c4790d16d41fb45f9f7.tar.bz2 historical-8c31d57cbed22108199b0c4790d16d41fb45f9f7.zip | |
add back the fluidsynth workaround (bug #518004)
Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Diffstat (limited to 'games-engines/scummvm')
| -rw-r--r-- | games-engines/scummvm/ChangeLog | 5 | ||||
| -rw-r--r-- | games-engines/scummvm/Manifest | 4 | ||||
| -rw-r--r-- | games-engines/scummvm/scummvm-1.7.0.ebuild | 11 |
3 files changed, 14 insertions, 6 deletions
diff --git a/games-engines/scummvm/ChangeLog b/games-engines/scummvm/ChangeLog index f7c9730e94e8..1bc8a5eb5f68 100644 --- a/games-engines/scummvm/ChangeLog +++ b/games-engines/scummvm/ChangeLog @@ -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_bones_@gentoo.org> scummvm-1.7.0.ebuild: + add back the fluidsynth workaround (bug #518004) *scummvm-1.7.0 (23 Jul 2014) diff --git a/games-engines/scummvm/Manifest b/games-engines/scummvm/Manifest index 65a3c1340026..b27d4a67bfd1 100644 --- a/games-engines/scummvm/Manifest +++ b/games-engines/scummvm/Manifest @@ -4,6 +4,6 @@ DIST scummvm-1.6.0.tar.bz2 18516277 SHA256 396060da6a8f391438055c292a280048d29dc DIST scummvm-1.7.0.tar.bz2 20018016 SHA256 d9ff0e8cf911afa466d5456d28fef692a17d47ddecfd428bf2fef591237c2e66 SHA512 0133feb2df58461fb0e42b1e84cfb309bd964dad239f7ca0c7529edd4f4716895a45491e31597ec6f6d17361b0ce8f73c317399db07a1249b2ab570e4829000e WHIRLPOOL 077eb74cf46dfb15eaa2d473b627d953bc8e13bd0ae87a4fdc16282e468cf237bd9173b761cc9f89b9d6a13ce76db40aa67d5092e2e77eba2a0c6dab097b0fb4 EBUILD scummvm-1.5.0.ebuild 2258 SHA256 4fc338b90bd81f5b1b62c9ef2449432ac2e085fb74e1fdf42919ea67d845c151 SHA512 e19b4812b725eee255835f991541b25c968db0e1c49f8c3167cb01d334189991ce3eee82319a810a0f5e2af7cae3a5dc3fc20c0afc6686b13c09c51f65b42bc0 WHIRLPOOL 8b83419c8365310b8700224c158e9b06c4ce6b430ad222168e2c5578b0bcae5960b11c3286905b327a3be15b15b9041ac8ade2556b7564874600ebe3d498f4a4 EBUILD scummvm-1.6.0.ebuild 2502 SHA256 df73be7beaa3203a41f6ee478ca6fd3b29842b2b282b6209f9aa6e76428c3b78 SHA512 a13f31dfcd8d8b8e2e2038a482dd37f1cd414e33d010cb15f852983e0cc5112629206110f77e6e49a2c66ca6700f16652e0066ff310efc460cdb7d0fbb226edd WHIRLPOOL f7489449066f4361dfbf029ea465995bb0245de6bd96dbe4c9cd44dd5935038ed6b6f76e4bc1ac717305eb1813873bda85e1982a997e5138c0a72b4989e03a51 -EBUILD scummvm-1.7.0.ebuild 2672 SHA256 88d7ae335f954d1a81f95ea5795ebcc6229f82d287d7295ca1665167d06b68fc SHA512 18f341773da13a18984c5699a01724aa1fc7f1f4aab0e38f992fc7cda609f070e2d965f064ecbf067e08e1785a0f6175c51fcac174c5e1b3b12acedaf0189c13 WHIRLPOOL 1a77e65f120c995a4cba3161942386af2784c08ca4749f997c8dbdc500d8eb53b1112decff7d9336563d764520ee5d96ab6332dee2166c07919c8b6c3b619285 -MISC ChangeLog 18590 SHA256 d74dcae5d549c38112cc5143087c9808903877f3abb288d479860e4ec40a719b SHA512 d8e6a2689e5969ca63158539bc785e059f9553d4d9da1b760056b9c68adb5ddc20ae0a31d647b2e6051272c7470f3ea74b421d42f9bb0334d7b925b94959fc4b WHIRLPOOL 5a442cee73aa14a9d6a70c1eb47c527ac06e8f11f86ae42e051e786129aa86b86e0bcec81d1587b0fd804cfa70d303efce634e5da2598291067f10adc2a8c603 +EBUILD scummvm-1.7.0.ebuild 2747 SHA256 5294e6471bee953ce61810caa68cbea2aacf2ad080899c9ef702a9403cd6410e SHA512 a57862f31ebb7f7fb1071a9e045bf6d91c36825bd083fcfe6428c5f402feef6489328c545a6a01bfc323d56d5d035aa349eeb20b29f5e19e23bd1c013ad484da WHIRLPOOL 41be122741f9cf48e686b492c38f0607c6f68fae9231f1f572517addb24ea95eea774aaf67a390818ad02f67e8f7854b236fdaa041ea63b24f84fec37466ec08 +MISC ChangeLog 18719 SHA256 cd861c10cb4a4a034695c679ccd6307e9a5f023bdc83b554bfd1dd8fd75881b9 SHA512 cb09c3e46e8ecef5a05ecc4a0bef712749c6e7d4ac28cfe93a0eb3ce79ba86f5c5f4fe43a71028d0cab93abb03c0ccc4a5d8705453667e94a6db54232057cfd4 WHIRLPOOL 8a00b6824b144790e00042d66c04628b36691d4c24f65fbc64e3f11d8960871aaa9f0d65b61d29f7e8847cbace2112698715437c479f04902f366d409af4bcc7 MISC metadata.xml 311 SHA256 ba7555854c859720c5582c00c3b4b58059e839d2abfcd32c2d1a25015b39be47 SHA512 b208bb3e4fc8a84dac59a9878b01757c6f5e7eeaa22a517f07f99b3fa85f10985443fa30d206f2b7a00093d99330a91a3db3f6386df1b4dd8e537b807dafa12b WHIRLPOOL 947cd7ac8057e1524c5aa41429d19edebf6e3b30a31e6326b52aa5237fc79bffe7c620480866940e1a734485d7bee8570e4a4ec5f7b147fc8ceb8b7e9720e496 diff --git a/games-engines/scummvm/scummvm-1.7.0.ebuild b/games-engines/scummvm/scummvm-1.7.0.ebuild index e3f480f53614..097e6287c519 100644 --- a/games-engines/scummvm/scummvm-1.7.0.ebuild +++ b/games-engines/scummvm/scummvm-1.7.0.ebuild @@ -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_prepare() { } 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 @@ src_configure() { $(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() { |