Merge pull request #28 from schnitzeltony/master

Some updates

dependencies/libsdl-net/libsdl-net/am_foreign.patch

@@ -1,11 +0,0 @@
-diff -Nurd SDL_net-1.2.8/Makefile.am SDL_net-1.2.8/Makefile.am
---- SDL_net-1.2.8/Makefile.am	2012-01-15 18:20:10.000000000 +0200
-+++ SDL_net-1.2.8/Makefile.am	2014-08-01 21:18:52.720815807 +0300
-@@ -1,5 +1,7 @@
- # Makefile.am for the SDL sample image loading library and viewer
- 
-+AUTOMAKE_OPTIONS = foreign
-+
- lib_LTLIBRARIES = libSDL_net.la
- 
- libSDL_netincludedir = $(includedir)/SDL

dependencies/libsdl-net/libsdl-net/libtool2.patch

@@ -1,21 +0,0 @@
-From f9417c864183a0f6d0e90f66f5254a63b04a041a Mon Sep 17 00:00:00 2001
-From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
-Date: Wed, 17 Oct 2012 20:51:51 +0200
-
----
- configure.in | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.in b/configure.in
-index c42bd0c..71a4825 100644
---- a/configure.in
-+++ b/configure.in
-@@ -44,6 +44,8 @@ AC_CANONICAL_HOST
- dnl Setup for automake
- AM_INIT_AUTOMAKE(SDL_net, $VERSION)
- 
-+dnl got macros
-+AC_CONFIG_MACRO_DIR([acinclude])
- dnl Check for tools
- AC_PROG_LIBTOOL
- AC_PROG_CC

dependencies/libsdl-net/libsdl-net_1.2.8.bb

@@ -1,18 +0,0 @@
-DESCRIPTION = "Simple DirectMedia Layer networking library."
-SECTION = "libs/network"
-PRIORITY = "optional"
-DEPENDS = "virtual/libsdl"
-LICENSE = "Zlib"
-LIC_FILES_CHKSUM = "file://COPYING;md5=9cf3de2d872bf510f88eb20d06d700b5"
-SRC_URI = " \
-  http://www.libsdl.org/projects/SDL_net/release/SDL_net-${PV}.tar.gz \
-  file://libtool2.patch \
-  file://am_foreign.patch \
-"
-
-S = "${WORKDIR}/SDL_net-${PV}"
-
-inherit autotools pkgconfig
-
-SRC_URI[md5sum] = "20e64e61d65662db66c379034f11f718"
-SRC_URI[sha256sum] = "5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4"

recipes-games/supertux/supertux2_0.5.1.bb

@@ -10,6 +10,10 @@ RDEPENDS_${PN} += "boost"
 
 inherit cmake
 
+# With Ninja it fails with:
+# ninja: error: 'squirrel/lib/libsquirrel_static.a', needed by 'supertux2', missing and no known rule to make it
+OECMAKE_GENERATOR = "Unix Makefiles"
+
 SRC_URI = " \
     https://github.com/SuperTux/supertux/releases/download/v${PV}/SuperTux-v${PV}-Source.tar.gz \
     file://0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch \
@@ -17,8 +21,8 @@ SRC_URI = " \
     file://0003-pass-compile-flags-to-external-projects.patch \
     file://0004-do-not-set-included-paths-as-system-causes-trouble-w.patch \
 "
-SRC_URI[md5sum] = "3bb7c1f3f622da79ec9fe1ebc521f286"
-SRC_URI[sha256sum] = "cfae0da40c41532fb414c3b17891c98396b59471fe583a8fc756b96aea61a73b"
+SRC_URI[md5sum] = "b8b678362e3c5c9e366fb1fb3550a2e0"
+SRC_URI[sha256sum] = "c9dc3b42991ce5c5d0d0cb94e44c4ec2373ad09029940f0e92331e7e9ada0ac5"
 
 S = "${WORKDIR}/SuperTux-v${PV}-Source"