Merge branch 'org.openembedded.dev' of ssh+git://git@git.openembedded.net/openembedded into org.openembedded.dev

6 files changed, 88 insertions, 22 deletions

diff --git a/recipes/openttd/files/openttd.cfg b/recipes/openttd/files/openttd.cfg
new file mode 100644
index 0000000000..614ce1e539
--- /dev/null
+++ b/recipes/openttd/files/openttd.cfg
@@ -0,0 +1,4 @@
+[misc]
+resolution = 480,640
+[gui]
+left_mouse_btn_scrolling = true
\ No newline at end of file
diff --git a/recipes/openttd/openttd-gfx_0.1.1.bb b/recipes/openttd/openttd-gfx_0.1.1.bb
new file mode 100644
index 0000000000..f791a8835e
--- /dev/null
+++ b/recipes/openttd/openttd-gfx_0.1.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Grafik files for openttd"
+HOMEPAGE = "http://bundles.openttdcoop.org/opengfx/"
+LICENSE = "GPLv2"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://bundles.openttdcoop.org/download.php?file=opengfx%2Freleases%2Fopengfx-${PV}.zip"
+
+do_install() {
+	mv ${WORKDIR}/docs/license.txt ${WORKDIR}/gfx_license.txt
+	install -d ${D}${datadir}/games/openttd/data/
+	install -m 0644 ${WORKDIR}/opengfx-${PV}.tar ${D}${datadir}/games/openttd/data/
+	install -m 0644 ${WORKDIR}/gfx_license.txt ${D}${datadir}/games/openttd/data/
+}
+
+FILES_${PN} = "${datadir}"
diff --git a/recipes/openttd/openttd-sfx_0.1.0.bb b/recipes/openttd/openttd-sfx_0.1.0.bb
new file mode 100644
index 0000000000..05dd021372
--- /dev/null
+++ b/recipes/openttd/openttd-sfx_0.1.0.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Sound files for openttd"
+HOMEPAGE = "http://bundles.openttdcoop.org/opensfx/"
+LICENSE = "CC Sampling Plus 1.0"
+
+PACKAGE_ARCH = "all"
+
+SRC_URI = "http://bundles.openttdcoop.org/download.php?file=opensfx%2Freleases%2Fopensfx-${PV}.zip"
+
+do_install() {
+	mv ${WORKDIR}/license.txt ${WORKDIR}/sfx_license.txt
+	install -d ${D}${datadir}/games/openttd/data/
+	install -m 0644 ${WORKDIR}/opensfx-${PV}.tar ${D}${datadir}/games/openttd/data/
+	install -m 0644 ${WORKDIR}/sfx_license.txt ${D}${datadir}/games/openttd/data/
+}
+
+FILES_${PN} = "${datadir}"
diff --git a/recipes/openttd/openttd_0.7.4-RC1.bb b/recipes/openttd/openttd_0.7.4-RC1.bb
new file mode 100644
index 0000000000..bbb570352b
--- /dev/null
+++ b/recipes/openttd/openttd_0.7.4-RC1.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "Open source clone of the Microprose game 'Transport Tycoon Deluxe' - SDL edition."
+HOMEPAGE = "http://www.openttd.org"
+LICENSE = "GPLv2"
+DEPENDS = "libsdl-net libpng zlib freetype fontconfig"
+RRECOMMENDS = "openttd-gfx openttd-sfx"
+
+inherit siteinfo sdl
+
+SRC_URI ="http://binaries.openttd.org/releases/${PV}/${P}-source.tar.bz2 "
+SRC_URI_append_shr = " file://openttd.cfg"
+
+APPIMAGE = "media/openttd.128.png"
+
+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. 
+
+  ${S}/configure \
+	--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=${STAGING_LIBDIR} \
+	--with-png \
+	--with-freetype \
+	--without-icu \
+	--without-allegro \
+	--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
+}
+
+do_install_append_shr() {
+	install -d ${D}${datadir}/games/openttd/
+	install -m 0644 ${WORKDIR}/openttd.cfg ${D}${datadir}/games/openttd/
+}
+
+FILES_${PN} += "${datadir}"
diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb
index 3a29eebc99..8631efce19 100644
--- a/recipes/shr/phonefsod_git.bb
+++ b/recipes/shr/phonefsod_git.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs"
 PV = "0.0.0+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/phonefsod.git;protocol=http;branch=master"
 S = "${WORKDIR}/git"
@@ -19,13 +19,4 @@ EXTRA_OECONF = "\
 "
 
 
-do_install_append() {
-	install -d ${D}${sysconfdir}/init.d/
-        install -d ${D}${sysconfdir}/dbus-1/system.d/
-	install -m 0755 ${S}/data/phonefsod.init ${D}${sysconfdir}/init.d/phonefsod
-        install -m 0644 ${S}/data/phonefsod.conf ${D}${sysconfdir}/dbus-1/system.d/
-	install -m 0644 ${S}/data/etc-phonefsod.conf ${D}${sysconfdir}/phonefsod.conf
-}
-
-FILES_${PN} += "${datadir} ${sysconfdir}"
 
diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb
index 01b2258b3c..32ad61d765 100644
--- a/recipes/shr/phoneuid_git.bb
+++ b/recipes/shr/phoneuid_git.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 SECTION = "x11/applications"
 DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs"
 PV = "0.0.0+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "git://git.shr-project.org/repo/phoneuid.git;protocol=http;branch=master"
 S = "${WORKDIR}/git"
@@ -16,15 +16,5 @@ EXTRA_OECONF = "\
 "
 
 
-do_install_append() {
-        install -d ${D}${sysconfdir}/dbus-1/system.d/
-	install -d ${D}${datadir}/dbus-1/system-services/
-	install -d ${D}${sysconfdir}/X11/Xsession.d/
-        install -m 0644 ${S}/data/phoneuid.conf ${D}${sysconfdir}/dbus-1/system.d/
-	install -m 0644 ${S}/data/phoneuid-*.service ${D}${datadir}/dbus-1/system-services/
-	install -m 0755 ${S}/data/80phoneuid ${D}${sysconfdir}/X11/Xsession.d/
-	install -m 0755 ${S}/data/phoneui-wrapper.sh ${D}${bindir}/phoneui-wrapper.sh
-}
-
-FILES_${PN} += "${datadir} ${sysconfdir}"
+FILES_${PN} += "${datadir}"