version bump with patch updates from Poly-C on bug #526570
authorMichael Sterrett <mr_bones_@gentoo.org>
Sat, 10 Jan 2015 05:38:24 +0000 (05:38 +0000)
committerMichael Sterrett <mr_bones_@gentoo.org>
Sat, 10 Jan 2015 05:38:24 +0000 (05:38 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64

games-simulation/openttd/ChangeLog
games-simulation/openttd/Manifest
games-simulation/openttd/files/openttd-1.4.4-cflags.patch [new file with mode: 0644]
games-simulation/openttd/files/openttd-1.4.4-freetype.patch [new file with mode: 0644]
games-simulation/openttd/openttd-1.4.4.ebuild [new file with mode: 0644]

index 072e44f1113bf4f2203cedc1fd11ad3c3a90d880..bf0569569453b2cbf2fb887dae1f14c6426b816b 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/openttd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.148 2014/09/04 08:06:53 mr_bones_ Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/openttd/ChangeLog,v 1.149 2015/01/10 05:38:19 mr_bones_ Exp $
+
+*openttd-1.4.4 (10 Jan 2015)
+
+  10 Jan 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:
+  version bump with patch updates from Poly-C on bug #526570
 
 *openttd-1.4.2 (04 Sep 2014)
 
index 0298ee7342bca99face20f67951cd3d66a2a6c2a..0e841a0a15c79dde4f5ed0baebe396f2d758b712 100644 (file)
@@ -1,9 +1,13 @@
 AUX openttd-1.3.3-cflags.patch 1005 SHA256 439c7e79b412ed572bfe95f1546b96481af0a9c629006b03651e929805423b30 SHA512 1beadb5d9728a8e9f2db0c4a38da055a4509720ae5fa14b3ae36927eb497be8ef4667715ee290c7059cc76edee9022382eea093bd01a9db3a4011de3d5ae4021 WHIRLPOOL 36678dbb4cafc840bce32d7bf5a4f44babfee89f3dec439f33895aa0539f51691be7d268d74fb3b2090b34631192fdc9fe615c6ffd551ecb886ccb449b87c3f8
 AUX openttd-1.4.2-cflags.patch 778 SHA256 19711aa76b56d2a58fc8dd26be430887b0fd55194334c61b710d3add03b74e87 SHA512 7e7dedc27b86749450fe923c541a74d0dd1b1840655bc9640f133cc7563d00d905a14a6877658068ac80142774569b6ea90388fdc03809a0159ab280b807f1fa WHIRLPOOL 5b922d5ce8201fc5b892906ae7eabe4adce1f059115ee67f12b14e778fc54db992a38a92a838410a1c4d46d56749307809c50344fd0415fb250ba78213167de4
+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.initd 529 SHA256 a16e5c64a073d0b7e7092bb906b7f064414870a8607bebce16b4b08cff7f4112 SHA512 a1be89727fa76ba2104d934367e69c840735024e9abc8e6a32a67d3553e26ee565a9f1680b56e923a959c01f3209bf267ef8421d077ce2ff131b661d4a88c318 WHIRLPOOL c369d4c82da6a68473d25a636b5d1817e5f6035d85759c484fece1d0bd87d74123fabb64bad74898b87985d5a480d5caccd13eb7fafb15e622380dcde89ca1c1
 DIST openttd-1.3.3-source.tar.gz 9643325 SHA256 a21f9f5321ac70ffd2c0dbbb52021f00d4a55f66951e148e08fdcde4475c2d5c SHA512 d82d1f2b7653082a374c6a87cfef162dbf22032ff7e37fa2ab63c0cb1b570ee1a1bd01eec651459a38f79cc044cfb002c51180ebc7f859c6588746f9c80644a7 WHIRLPOOL 60b5be8eed979f01a490f739b36ae1198c0105c19cfc4ed76e79e8e6dd3d726b0d598a931b877f673244bf5c5a43510035c900821fffa18ed557d628b07b5c92
 DIST openttd-1.4.2-source.tar.gz 10066038 SHA256 3dcdbf6d4368bbbc3caeb1d0f06a26231580ebcdf3ac8abc6923be6043bb5e35 SHA512 9a356b3c1f56589a48cb80fdb0cfb9170d996a8301f3f541bc743a484315f71736ebf8354fc5576c3e02e6d7a724fe90cfb4811aeac0e67462ae02e805c0f9da WHIRLPOOL 7de171aef7d63a4340076f47647d8915969348d126031ebf7ef506161814eb15be69eeb962e58e264439a88012b3b5b30c6c47983633dcbd8c296aba010abb50
+DIST openttd-1.4.4-source.tar.gz 9726516 SHA256 e5b6b72e37b796ae8b532cd8c96bd27cb6c6b58ecc0e9a5a17a0a80442b5c36d SHA512 52ff5f52b511c3e222a0231c902b0763611f64d5c003c99e1c50af951688458c5c56bdc002ddd1e3c936ed920f64054e68074994fd273d2f3614a3779bad66e1 WHIRLPOOL dd7ac08a337df4554683f0f9275bb50cca169206b38f7ebfa20b6ec8a62125c8c38d444c78bd6a6230095a65e6e02b477fe8734d8b0e6ee9025008ed8058bbd8
 EBUILD openttd-1.3.3.ebuild 5151 SHA256 b08c718f94e6cc848c4179e308c36788d68bf84ebfd5dc774889466a147fd9c0 SHA512 6dd63e6c19a4f478b94613792f8258ff49e161b49d7b3bb75d06eeeb4d0799dbb24885cb1e3dcf3a3963baa466f39efc0d69b6fc3da4aa91c5bbcc111d8ca084 WHIRLPOOL 5d839e884f0ae76f90a2cc05753ed38959a2358ca67b9c3ef21186a9aedd94da2b5afe25eac8a81c1d02a4bd81912bb12f843a600d7721bd6d77b2df4175d4ef
 EBUILD openttd-1.4.2.ebuild 5183 SHA256 4cf31be9241664eb2a817cfb5a02f5313d573888b9e21831b84090356040eed9 SHA512 4f39858b47287ef06c780e78b7f6e9e9493df30bfea94433002fe94fac1eb8868b876e61bc06336db549ecce94757d6cc32e5c4bed0e5103cbce24feb60ed0ea WHIRLPOOL d724a78b6f15f5bbfc44a7315dc2b47872e3d6535b2238eca8af48daa563d345326469dbcc83ab0f9dd0d6c7c06689dde582f4df256b360ed0f0d94042a2ef73
-MISC ChangeLog 20155 SHA256 49d23003166eb98c5d18ecfe2be1285007eb3f34b588ec7d26925fb199e0ac90 SHA512 cea56ff8970e3ecbccd763232a8746e49b3951434db28ec4bb2a69db11687f4bd5e51bd5015c259716145092de0fb629cfdb5cb396a4643661a5c40edb6b10f1 WHIRLPOOL 5267a4caeacea21b9bac804b97f11d873c732f631776f302e6614b742b33975e0f13790841eff36459e0d269b8a8300a32190481f454cca7ac2045920e33711a
+EBUILD openttd-1.4.4.ebuild 5225 SHA256 bd4f66ba07c5c358b288d7123685fcb35e86ce4604004e594c3967b7ff12e98f SHA512 a2b604c9b6d39d3f2aa490e3050c864fed4edcf1dcbafc9201ecb5fe6ee67cfc7f8c6b804e952089da2dab4203a114d073e355d80d4caf7ae484c1aa7d7975d3 WHIRLPOOL acd9746b925b55d18beef46894c190e217cf874bfb08d6695b68886f9df1f38e1ad6a8b8af5885319e990cfb5222d0f786621b1ba1f46cbb633af505d14a9a16
+MISC ChangeLog 20401 SHA256 5346680d037edcf62ad309b97d6b9289c019a9549f2d8ca33a34ab7e93f3873f SHA512 5d936a70a5679ed1839fcf3196cc128a58efbfb12f880a4c8724fa0fdfa2f49b65c48ff48217b7c902a24a7386feb17e3f1969278f2814cdc74877aadb343707 WHIRLPOOL dc7bc0c1bbf01bb69cfa7a86986d257dca184e0f71df7cece91208e6105e87eb1d6a8269f0893ebbad01e794f28fee2c11c8f1906553af52c8a963dac03bdb05
 MISC metadata.xml 658 SHA256 d0e2ff0d4bbe57e15d58e5fc68884b70877561f127e8afd7b5ce3e4a46e97404 SHA512 30a2ea245738a34e159d1fdf65a4ffede8de14111804c46176613592c4ae63ce1fd9e3fbc36f639f5c7c41214d3f2e6c741e78b424889417bbe0da180e7d0ab1 WHIRLPOOL 51c8f15d834ba7f0be395ca174a9f388cf3dbee218da358a338ee81797fc73a9aebc7d4759a95466d50f8d333e0ff8d58980d1a4c94701e0647d99b16db9963d
diff --git a/games-simulation/openttd/files/openttd-1.4.4-cflags.patch b/games-simulation/openttd/files/openttd-1.4.4-cflags.patch
new file mode 100644 (file)
index 0000000..bb7f768
--- /dev/null
@@ -0,0 +1,42 @@
+--- 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
new file mode 100644 (file)
index 0000000..96f1f62
--- /dev/null
@@ -0,0 +1,31 @@
+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
new file mode 100644 (file)
index 0000000..b2ba4eb
--- /dev/null
@@ -0,0 +1,178 @@
+# 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.1 2015/01/10 05:38:19 mr_bones_ 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 sse +timidity +truetype zlib"
+RESTRICT="test" # needs a graphics set in order to test
+
+DEPEND="!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 )
+       zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+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 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
+}