From 070b2864c5603b408b6768780669e2f6cab156f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Sat, 5 Nov 2016 12:04:36 +0100
Subject: [PATCH] supertux2: force build with tailored physfs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In preparation of 0.5.0 of supertux I sent supertux's version of physfs to
meta-oe. No I fund out, that other packages don't work with that version. So
I will send a patch to meta-oe to go back to old version of physfs.

To make supertux work again force it to use it's own version of physfs as
static library.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...orce-ussage-of-supertux-s-version-of.patch | 37 +++++++++++++++++++
 ...-compile-flags-to-external-projects.patch} |  0
 ...ed-paths-as-system-causes-trouble-w.patch} |  0
 recipes-games/supertux/supertux2_0.5.0.bb     |  5 ++-
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 recipes-games/supertux/files/0002-CMakeLists.txt-force-ussage-of-supertux-s-version-of.patch
 rename recipes-games/supertux/files/{0002-pass-compile-flags-to-external-projects.patch => 0003-pass-compile-flags-to-external-projects.patch} (100%)
 rename recipes-games/supertux/files/{0003-do-not-set-included-paths-as-system-causes-trouble-w.patch => 0004-do-not-set-included-paths-as-system-causes-trouble-w.patch} (100%)

diff --git a/recipes-games/supertux/files/0002-CMakeLists.txt-force-ussage-of-supertux-s-version-of.patch b/recipes-games/supertux/files/0002-CMakeLists.txt-force-ussage-of-supertux-s-version-of.patch
new file mode 100644
index 0000000..2b9f625
--- /dev/null
+++ b/recipes-games/supertux/files/0002-CMakeLists.txt-force-ussage-of-supertux-s-version-of.patch
@@ -0,0 +1,37 @@
+From 2c5a2bb208cc22166c919800fe4e6b1c65f5ff84 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Sat, 5 Nov 2016 11:56:03 +0100
+Subject: [PATCH] CMakeLists.txt: force ussage of supertux's version of phyfs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status:Inappropriate [configuration]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ CMakeLists.txt | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e184a1e..909c6ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -172,13 +172,7 @@ INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
+ 
+ INCLUDE(CheckSymbolExists)
+ 
+-FIND_PACKAGE(PhysFS)
+-SET(HAVE_PHYSFS_GETPREFDIR TRUE)
+-IF(HAVE_PHYSFS_GETPREFDIR)
+-	SET(USE_SYSTEM_PHYSFS ON CACHE BOOL "Use preinstalled physfs (must support getPrefDir)")
+-ELSE(HAVE_PHYSFS_GETPREFDIR)
+-	SET(USE_SYSTEM_PHYSFS OFF CACHE BOOL "Use preinstalled physfs (must support getPrefDir)")
+-ENDIF(HAVE_PHYSFS_GETPREFDIR)
++SET(USE_SYSTEM_PHYSFS OFF CACHE BOOL "Use preinstalled physfs (must support getPrefDir)")
+ 
+ IF(NOT USE_SYSTEM_PHYSFS)
+ 	IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/external/physfs/CMakeLists.txt)
+-- 
+2.5.5
+
diff --git a/recipes-games/supertux/files/0002-pass-compile-flags-to-external-projects.patch b/recipes-games/supertux/files/0003-pass-compile-flags-to-external-projects.patch
similarity index 100%
rename from recipes-games/supertux/files/0002-pass-compile-flags-to-external-projects.patch
rename to recipes-games/supertux/files/0003-pass-compile-flags-to-external-projects.patch
diff --git a/recipes-games/supertux/files/0003-do-not-set-included-paths-as-system-causes-trouble-w.patch b/recipes-games/supertux/files/0004-do-not-set-included-paths-as-system-causes-trouble-w.patch
similarity index 100%
rename from recipes-games/supertux/files/0003-do-not-set-included-paths-as-system-causes-trouble-w.patch
rename to recipes-games/supertux/files/0004-do-not-set-included-paths-as-system-causes-trouble-w.patch
diff --git a/recipes-games/supertux/supertux2_0.5.0.bb b/recipes-games/supertux/supertux2_0.5.0.bb
index 2faa0fa..afb0fc1 100644
--- a/recipes-games/supertux/supertux2_0.5.0.bb
+++ b/recipes-games/supertux/supertux2_0.5.0.bb
@@ -13,8 +13,9 @@ inherit cmake
 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 \
-    file://0002-pass-compile-flags-to-external-projects.patch \
-    file://0003-do-not-set-included-paths-as-system-causes-trouble-w.patch \
+    file://0002-CMakeLists.txt-force-ussage-of-supertux-s-version-of.patch \
+    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"