diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2012-11-01 23:36:28 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2012-11-01 23:36:28 +0000 |
| commit | 09ce271b9a6c2b5e3a069d967e7650119fafd347 (patch) | |
| tree | c4acbaa9dc3107bc2ade3d3aeb10e315adf4f107 /games-strategy/hedgewars | |
| parent | stable new version, drop old (diff) | |
| download | historical-09ce271b9a6c2b5e3a069d967e7650119fafd347.tar.gz historical-09ce271b9a6c2b5e3a069d967e7650119fafd347.tar.bz2 historical-09ce271b9a6c2b5e3a069d967e7650119fafd347.zip | |
add parallel-make patch from hasufell
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'games-strategy/hedgewars')
| -rw-r--r-- | games-strategy/hedgewars/ChangeLog | 6 | ||||
| -rw-r--r-- | games-strategy/hedgewars/Manifest | 5 | ||||
| -rw-r--r-- | games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch | 24 | ||||
| -rw-r--r-- | games-strategy/hedgewars/hedgewars-0.9.18.ebuild | 8 |
4 files changed, 37 insertions, 6 deletions
diff --git a/games-strategy/hedgewars/ChangeLog b/games-strategy/hedgewars/ChangeLog index ade465aeeb7c..b5a2ff0ecdbc 100644 --- a/games-strategy/hedgewars/ChangeLog +++ b/games-strategy/hedgewars/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-strategy/hedgewars # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.41 2012/11/01 22:11:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/ChangeLog,v 1.42 2012/11/01 23:36:28 mr_bones_ Exp $ + + 01 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> + +files/hedgewars-0.9.18-cmake.patch, hedgewars-0.9.18.ebuild: + add parallel-make patch from hasufell 01 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> hedgewars-0.9.18.ebuild: add ffmpeg dep diff --git a/games-strategy/hedgewars/Manifest b/games-strategy/hedgewars/Manifest index 02595c0e0a6a..c430d991b096 100644 --- a/games-strategy/hedgewars/Manifest +++ b/games-strategy/hedgewars/Manifest @@ -1,7 +1,8 @@ AUX hedgewars-0.9.18-cflags.patch 757 SHA256 d43ad32b6113211bcbee3820cd2daef39d561d08af181be650fe2d53e1652299 SHA512 c347a855b1166ec21de597bf65c498cf987c06028b5fd91e819ab3e0fc09aa3a3741c9e000000ca4392f18d3ce8bf906ac74888340f1c29aeeeb6a0e74ce8692 WHIRLPOOL dab57f74637b954c5ebd43370ffabc822fc0ef0c1ee0c822b7c9cfb5309f78169a7d02c12d97e6aada038a59e3bc273ae3c85c65a43b608e8fe9af1d9d5367d6 +AUX hedgewars-0.9.18-cmake.patch 862 SHA256 ed912abd0762d64432b5a0a2157fb7cc76781e70a22a5a386b9b5f42f3400ed4 SHA512 85fd9117ac26d8666773f47a7d1ab20ee7b958a98b9de17af00c1a1692fcde8f689a9cbdeb80307569cc8d6a63e63cdbcac57be21b3685a99be54045075ce209 WHIRLPOOL 4da0731ef7fcd204d667e2f0b4f35f3f2e81506699c4e686ffe0c21c1c975b6b5d5f2da8eebbed2ffb747fa760c0d7997b8018773e6f6028634851d8757827e6 DIST hedgewars-src-0.9.17.tar.bz2 138938373 SHA256 6a5b941825d86ca7ee2dc28f25a868268a07db336bec615167358e880125ca0b DIST hedgewars-src-0.9.18-2.tar.bz2 180569179 SHA256 edea66d3d3a99c66fe26fb05b4db5071107a645139cfee944ae91524c5431087 SHA512 3e136237545d8990b5a5d6f2145298a2c816041028c14dab58220c83f0ca8ee061ee7e6606fd8904a03b816c83d3c4576ea6c76faa43259f219bdd3a170e5db0 WHIRLPOOL 9aaa6b73876e18f3d0ead912b3295b1ee8dd903b24d30ef2965363e430ca2ba49c7416e6f38d7dffd108a897c86d213ddec2ff228f550af0d851dcda84791d0a EBUILD hedgewars-0.9.17.ebuild 1539 SHA256 54c7b9999df578e02ee56f271b293e87d974b7b691500d6f0492c832fc3e1b9e SHA512 afe84c553771993e4c2d06cc40b9e6c2866503461b648f3f148f025db8afdda2bd6fd94aad9e2b2243eadb62391262c315bcc6bfa45f94c4f91b9016e3423179 WHIRLPOOL 6db1263b6b5499b65fd0be0986ff48b299d39100e92ad021379ed9875c6394b798ba1370ba7356e99e079057b0101fafe735ca3c44b2a6bc6f998f577e273935 -EBUILD hedgewars-0.9.18.ebuild 1697 SHA256 f1861db72ba1010a024886b0acfe8f81944a7e4d5c902dd2fb2c88f38e9462d0 SHA512 71453048eeeab9e6ee14a23f9be69fa5163198329a7d84cc4092ea74c3697c1182ab7c4b3e4245e5a144b91e5b7526ba9541546b6b5162136ff7b7a2cde47cca WHIRLPOOL a2d880b9a36641086e9d4b8d98dad74005eb471123fa1a2c5caea194c7024e685ee72dc811210f5cb8682e5fbf7ab541c1adc6532f9718f028a5d690db0f2c37 -MISC ChangeLog 5847 SHA256 6526a38673391547c204dc405802ab86041fab32c9b70cfe0005bf4746fee9b0 SHA512 08bdfc68fef44780b70ae4c74af0e6f56e88209d96b3f63de93fd6096a277d4837c092f891d2bff402b7ef1cd729f8ab8307744b82569670919cb0fb6d3d2c66 WHIRLPOOL d9aff811f9297b49e778fec301222c9b887cf9ca436818d12c4b2b8f0c2157e32be53c81d22072139d42f6787be97c935afcd304d5b6d3ab535413ffff3b46a0 +EBUILD hedgewars-0.9.18.ebuild 1732 SHA256 48ef0c773d03299ca0a4cea9ca5bb237e8b22b53433ff61296d691d7eb95ac95 SHA512 a3834d5e48af0d758d0e60f78be58c203381e221cf51b616420777727439a7bd657311b0463dfbbf7eaeaf0c79aa5f0b889d015e21644f83a55a304f318a6deb WHIRLPOOL 9919a263b91113a9c98a560f2b09f52c15b0bc878ba32ab7916078e615677818d630cb2120ac540abae80a18d0c0cddc139e00d738d95cc6884fa6c873ef7f70 +MISC ChangeLog 6007 SHA256 cec7628c2a292ff2d1845a942b98f78a2cddd404e43d02aacd11a62e480311e1 SHA512 6640530ae13e9316c22e88e61961d5b4e1d6eaf828ebc85e49281ee56b11dd2605112f1c39327ab88bba984085a032279324e5e5d50f2d348a9eefc918c7c140 WHIRLPOOL b6ab241d3f7c2bc63d3da44e29434ec78f1fa702da2ea29389c39790a8557f38114694924ab8a2962edf7558f61be2978803a029c8ccada71ff1f8b48c5cb247 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch b/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch new file mode 100644 index 000000000000..61ff7dac2857 --- /dev/null +++ b/games-strategy/hedgewars/files/hedgewars-0.9.18-cmake.patch @@ -0,0 +1,24 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Thu Nov 1 21:52:40 UTC 2012 +Subject: build system + +fix parallel make + +--- hedgewars/CMakeLists.txt ++++ hedgewars/CMakeLists.txt +@@ -193,7 +193,7 @@ + + #this command is a workaround to some inlining issues present in older FreePascal versions and fixed in 2.6 + if(fpc_version LESS "020600") +- add_custom_target(ENGINECLEAN COMMAND ${CMAKE_BUILD_TOOL} "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") ++ add_custom_target(ENGINECLEAN COMMAND $(MAKE) "clean" "${PROJECT_BINARY_DIR}" "${hedgewars_SOURCE_DIR}/hedgewars") + endif() + + +@@ -265,4 +265,6 @@ + add_dependencies(${engine_output_name} ENGINECLEAN) + endif() + ++add_dependencies(${engine_output_name} avwrapper) ++ + install(PROGRAMS "${EXECUTABLE_OUTPUT_PATH}/${engine_output_name}${CMAKE_EXECUTABLE_SUFFIX}" DESTINATION ${target_dir})
\ No newline at end of file diff --git a/games-strategy/hedgewars/hedgewars-0.9.18.ebuild b/games-strategy/hedgewars/hedgewars-0.9.18.ebuild index 89d9a93e8c96..c57d5827bd65 100644 --- a/games-strategy/hedgewars/hedgewars-0.9.18.ebuild +++ b/games-strategy/hedgewars/hedgewars-0.9.18.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.18.ebuild,v 1.2 2012/11/01 22:11:16 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-strategy/hedgewars/hedgewars-0.9.18.ebuild,v 1.3 2012/11/01 23:36:28 mr_bones_ Exp $ EAPI=2 CMAKE_BUILD_TYPE=Release @@ -34,7 +34,9 @@ RDEPEND="${RDEPEND} S=${WORKDIR}/${PN}-src-${PV} src_prepare() { - epatch "${FILESDIR}"/${P}-cflags.patch + epatch \ + "${FILESDIR}"/${P}-cflags.patch \ + "${FILESDIR}"/${P}-cmake.patch } src_configure() { @@ -48,7 +50,7 @@ src_configure() { } src_compile() { - cmake-utils_src_compile -j1 + cmake-utils_src_compile } src_install() { |