diff options
author | 2015-05-13 16:33:18 +0000 | |
---|---|---|
committer | 2015-05-13 16:33:18 +0000 | |
commit | 5a963e2079bd40b52001f678c1098bd9bca68cdb (patch) | |
tree | 91fc8cd61e23bd991a57ae4192805e637fd845ff /games-simulation | |
parent | old (diff) | |
download | historical-5a963e2079bd40b52001f678c1098bd9bca68cdb.tar.gz historical-5a963e2079bd40b52001f678c1098bd9bca68cdb.tar.bz2 historical-5a963e2079bd40b52001f678c1098bd9bca68cdb.zip |
old
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Diffstat (limited to 'games-simulation')
-rw-r--r-- | games-simulation/openttd/ChangeLog | 7 | ||||
-rw-r--r-- | games-simulation/openttd/Manifest | 26 | ||||
-rw-r--r-- | games-simulation/openttd/files/openttd-1.4.4-cflags.patch | 42 | ||||
-rw-r--r-- | games-simulation/openttd/files/openttd-1.4.4-freetype.patch | 31 | ||||
-rw-r--r-- | games-simulation/openttd/openttd-1.4.4.ebuild | 179 |
5 files changed, 7 insertions, 278 deletions
diff --git a/games-simulation/openttd/ChangeLog b/games-simulation/openttd/ChangeLog index c7e2fd2bfe2b..9b002f1d014b 100644 --- a/games-simulation/openttd/ChangeLog +++ b/games-simulation/openttd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-simulation/openttd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.159 2015/05/13 09:29:20 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.160 2015/05/13 16:33:13 mr_bones_ Exp $ + + 13 May 2015; Michael Sterrett <mr_bones_@gentoo.org> + -files/openttd-1.4.4-cflags.patch, -files/openttd-1.4.4-freetype.patch, + -openttd-1.4.4.ebuild: + old 13 May 2015; Agostino Sarubbo <ago@gentoo.org> openttd-1.5.0.ebuild: Stable for x86, wrt bug #548882 diff --git a/games-simulation/openttd/Manifest b/games-simulation/openttd/Manifest index a17da411476c..bf0d101ea8da 100644 --- a/games-simulation/openttd/Manifest +++ b/games-simulation/openttd/Manifest @@ -1,30 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX openttd-1.4.4-cflags.patch 1028 SHA256 8a26bfb808fd14f45328255df11e7f3867111fd06570302a43a2807cfc06154e SHA512 e29ef624562c717b37496ca2e8353c1c065f776548878e3863420df5431743a6dc80f952699c3738f3fa1dbe77c9a6bf457a7c21241c723db5b1f7865afa180f WHIRLPOOL f6117b87252bf166c433982cfb7424cb297a633e0f9b74b24b198d028e94158a427dcaac3e0df4944923a08f6c7067a2a36eecd3748c0b7c2e3aa98e4d3e57b3 -AUX openttd-1.4.4-freetype.patch 1714 SHA256 e89f5c7342ebf016131de23a5136e8bfb421058b584eb783d1a8bfb40c552f2d SHA512 afe103674977ec75f824e7ef62910081c500024ae0d6c3734ce91c5cef97cc8421af005f4360dc39e8648a307a4204b2b428860fa72de3be2b6170026beb686e WHIRLPOOL 998f9d00f5d2bce1af3397d341b0a082874687e62542f1d39816a65452d7eb3696e905929357ccd1bd75e9f86aeba24a424f060e90e355f5eef489c200b9e79e AUX openttd-1.5.0-cflags.patch 1028 SHA256 8a26bfb808fd14f45328255df11e7f3867111fd06570302a43a2807cfc06154e SHA512 e29ef624562c717b37496ca2e8353c1c065f776548878e3863420df5431743a6dc80f952699c3738f3fa1dbe77c9a6bf457a7c21241c723db5b1f7865afa180f WHIRLPOOL f6117b87252bf166c433982cfb7424cb297a633e0f9b74b24b198d028e94158a427dcaac3e0df4944923a08f6c7067a2a36eecd3748c0b7c2e3aa98e4d3e57b3 AUX openttd.initd 529 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 SHA512 a1be89727fa76ba2104d934367e69c840735024e9abc8e6a32a67d3553e26ee565a9f1680b56e923a959c01f3209bf267ef8421d077ce2ff131b661d4a88c318 WHIRLPOOL c369d4c82da6a68473d25a636b5d1817e5f6035d85759c484fece1d0bd87d74123fabb64bad74898b87985d5a480d5caccd13eb7fafb15e622380dcde89ca1c1 -DIST openttd-1.4.4-source.tar.gz 9726516 SHA256 e5b6b72e37b796ae8b532cd8c96bd27cb6c6b58ecc0e9a5a17a0a80442b5c36d SHA512 52ff5f52b511c3e222a0231c902b0763611f64d5c003c99e1c50af951688458c5c56bdc002ddd1e3c936ed920f64054e68074994fd273d2f3614a3779bad66e1 WHIRLPOOL dd7ac08a337df4554683f0f9275bb50cca169206b38f7ebfa20b6ec8a62125c8c38d444c78bd6a6230095a65e6e02b477fe8734d8b0e6ee9025008ed8058bbd8 DIST openttd-1.5.0-source.tar.gz 10018865 SHA256 4c357205a63a475001a13e4ade59a73635e2f0c480ad097f4d7f03d2ae290ee0 SHA512 c2459165bd8f957d56d4171361237e6de42221f7b8c02f98503e2225a81fd496f10da9d9c60335edb981f86c4c4ce45fafc9edf43ea38a94b84f67136a17a165 WHIRLPOOL 88a15852d1ae01f7a03ea1bcc929bcdf450265a81462aa5316d2e16e86b79167d04503a83bc231eb411d159b70073c650db6e5604adbf07eccda43a193af3e20 -EBUILD openttd-1.4.4.ebuild 5271 SHA256 cc0be11263d938cd9259e815688a1737be6ce6e5885e43a7372e6b9e40898a49 SHA512 94bbb60e73642210dbc5b3e0c0659d11524436ca86940b9c30aa1070a74fc36f41b701cb28972c9c52b459609d5a582b9370d0babe2bb33b82d238a8d6809e3c WHIRLPOOL e713fab609335299964acfead5e2fda02db215fa645509fa265034dc7688631ae2a9c05e923a6cb6498a369ea71c4081cb8c458e0e3642bcec00593434591a9f EBUILD openttd-1.5.0.ebuild 5208 SHA256 361e90c1d764991e8b353dfc4d40f46d2f6f4699c651f342bc6dc1997a0af957 SHA512 273681e290681e701286679f532647d666387b9b071e43a1f628623ee536329ae032d28c746aff51e2a392dcdc2e70d0f81ef6d6df4f0ae2af4d3d90ba179ed0 WHIRLPOOL 932bea69dd997d5929a55a41e61be93e9aa75889e2c5b1f1f55b9d5b33a91559fd7d6401bf9732d1a7a489ddb25338f056a65f0e1783f2de6695df04956575c2 -MISC ChangeLog 21560 SHA256 d5b3b5f981063b8644201802d38c787170000e6cb2656893d0269404f2976e33 SHA512 26fc4bea2cd8dc5d2309fac7e7673ee0a3235b086ad6dd372b5d9b85112c1648a65fcd91a366d22bd86c79dd43037aca2b787d75d9676e38ca127476aef08eff WHIRLPOOL 64dc4ea631c48acde3e872b3aaafd80e47a4c849a6c2bc62a20eea01b901b535abc9e50c970cbc25df668882369a58cfeea3a955cd14fe0396f8a41d59ace2bd +MISC ChangeLog 21727 SHA256 6b6c6dc3d30edde71ca1ac8170eb30a12244520a28ffad70da43e31261f44b90 SHA512 13e5a75ee2354087f8d83ce99f02e82a4ccffd9da27ddd522ce7546c22242a451c0ae7162cd928e8d168d391b016893f88c8c3edb2ae99162cb52985d282a155 WHIRLPOOL 8a15ea4fa4ea3d3ac6f159cf2a7f2b8d813285821b53e1ee12cbb1a19977591487af1e762d8d47e2ed860afdfdcb25a64cffbafea93a51ef9c76714fca84e4ea MISC metadata.xml 658 SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404 SHA512 30a2ea245738a34e159d1fdf65a4ffede8de14111804c46176613592c4ae63ce1fd9e3fbc36f639f5c7c41214d3f2e6c741e78b424889417bbe0da180e7d0ab1 WHIRLPOOL 51c8f15d834ba7f0be395ca174a9f388cf3dbee218da358a338ee81797fc73a9aebc7d4759a95466d50f8d333e0ff8d58980d1a4c94701e0647d99b16db9963d ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAEBCAAGBQJVUxlwAAoJELp701BxlEWfRSQP/RGxPfYKD857BmHSeDHLV0jI -+rmZtjNo19W2TD2mzPuJ6OdfrnAGcOSjja0BPyfj2wc7KMssRA+NByynLjSe0QUE -TLoRlUfKtn7hTyDvbmia1c3WvxtafRuJelDxkeM1IQoJcVArYsfpW1EZhL9jHr4j -X25D6+1PEwuhjuwDcBQsM1Byua/FZyXPB3xEKTwJR4Lp/1Nq3/P+z/1KnwHceVDU -8hllOUbULQ7m/M2m/KPOX0MO/9vg3ljE0LlqT7RGjg/eaFuLRGmIX5uKeMpY4S7H -L6ClEhEZ2N93fCkFL7uwF5HCYstRbRrbtYTIwj5Nj7HvAaplkgmZWfbGgI0+b90O -WSlHRkTBYCfc5Mmq2z+tZu4CpcDN94A/jU3GCYm6OfytJqWR1UHR6CP6FXFN7no7 -fVrAI6/bqt6uVe9vX0dsV+FeOSfCL5nTki1GFtznWvIHezmOI/ThPaeRJ0/XNDI5 -tKcK+BZWLRjU8fsWq5pmub52g6JEFyH40+JA2rxbKtG8Ne1JSgBsDZrcMkPKsThP -w0jv7QC0oYkI2mgxEGl6ugWw1JkNgv9HZkt/FomNpxyZFEPe4baXYr2+kWu4Ms3Z -+RLArrzQyN17g3tEodWDbC/CuszszTgDYZ8i0olHpJI6ZWZ8XzgfzGhM3iVLg29V -HhIAXPBET1CJwafTiQ74 -=N7yk ------END PGP SIGNATURE----- diff --git a/games-simulation/openttd/files/openttd-1.4.4-cflags.patch b/games-simulation/openttd/files/openttd-1.4.4-cflags.patch deleted file mode 100644 index bb7f768b3798..000000000000 --- a/games-simulation/openttd/files/openttd-1.4.4-cflags.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- openttd-1.4.4/config.lib -+++ openttd-1.4.4/config.lib -@@ -1450,12 +1450,6 @@ - CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS" - LDFLAGS="$LDFLAGS -noixemul" - fi -- -- if [ "$enable_profiling" = "0" ]; then -- # -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) -- CFLAGS="-fomit-frame-pointer $CFLAGS" -- fi -- CFLAGS="-O2 $CFLAGS" - else - OBJS_SUBDIR="debug" - -@@ -1466,14 +1460,6 @@ - CFLAGS="$CFLAGS -G0" - fi - fi -- if [ $enable_debug -ge 2 ]; then -- CFLAGS="$CFLAGS -fno-inline" -- fi -- if [ $enable_debug -ge 3 ]; then -- CFLAGS="$CFLAGS -O0" -- else -- CFLAGS="$CFLAGS -O2" -- fi - fi - - if [ $enable_debug -le 2 ]; then -@@ -1498,11 +1484,6 @@ - CFLAGS="$CFLAGS -fno-expensive-optimizations" - fi - -- if [ "$enable_profiling" != "0" ]; then -- CFLAGS="$CFLAGS -pg" -- LDFLAGS="$LDFLAGS -pg" -- fi -- - if [ "$with_threads" = "0" ]; then - CFLAGS="$CFLAGS -DNO_THREADS" - fi diff --git a/games-simulation/openttd/files/openttd-1.4.4-freetype.patch b/games-simulation/openttd/files/openttd-1.4.4-freetype.patch deleted file mode 100644 index 96f1f6205567..000000000000 --- a/games-simulation/openttd/files/openttd-1.4.4-freetype.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: trunk/src/fontcache.cpp -=================================================================== ---- trunk/src/fontcache.cpp (revision 27020) -+++ trunk/src/fontcache.cpp (revision 27079) -@@ -537,6 +537,6 @@ - - /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ -- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); -- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); -+ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); -+ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); - - /* Limit glyph size to prevent overflows later on. */ -@@ -554,6 +554,6 @@ - /* Draw shadow for medium size */ - if (this->fs == FS_NORMAL && !aa) { -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; -@@ -564,6 +564,6 @@ - } - -- for (int y = 0; y < slot->bitmap.rows; y++) { -- for (int x = 0; x < slot->bitmap.width; x++) { -+ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { -+ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { - if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { - sprite.data[x + y * sprite.width].m = FACE_COLOUR; diff --git a/games-simulation/openttd/openttd-1.4.4.ebuild b/games-simulation/openttd/openttd-1.4.4.ebuild deleted file mode 100644 index e6c25caa4581..000000000000 --- a/games-simulation/openttd/openttd-1.4.4.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/openttd-1.4.4.ebuild,v 1.6 2015/02/25 15:52:24 ago Exp $ - -EAPI=5 -inherit eutils gnome2-utils games - -DESCRIPTION="OpenTTD is a clone of Transport Tycoon Deluxe" -HOMEPAGE="http://www.openttd.org/" -SRC_URI="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="aplaymidi debug dedicated iconv icu lzo +openmedia +png cpu_flags_x86_sse +timidity +truetype zlib" -RESTRICT="test" # needs a graphics set in order to test - -RDEPEND="!dedicated? ( - media-libs/libsdl[sound,X,video] - icu? ( dev-libs/icu:= ) - truetype? ( - media-libs/fontconfig - media-libs/freetype:2 - sys-libs/zlib - ) - ) - lzo? ( dev-libs/lzo:2 ) - iconv? ( virtual/libiconv ) - png? ( media-libs/libpng:0 ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" -PDEPEND=" - !dedicated? ( - openmedia? ( - games-misc/openmsx - games-misc/opensfx - ) - aplaymidi? ( media-sound/alsa-utils ) - !aplaymidi? ( timidity? ( media-sound/timidity++ ) ) - ) - openmedia? ( >=games-misc/opengfx-0.4.7 )" - -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-cflags.patch \ - "${FILESDIR}"/${P}-freetype.patch - sed -i \ - -e '/Keywords/s/$/;/' \ - media/openttd.desktop.in || die -} - -src_configure() { - # there is an allegro interface available as well as sdl, but - # the configure for it looks broken so the sdl interface is - # always built instead. - local myopts=" --without-allegro" - - # libtimidity not needed except for some embedded platform - # nevertheless, it will be automagically linked if it is - # installed. Hence, we disable it. - myopts+=" --without-libtimidity" - - use debug && myopts+=" --enable-debug=3" - - if use dedicated ; then - myopts+=" --enable-dedicated" - else - use aplaymidi && myopts+=" --with-midi='/usr/bin/aplaymidi'" - myopts+=" - $(use_with truetype freetype) - $(use_with icu) - --with-sdl" - fi - if use png || { use !dedicated && use truetype; } || use zlib ; then - myopts+=" --with-zlib" - else - myopts+=" --without-zlib" - fi - - # configure is a hand-written bash-script, so econf will not work. - # It's all built as C++, upstream uses CFLAGS internally. - CFLAGS="" ./configure \ - --disable-strip \ - --prefix-dir="${EPREFIX}" \ - --binary-dir="${GAMES_BINDIR}" \ - --data-dir="${GAMES_DATADIR}/${PN}" \ - --install-dir="${D}" \ - --icon-dir=/usr/share/pixmaps \ - --menu-dir=/usr/share/applications \ - --icon-theme-dir=/usr/share/icons/hicolor \ - --man-dir=/usr/share/man/man6 \ - --doc-dir=/usr/share/doc/${PF} \ - --menu-group="Game;Simulation;" \ - ${myopts} \ - $(use_with iconv) \ - $(use_with png) \ - $(use_with cpu_flags_x86_sse sse) \ - $(use_with lzo liblzo2) \ - || die -} - -src_compile() { - emake VERBOSE=1 -} - -src_install() { - emake DESTDIR="${D}" install - if use dedicated ; then - newinitd "${FILESDIR}"/${PN}.initd ${PN} - rm -rf "${ED}"/usr/share/{applications,icons,pixmaps} - fi - rm -f "${ED}"/usr/share/doc/${PF}/COPYING - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - games_pkg_postinst - - if ! use lzo ; then - elog "OpenTTD was built without 'lzo' in USE. While 'lzo' is not" - elog "required, disabling it does mean that loading old savegames" - elog "or scenarios from ancient versions (~0.2) will fail." - elog - fi - - if use dedicated ; then - ewarn "Warning: The init script will kill all running openttd" - ewarn "processes when triggered, including any running client sessions!" - else - if use aplaymidi ; then - elog "You have emerged with 'aplaymidi' for playing MIDI." - elog "This option is for those with a hardware midi device," - elog "or who have set up ALSA to handle midi ports." - elog "You must set the environment variable ALSA_OUTPUT_PORTS." - elog "Available ports can be listed by using 'aplaymidi -l'." - else - if ! use timidity ; then - elog "OpenTTD was built with neither 'aplaymidi' nor 'timidity'" - elog "in USE. Music may or may not work in-game. If you happen" - elog "to have timidity++ installed, music will work so long" - elog "as it remains installed, but OpenTTD will not depend on it." - fi - fi - if ! use openmedia ; then - elog - elog "OpenTTD was compiled without the 'openmedia' USE flag." - elog - elog "In order to play, you must at least install:" - elog "games-misc/opengfx, and games-misc/opensfx, or copy the " - elog "following 6 files from a version of Transport Tycoon Deluxe" - elog "(windows or DOS) to ~/.openttd/data/ or" - elog "${GAMES_DATADIR}/${PN}/data/." - elog - elog "From the WINDOWS version you need: " - elog "sample.cat trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf" - elog "OR from the DOS version you need: " - elog "SAMPLE.CAT TRG1.GRF TRGC.GRF TRGH.GRF TRGI.GRF TRGT.GRF" - elog - elog "File names are case sensitive, but should work either with" - elog "all upper or all lower case names" - elog - elog "In addition, in-game music will be unavailable: for music," - elog "install games-misc/openmsx, or use the in-game download" - elog "functionality to get a music set" - elog - fi - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} |