diff --git a/recipes-games/atanks/atanks_5.7.bb b/recipes-games/atanks/atanks_5.7.bb
index e4f8755..d66c9f7 100644
--- a/recipes-games/atanks/atanks_5.7.bb
+++ b/recipes-games/atanks/atanks_5.7.bb
@@ -5,12 +5,11 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=5be586675e7c7aa09afa2c14cb1170a2"
 
 DEPENDS = "allegro4"
-PR = "r0"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}/${PN}-${PV}/${PN}-${PV}.tar.gz \
 "
 
-inherit autotools
+inherit autotools-brokensep
 
 SRC_URI[md5sum] = "135f8cb55e99a4a7b34996f260a9de6a"
 SRC_URI[sha256sum] = "fb2f4239679f4de4a3213e66a2bd4ec560753d518db727ffa35bc74f3a581e83"
diff --git a/recipes-games/etr/etr/0001-find-libgl-and-libglu-by-pkg-config.patch b/recipes-games/etr/etr/0001-find-libgl-and-libglu-by-pkg-config.patch
new file mode 100644
index 0000000..1d6e8d8
--- /dev/null
+++ b/recipes-games/etr/etr/0001-find-libgl-and-libglu-by-pkg-config.patch
@@ -0,0 +1,49 @@
+From 4cd511613675220a3fdb98d58bfb558d7eacc754 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 14 Mar 2015 00:48:57 +0100
+Subject: [PATCH] find libgl and libglu by pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstrema-Status: pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.ac | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7dd6817..8af8a59 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -63,16 +63,20 @@ PKG_CHECK_MODULES([SDLMIXER], [SDL_mixer],
+ ],
+ [AC_MSG_ERROR([SDL_mixer not found])])
+ 
+-AC_CHECK_LIB([GL], [glBegin], [],
++PKG_CHECK_MODULES([GL], [gl],
++[
++  CFLAGS="${CFLAGS} $GL_CFLAGS"
++  LIBS="${LIBS} $GL_LIBS"
++],
+ [AC_MSG_ERROR([libGL not found])])
+ 
+-LIBS="$LIBS -lGL"
+-
+-AC_CHECK_LIB([GLU], [gluBeginCurve], [],
++PKG_CHECK_MODULES([GLU], [glu],
++[
++  CFLAGS="${CFLAGS} $GLU_CFLAGS"
++  LIBS="${LIBS} $GLU_LIBS"
++],
+ [AC_MSG_ERROR([libGLU not found])])
+ 
+-LIBS="$LIBS -lGLU"
+-
+ CPPFLAGS="${CPPFLAGS} -DETR_DATA_DIR=\\\"$datadir\\\""
+ 
+ # Request c++11 compatibility
+-- 
+1.9.3
+
diff --git a/recipes-games/etr/etr/0002-find-sdl-by-pkg-config.patch b/recipes-games/etr/etr/0002-find-sdl-by-pkg-config.patch
new file mode 100644
index 0000000..22ad7aa
--- /dev/null
+++ b/recipes-games/etr/etr/0002-find-sdl-by-pkg-config.patch
@@ -0,0 +1,235 @@
+From 33b8facc7fc52270426ab93769509c854c8aa2be Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 14 Mar 2015 01:17:00 +0100
+Subject: [PATCH] find sdl by pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ aclocal.m4   | 184 -----------------------------------------------------------
+ configure.ac |   9 ++-
+ 2 files changed, 6 insertions(+), 187 deletions(-)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 45a8a0d..2499f7b 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -375,191 +375,7 @@ else
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+-# Configure paths for SDL
+-# Sam Lantinga 9/21/99
+-# stolen from Manish Singh
+-# stolen back from Frank Belew
+-# stolen from Manish Singh
+-# Shamelessly stolen from Owen Taylor
+ 
+-# serial 1
+-
+-dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+-dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+-dnl
+-AC_DEFUN([AM_PATH_SDL],
+-[dnl 
+-dnl Get the cflags and libraries from the sdl-config script
+-dnl
+-AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
+-            sdl_prefix="$withval", sdl_prefix="")
+-AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
+-            sdl_exec_prefix="$withval", sdl_exec_prefix="")
+-AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
+-		    , enable_sdltest=yes)
+-
+-  if test x$sdl_exec_prefix != x ; then
+-    sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
+-    if test x${SDL_CONFIG+set} != xset ; then
+-      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-    fi
+-  fi
+-  if test x$sdl_prefix != x ; then
+-    sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
+-    if test x${SDL_CONFIG+set} != xset ; then
+-      SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-    fi
+-  fi
+-
+-  as_save_PATH="$PATH"
+-  if test "x$prefix" != xNONE; then
+-    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
+-  fi
+-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+-  PATH="$as_save_PATH"
+-  min_sdl_version=ifelse([$1], ,0.11.0,$1)
+-  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+-  no_sdl=""
+-  if test "$SDL_CONFIG" = "no" ; then
+-    no_sdl=yes
+-  else
+-    SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
+-
+-    sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+-    sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+-    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
+-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+-    if test "x$enable_sdltest" = "xyes" ; then
+-      ac_save_CFLAGS="$CFLAGS"
+-      ac_save_CXXFLAGS="$CXXFLAGS"
+-      ac_save_LIBS="$LIBS"
+-      CFLAGS="$CFLAGS $SDL_CFLAGS"
+-      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+-      LIBS="$LIBS $SDL_LIBS"
+-dnl
+-dnl Now check if the installed SDL is sufficiently new. (Also sanity
+-dnl checks the results of sdl-config to some extent
+-dnl
+-      rm -f conf.sdltest
+-      AC_TRY_RUN([
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include "SDL.h"
+-
+-char*
+-my_strdup (char *str)
+-{
+-  char *new_str;
+-  
+-  if (str)
+-    {
+-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+-      strcpy (new_str, str);
+-    }
+-  else
+-    new_str = NULL;
+-  
+-  return new_str;
+-}
+-
+-int main (int argc, char *argv[])
+-{
+-  int major, minor, micro;
+-  char *tmp_version;
+-
+-  /* This hangs on some systems (?)
+-  system ("touch conf.sdltest");
+-  */
+-  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
+-
+-  /* HP/UX 9 (%@#!) writes to sscanf strings */
+-  tmp_version = my_strdup("$min_sdl_version");
+-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+-     printf("%s, bad version string\n", "$min_sdl_version");
+-     exit(1);
+-   }
+-
+-   if (($sdl_major_version > major) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
+-      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
+-    {
+-      return 0;
+-    }
+-  else
+-    {
+-      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
+-      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
+-      printf("*** best to upgrade to the required version.\n");
+-      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
+-      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
+-      printf("*** config.cache before re-running configure\n");
+-      return 1;
+-    }
+-}
+-
+-],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-       CFLAGS="$ac_save_CFLAGS"
+-       CXXFLAGS="$ac_save_CXXFLAGS"
+-       LIBS="$ac_save_LIBS"
+-     fi
+-  fi
+-  if test "x$no_sdl" = x ; then
+-     AC_MSG_RESULT(yes)
+-     ifelse([$2], , :, [$2])     
+-  else
+-     AC_MSG_RESULT(no)
+-     if test "$SDL_CONFIG" = "no" ; then
+-       echo "*** The sdl-config script installed by SDL could not be found"
+-       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
+-       echo "*** your path, or set the SDL_CONFIG environment variable to the"
+-       echo "*** full path to sdl-config."
+-     else
+-       if test -f conf.sdltest ; then
+-        :
+-       else
+-          echo "*** Could not run SDL test program, checking why..."
+-          CFLAGS="$CFLAGS $SDL_CFLAGS"
+-          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+-          LIBS="$LIBS $SDL_LIBS"
+-          AC_TRY_LINK([
+-#include <stdio.h>
+-#include "SDL.h"
+-
+-int main(int argc, char *argv[])
+-{ return 0; }
+-#undef  main
+-#define main K_and_R_C_main
+-],      [ return 0; ],
+-        [ echo "*** The test program compiled, but did not run. This usually means"
+-          echo "*** that the run-time linker is not finding SDL or finding the wrong"
+-          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
+-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
+-          echo "*** is required on your system"
+-	  echo "***"
+-          echo "*** If you have an old version installed, it is best to remove it, although"
+-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
+-          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
+-          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+-          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+-          CFLAGS="$ac_save_CFLAGS"
+-          CXXFLAGS="$ac_save_CXXFLAGS"
+-          LIBS="$ac_save_LIBS"
+-       fi
+-     fi
+-     SDL_CFLAGS=""
+-     SDL_LIBS=""
+-     ifelse([$3], , :, [$3])
+-  fi
+-  AC_SUBST(SDL_CFLAGS)
+-  AC_SUBST(SDL_LIBS)
+-  rm -f conf.sdltest
+-])
+ 
+ # Copyright (C) 2002-2013 Free Software Foundation, Inc.
+ #
+diff --git a/configure.ac b/configure.ac
+index 8af8a59..576818a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,9 +38,12 @@ esac
+ AC_FUNC_MALLOC
+ AC_CHECK_FUNCS([floor getcwd memmove memset mkdir pow sqrt strchr strdup])
+ 
+-AM_PATH_SDL([1.0.0])
+-CFLAGS="$CFLAGS $SDL_CFLAGS"
+-LIBS="$LIBS $SDL_LIBS"
++PKG_CHECK_MODULES([SDL], [sdl],
++[
++  CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
++  LIBS="$LIBS $SDL_LIBS"
++],
++[AC_MSG_ERROR([libsdl not found])])
+ 
+ PKG_CHECK_MODULES([FT2], [freetype2],
+ [
+-- 
+1.9.3
+
diff --git a/recipes-games/etr/etr_0.6.0.bb b/recipes-games/etr/etr_0.6.0.bb
index 9332abb..9da5547 100644
--- a/recipes-games/etr/etr_0.6.0.bb
+++ b/recipes-games/etr/etr_0.6.0.bb
@@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 SECTION = "games"
 
-SRC_URI = "http://sourceforge.net/projects/extremetuxracer/files/releases/${PV}/etr-${PV}.tar.xz \
-           file://ftconfigure.patch \
-           file://pkg.m4"
+SRC_URI = " \
+    http://sourceforge.net/projects/extremetuxracer/files/releases/${PV}/etr-${PV}.tar.xz \
+    file://0001-find-libgl-and-libglu-by-pkg-config.patch \
+    file://0002-find-sdl-by-pkg-config.patch \
+    file://ftconfigure.patch \
+    file://pkg.m4"
 
 SRC_URI[md5sum] = "c85690864b14f9d422b73025cb01aa8d"
 SRC_URI[sha256sum] = "44312719a1e9aa33e5aa0c8ad50bb52df702d64fd2d16bf2abda62ee27bf893a"
diff --git a/recipes-games/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch b/recipes-games/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch
new file mode 100644
index 0000000..c7c4103
--- /dev/null
+++ b/recipes-games/gnome-games/files/0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch
@@ -0,0 +1,426 @@
+From 3033079fd3758af6446dafbe3683fe0240db6585 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 14 Mar 2015 00:00:46 +0100
+Subject: [PATCH] In cross environment we have to prepend the sysroot to the
+ path found by pkgconfig
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ aisleriot/help/Makefile.in    | 12 ++++++------
+ glchess/help/Makefile.in      | 12 ++++++------
+ glines/help/Makefile.in       | 12 ++++++------
+ gnect/help/Makefile.in        | 12 ++++++------
+ gnibbles/help/Makefile.in     | 12 ++++++------
+ gnobots2/help/Makefile.in     | 12 ++++++------
+ gnome-doc-utils.make          | 12 ++++++------
+ gnome-sudoku/help/Makefile.in | 12 ++++++------
+ gnomine/help/Makefile.in      | 12 ++++++------
+ gnotravex/help/Makefile.in    | 12 ++++++------
+ gnotski/help/Makefile.in      | 12 ++++++------
+ gtali/help/Makefile.in        | 12 ++++++------
+ iagno/help/Makefile.in        | 12 ++++++------
+ lightsoff/help/Makefile.in    | 12 ++++++------
+ mahjongg/help/Makefile.in     | 12 ++++++------
+ quadrapassel/help/Makefile.in | 12 ++++++------
+ swell-foop/help/Makefile.in   | 12 ++++++------
+ 17 files changed, 102 insertions(+), 102 deletions(-)
+
+diff --git a/aisleriot/help/Makefile.in b/aisleriot/help/Makefile.in
+index 7af4a8a..4df2f55 100644
+--- a/aisleriot/help/Makefile.in
++++ b/aisleriot/help/Makefile.in
+@@ -853,12 +853,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/glchess/help/Makefile.in b/glchess/help/Makefile.in
+index 3c2ed20..f9b2305 100644
+--- a/glchess/help/Makefile.in
++++ b/glchess/help/Makefile.in
+@@ -763,12 +763,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/glines/help/Makefile.in b/glines/help/Makefile.in
+index 4b84ce8..b431ea9 100644
+--- a/glines/help/Makefile.in
++++ b/glines/help/Makefile.in
+@@ -764,12 +764,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gnect/help/Makefile.in b/gnect/help/Makefile.in
+index bfe3a2c..941fffd 100644
+--- a/gnect/help/Makefile.in
++++ b/gnect/help/Makefile.in
+@@ -766,12 +766,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gnibbles/help/Makefile.in b/gnibbles/help/Makefile.in
+index 491d9b4..fd71857 100644
+--- a/gnibbles/help/Makefile.in
++++ b/gnibbles/help/Makefile.in
+@@ -768,12 +768,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gnobots2/help/Makefile.in b/gnobots2/help/Makefile.in
+index b610962..22a68e7 100644
+--- a/gnobots2/help/Makefile.in
++++ b/gnobots2/help/Makefile.in
+@@ -762,12 +762,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
+index 97fd549..683e629 100644
+--- a/gnome-doc-utils.make
++++ b/gnome-doc-utils.make
+@@ -133,12 +133,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ 
+ if ENABLE_SK
+ _ENABLE_SK = true
+diff --git a/gnome-sudoku/help/Makefile.in b/gnome-sudoku/help/Makefile.in
+index f31961e..51ada75 100644
+--- a/gnome-sudoku/help/Makefile.in
++++ b/gnome-sudoku/help/Makefile.in
+@@ -768,12 +768,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gnomine/help/Makefile.in b/gnomine/help/Makefile.in
+index a839275..acd0751 100644
+--- a/gnomine/help/Makefile.in
++++ b/gnomine/help/Makefile.in
+@@ -774,12 +774,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gnotravex/help/Makefile.in b/gnotravex/help/Makefile.in
+index 953f3a8..4c7a8bc 100644
+--- a/gnotravex/help/Makefile.in
++++ b/gnotravex/help/Makefile.in
+@@ -773,12 +773,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gnotski/help/Makefile.in b/gnotski/help/Makefile.in
+index c15d772..dd744ab 100644
+--- a/gnotski/help/Makefile.in
++++ b/gnotski/help/Makefile.in
+@@ -763,12 +763,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/gtali/help/Makefile.in b/gtali/help/Makefile.in
+index 5525461..1327809 100644
+--- a/gtali/help/Makefile.in
++++ b/gtali/help/Makefile.in
+@@ -763,12 +763,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/iagno/help/Makefile.in b/iagno/help/Makefile.in
+index 09e5101..157e891 100644
+--- a/iagno/help/Makefile.in
++++ b/iagno/help/Makefile.in
+@@ -769,12 +769,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/lightsoff/help/Makefile.in b/lightsoff/help/Makefile.in
+index 4eb4bbc..4e28121 100644
+--- a/lightsoff/help/Makefile.in
++++ b/lightsoff/help/Makefile.in
+@@ -760,12 +760,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/mahjongg/help/Makefile.in b/mahjongg/help/Makefile.in
+index c8b0b64..6665eb6 100644
+--- a/mahjongg/help/Makefile.in
++++ b/mahjongg/help/Makefile.in
+@@ -765,12 +765,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/quadrapassel/help/Makefile.in b/quadrapassel/help/Makefile.in
+index 0456c20..dfdec78 100644
+--- a/quadrapassel/help/Makefile.in
++++ b/quadrapassel/help/Makefile.in
+@@ -760,12 +760,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+diff --git a/swell-foop/help/Makefile.in b/swell-foop/help/Makefile.in
+index 1de62f5..0e85e77 100644
+--- a/swell-foop/help/Makefile.in
++++ b/swell-foop/help/Makefile.in
+@@ -767,12 +767,12 @@ DOC_LINGUAS ?=
+ 
+ _xml2po ?= `which xml2po`
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ @ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ @ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ @ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+-- 
+1.9.3
+
diff --git a/recipes-games/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch b/recipes-games/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch
new file mode 100644
index 0000000..313c49a
--- /dev/null
+++ b/recipes-games/gnome-games/files/0002-aisleriot-lib-Makefile.am-fix-configure.patch
@@ -0,0 +1,33 @@
+From 19aab4915c677aaeaa4f45f0a3679f2533ec4c70 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 6 Jan 2013 19:56:45 +0100
+Subject: [PATCH] aisleriot/lib/Makefile.am: fix configure
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| aisleriot/lib/Makefile.am:92: error: 'pkglibdir' is not a legitimate directory for 'PROGRAMS'
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ aisleriot/lib/Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/aisleriot/lib/Makefile.am b/aisleriot/lib/Makefile.am
+index 2df7958..972d24d 100644
+--- a/aisleriot/lib/Makefile.am
++++ b/aisleriot/lib/Makefile.am
+@@ -89,7 +89,7 @@ endif
+ 
+ if HAVE_RSVG
+ 
+-pkglib_PROGRAMS = ar-cards-renderer
++pkglibexec_PROGRAMS = ar-cards-renderer
+ 
+ ar_cards_renderer_SOURCES = \
+ 	render-cards.c
+-- 
+1.7.4.4
+
diff --git a/recipes-games/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch b/recipes-games/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch
new file mode 100644
index 0000000..1c962aa
--- /dev/null
+++ b/recipes-games/gnome-games/files/0003-configure.in-fix-configure-with-quadrapassel-disable.patch
@@ -0,0 +1,35 @@
+From 67a9930fe433ffcfee44c7a668dce2d2f01a8a6d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 20 Jan 2013 01:20:47 +0100
+Subject: [PATCH] configure.in: fix configure with quadrapassel disabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| configure:22096: error: conditional "am__fastdepCXX" was never defined.
+| Usually this means the macro was only invoked conditionally.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fd60098..07581d6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -205,8 +205,8 @@ AC_PROG_CPP
+ AC_PROG_LN_S
+ AC_PROG_SED
+ 
++AC_PROG_CXX
+ if test "$need_cxx" = "yes"; then
+-  AC_PROG_CXX
+ 
+   # Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it
+   # doesn't exist)
+-- 
+1.7.4.4
+
diff --git a/recipes-games/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch b/recipes-games/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch
new file mode 100644
index 0000000..1fc77f2
--- /dev/null
+++ b/recipes-games/gnome-games/files/0004-aisleriot-game.c-fix-build-with-latest-guile.patch
@@ -0,0 +1,33 @@
+From 7b29b162281072a065647a4a355bd9fd6bc2d1a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 20 Jan 2013 01:56:37 +0100
+Subject: [PATCH] aisleriot/game.c: fix build with latest guile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| game.c:324:26: error: 'scm_the_last_stack_fluid_var' undeclared (first use in this function)
+
+Upstream-Status: Backport
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ aisleriot/game.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/aisleriot/game.c b/aisleriot/game.c
+index e42c88c..cfdb99c 100644
+--- a/aisleriot/game.c
++++ b/aisleriot/game.c
+@@ -321,7 +321,7 @@ cscmi_exception_get_backtrace (SCM tag, SCM throw_args)
+   free (string);
+ 
+   g_string_append (message, "\n\nBacktrace:\n");
+-  stack = scm_fluid_ref (SCM_VARIABLE_REF (scm_the_last_stack_fluid_var));
++  stack = scm_make_stack (SCM_BOOL_T, SCM_EOL);
+   if (!SCM_FALSEP (stack)) {
+     scm_display_backtrace (stack, port, SCM_UNDEFINED, SCM_UNDEFINED);
+     string = scm_to_locale_string (scm_get_output_string (port));
+-- 
+1.7.4.4
+
diff --git a/recipes-games/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch b/recipes-games/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch
new file mode 100644
index 0000000..b591a1d
--- /dev/null
+++ b/recipes-games/gnome-games/files/0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch
@@ -0,0 +1,42 @@
+From 1b9b02c2c592db439cd09078c76007664e77b2ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 10 Mar 2013 15:26:00 +0100
+Subject: [PATCH] glchess/gnuchess/common.h: fix compile for
+ -Werror=missing-prototypes
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+| input.c:87:6: error: no previous prototype for 'getline_standard' [-Werror=missing-prototypes]
+
+| lexpgn.l:70:7: error: no previous prototype for 'return_append_str' [-Werror=missing-prototypes]
+| lexpgn.l:89:6: error: no previous prototype for 'append_str' [-Werror=missing-prototypes]
+| lexpgn.l:96:6: error: no previous prototype for 'append_comment' [-Werror=missing-prototypes]
+| lexpgn.c:1959:1: error: no previous prototype for 'yylex' [-Werror=missing-prototypes]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ glchess/gnuchess/common.h |    7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/glchess/gnuchess/common.h b/glchess/gnuchess/common.h
+index d846d93..7d7f6e3 100644
+--- a/glchess/gnuchess/common.h
++++ b/glchess/gnuchess/common.h
+@@ -718,6 +718,13 @@ void DBTest (void);
+ extern pthread_t input_thread;
+ void *input_func(void *);
+ 
++/* some prototypes required for -Werror=missing-prototypes */
++void getline_standard(char *p);
++char *return_append_str(char *dest, const char *s);
++void append_str(char **dest, const char *s);
++void append_comment(const char *t);
++int yylex(void);
++
+ /*
+  * Status variable used by the input thread to signal
+  * pending input. Thought about using flags for this
+-- 
+1.7.4.4
+
diff --git a/recipes-games/gnome-games/gnome-games_2.32.1.bb b/recipes-games/gnome-games/gnome-games_2.32.1.bb
new file mode 100644
index 0000000..4739d7a
--- /dev/null
+++ b/recipes-games/gnome-games/gnome-games_2.32.1.bb
@@ -0,0 +1,28 @@
+DESCRIPTION = "GNOME Games is a collection of fifteen small games"
+HOMEPAGE = "https://live.gnome.org/GnomeGames"
+SECTION = "x11/application"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+DEPENDS = "glib-2.0 gtk+ cairo gstreamer librsvg python-pygtk libcanberra guile gnome-doc-utils"
+
+inherit gnome python-dir
+
+SRC_URI += " \
+    file://0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch \
+    file://0002-aisleriot-lib-Makefile.am-fix-configure.patch \
+    file://0003-configure.in-fix-configure-with-quadrapassel-disable.patch \
+    file://0004-aisleriot-game.c-fix-build-with-latest-guile.patch \
+    file://0005-glchess-gnuchess-common.h-fix-compile-for-Werror-mis.patch \
+"
+SRC_URI[archive.md5sum] = "e5182bf7dc5d8573bdfdd4f5626890cd"
+SRC_URI[archive.sha256sum] = "1a3b2e82102eed3780f05db4378111c475456678deed82fd4ca379da1c5593d9"
+
+# don't build clutter depending games / pointer to python headers
+EXTRA_OECONF += " \
+    --enable-omitgames=quadrapassel,lightsoff,swell-foop,gnibbles \
+    --disable-scrollkeeper \
+"
+
+# TDB: split packages?
+FILES_${PN} += "${libdir} ${datadir}"
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
diff --git a/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch b/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch
new file mode 100644
index 0000000..6cdf2f5
--- /dev/null
+++ b/recipes-games/scummvm/scummvm/0001-use-pkg-config-to-gather-sdl-information.patch
@@ -0,0 +1,39 @@
+From 27c44b052ca69873046f32631b3ccbe1d6b11dd3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sun, 15 Mar 2015 00:57:10 +0100
+Subject: [PATCH] use pkg-config to gather sdl information
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9496cf8..1bce86e 100755
+--- a/configure
++++ b/configure
+@@ -2710,13 +2710,12 @@ MODULES="$MODULES backends/platform/$_backend"
+ #
+ case $_backend in
+ 	dingux | gp2x | gph | linuxmoto | maemo | openpandora | samsungtv | sdl)
+-		find_sdlconfig
+-		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+-		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
++		INCLUDES="$INCLUDES `pkg-config --cflags sdl`"
++		LIBS="$LIBS `pkg-config --libs sdl`"
+ 		DEFINES="$DEFINES -DSDL_BACKEND"
+ 		add_line_to_config_mk "SDL_BACKEND = 1"
+ 
+-		_sdlversion=`$_sdlconfig --version`
++		_sdlversion=`pkg-config --modversion`
+ 		case $_sdlversion in
+ 			1.3.*)
+ 				add_line_to_config_mk "USE_SDL13 = 1"
+-- 
+1.9.3
+
diff --git a/recipes-games/scummvm/scummvm_1.5.0.bb b/recipes-games/scummvm/scummvm_1.5.0.bb
index 31cbc5d..725e625 100644
--- a/recipes-games/scummvm/scummvm_1.5.0.bb
+++ b/recipes-games/scummvm/scummvm_1.5.0.bb
@@ -5,14 +5,16 @@ PRIORITY = "optional"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=761a03e159b8bb74f377e30458e210e1"
 
-inherit autotools
+inherit autotools-brokensep
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
-           file://scummvm.desktop \
-           file://no-strip.patch \
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/scummvm/scummvm-${PV}.tar.bz2 \
+    file://0001-use-pkg-config-to-gather-sdl-information.patch \
+    file://scummvm.desktop \
+    file://no-strip.patch \
 "
 
-DEPENDS = "virtual/libsdl libvorbis libogg zlib \
+DEPENDS = "virtual/libsdl libvorbis libogg zlib flac faad2 \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad mpeg2dec', d)}"
 
 EXTRA_OECONF = " \
@@ -26,6 +28,7 @@ EXTRA_OECONF = " \
   --enable-plugins \
   --default-dynamic \
   --enable-all-engines \
+  --disable-fluidsynth \
   ${@base_conditional('ENTERPRISE_DISTRO', '1', '--disable-mad', '--with-mad-prefix=${STAGING_LIBDIR}/..', d)} \
 "
 
diff --git a/recipes-games/supertux/files/0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch b/recipes-games/supertux/files/0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch
new file mode 100644
index 0000000..642e4a6
--- /dev/null
+++ b/recipes-games/supertux/files/0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch
@@ -0,0 +1,36 @@
+From ed6fd52abd39880b7b1b2cd187a4f54a648d9ea0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 13 Mar 2015 22:34:56 +0100
+Subject: [PATCH] do not set CMAKE_C_FLAGS / CMAKE CXX_FLAGS to empty
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This causes horrible (many faces) errors in cross environments
+
+Upstrem-Status: Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ external/squirrel/CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/external/squirrel/CMakeLists.txt b/external/squirrel/CMakeLists.txt
+index 0c4ef29..cdfa38a 100644
+--- a/external/squirrel/CMakeLists.txt
++++ b/external/squirrel/CMakeLists.txt
+@@ -34,11 +34,6 @@ IF(ENABLE_SQDBG)
+   SET(SQUIRREL_SOURCES ${SQDBG_SOURCES} ${SQUIRREL_SOURCES})
+ ENDIF(ENABLE_SQDBG)
+ 
+-# the squirrel sources are out of our control so don't be too pedantic about
+-# them
+-SET(CMAKE_CXX_FLAGS "")
+-SET(CMAKE_C_FLAGS "")
+-
+ ## define a target for building the library
+ 
+ ADD_LIBRARY(squirrel ${SQUIRREL_SOURCES})
+-- 
+1.9.3
+
diff --git a/recipes-games/supertux/supertux2_git.bb b/recipes-games/supertux/supertux2_git.bb
index 66903e0..ca920e0 100644
--- a/recipes-games/supertux/supertux2_git.bb
+++ b/recipes-games/supertux/supertux2_git.bb
@@ -14,9 +14,10 @@ SRCREV = "947098af8085388eef4b5352f5c5d0b6edbcd78a"
 PV = "0.3.3+git${SRCPV}"
 S = "${WORKDIR}/git"
 
-SRC_URI = "git://code.google.com/p/supertux;protocol=https"
-SRC_URI[md5sum] = "f3f803e629ee51a9de0b366a036e393d"
-SRC_URI[sha256sum] = "fceaf95251092d5698211ff0f51f1c50237fa5e2a6690464e9835a66e18301d0"
+SRC_URI = " \
+    git://code.google.com/p/supertux;protocol=https \
+    file://0001-do-not-set-CMAKE_C_FLAGS-CMAKE-CXX_FLAGS-to-empty.patch \
+"
 
 EXTRA_OECMAKE = "-DINSTALL_SUBDIR_BIN=bin -DCMAKE_BUILD_TYPE=RELEASE"