[oe-commits] org.oe.dev openttd: Various changes.

[thebohemian commit]

openttd: Various changes.
  - added include recipe
  - added recipe for new version 0.6.0-beta4
  - fixed dependencies

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: a4fd1ebbad86c9ca9625a5140b86bf868fdef17e
ViewMTN: http://monotone.openembedded.org/revision/info/a4fd1ebbad86c9ca9625a5140b86bf868fdef17e
Files:
1
packages/openttd/files
packages/openttd/files/openttd_0.6.0-buildfix.patch
packages/openttd/openttd.inc
packages/openttd/openttd_0.6.0-beta4.bb
packages/openttd/openttd_0.4.0.1.bb
Diffs:

#
# mt diff -raec70d1304a0092ef08896c92ac2be71b47eeff5 -ra4fd1ebbad86c9ca9625a5140b86bf868fdef17e
#
# 
# 
# add_dir "packages/openttd/files"
# 
# add_file "packages/openttd/files/openttd_0.6.0-buildfix.patch"
#  content [0aab1299c92446c97b56c929336c82ccd344ca58]
# 
# add_file "packages/openttd/openttd.inc"
#  content [3a37f4f512dcec53c8f626222d9ce925704e157a]
# 
# add_file "packages/openttd/openttd_0.6.0-beta4.bb"
#  content [9f2f06623392c97741dbe3c66bc3950b4462ecd0]
# 
# patch "packages/openttd/openttd_0.4.0.1.bb"
#  from [612f94f932c5fea18c579f5c5833608d2374ba6b]
#    to [c28e73e755ddabce852c842d50289fe70a67dd04]
# 
============================================================
--- packages/openttd/files/openttd_0.6.0-buildfix.patch	0aab1299c92446c97b56c929336c82ccd344ca58
+++ packages/openttd/files/openttd_0.6.0-buildfix.patch	0aab1299c92446c97b56c929336c82ccd344ca58
@@ -0,0 +1,25 @@
+Index: openttd-0.6.0-beta4/config.lib
+===================================================================
+--- openttd-0.6.0-beta4.orig/config.lib	2008-02-20 20:24:58.000000000 +0100
++++ openttd-0.6.0-beta4/config.lib	2008-02-20 20:26:55.000000000 +0100
+@@ -1255,7 +1255,7 @@
+ 		if [ -z "$6" ]; then
+ 			compiler="$3"
+ 		else
+-			compiler="$3-$6"
++			compiler="$4"
+ 		fi
+ 		machine=`eval $compiler $9 2>/dev/null`
+ 		ret=$?
+@@ -1271,11 +1271,6 @@
+ 			exit 1
+ 		fi
+ 
+-		if [ "$machine" != "$3" ] && ( [ "$8" = "0" ] || [ "$8" = "1" ] ); then
+-			log 1 "checking $1... expected $3, found $machine"
+-			log 1 "the compiler suggests it doesn't build code for the machine you specified"
+-			exit 1
+-		fi
+ 	elif [ -n "$4" ]; then
+ 		# Check for manual compiler
+ 		machine=`$4 $9 2>/dev/null`
============================================================
--- packages/openttd/openttd.inc	3a37f4f512dcec53c8f626222d9ce925704e157a
+++ packages/openttd/openttd.inc	3a37f4f512dcec53c8f626222d9ce925704e157a
@@ -0,0 +1,46 @@
+# Note: OpenTTD's build system changed considerably in 0.6.x
+# This include file is written towards the newer versions.
+
+DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
+HOMEPAGE = "http://openttd.sf.net"
+LICENSE = "GPLv2"
+
+DEPENDS = "libsdl-net libpng zlib freetype fontconfig"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.bz2"
+
+APPIMAGE = "media/openttd.48.png"
+
+inherit siteinfo sdl
+
+do_configure() {
+	# The way the OTTD configure system handles the application's directories
+  # isn't the way autotools does it. Mainly prefix is always prepended even if
+  # absolute binary-dir and data-dir is given. Sigh ...
+
+	# Disabling MIDI feature for now.
+  ./configure \
+    --build=${BUILD_SYS} \
+    --host=${TARGET_SYS} \
+    --windres=${MACHINE_DISPLAY_WIDTH_PIXELS}x${MACHINE_DISPLAY_HEIGHT_PIXELS} \
+    --os=UNIX \
+    --endian=${SITEINFO_ENDIANESS} \
+    --prefix-dir=${prefix} \
+    --binary-dir=bin \
+    --with-midi=/bin/true \
+    --with-zlib \
+    --with-png \
+    --with-freetype \
+    --cc-build=gcc \
+    --cc-host=${TARGET_SYS}-gcc \
+    --cxx-build=g++ \
+    --cxx-host=${TARGET_SYS}-g++ \
+    --strip=${TARGET_SYS}-strip \
+    --install-dir=${D}
+}
+
+do_install() {
+    oe_runmake install
+}
+
+FILES_${PN} += "${datadir}/*"
============================================================
--- packages/openttd/openttd_0.6.0-beta4.bb	9f2f06623392c97741dbe3c66bc3950b4462ecd0
+++ packages/openttd/openttd_0.6.0-beta4.bb	9f2f06623392c97741dbe3c66bc3950b4462ecd0
@@ -0,0 +1,8 @@
+require openttd.inc 
+
+PR = "r0"
+
+SRC_URI += "file://openttd_0.6.0-buildfix.patch;patch=1"
+
+
+
============================================================
--- packages/openttd/openttd_0.4.0.1.bb	612f94f932c5fea18c579f5c5833608d2374ba6b
+++ packages/openttd/openttd_0.4.0.1.bb	c28e73e755ddabce852c842d50289fe70a67dd04
@@ -1,12 +1,7 @@
-DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
-HOMEPAGE = "http://openttd.sf.net"
-LICENSE = "GPLv2"
-PR = "r1"
+require openttd.inc
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/openttd/openttd-${PV}-source.tar.gz"
+PR = "r2"
 
-APPIMAGE = "media/openttd.48.png"
-
 EXTRA_OEMAKE = "WITH_ZLIB=1 \
 		WITH_PNG=1 \
 		WITH_SDL=1 \
@@ -22,7 +17,9 @@ EXTRA_OEMAKE = "WITH_ZLIB=1 \
 		CC_HOST=gcc \
 		CC_TARGET=${TARGET_SYS}-gcc"
 
-inherit sdl
+do_configure() {
+	:
+}
 
 do_install() {
     oe_runmake install DESTDIR="${D}"
@@ -34,4 +31,3 @@ do_install() {
     install -m 0644 ${S}/data/*.grf ${D}${datadir}/games/openttd/data/
 }
 
-FILES_${PN} += "${datadir}/*"