diff --git a/recipes-games/astromenace/astromenace/0001-CMakeLists.txt-use-pkg-config-to-find-freetype.patch b/recipes-games/astromenace/astromenace/0001-CMakeLists.txt-use-pkg-config-to-find-freetype.patch new file mode 100644 index 0000000..cb1fdca --- /dev/null +++ b/recipes-games/astromenace/astromenace/0001-CMakeLists.txt-use-pkg-config-to-find-freetype.patch @@ -0,0 +1,31 @@ +From d0aefa7ba2d58846e22dfc690e61934c38610a81 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 1 Nov 2015 22:31:33 +0100 +Subject: [PATCH 1/3] CMakeLists.txt: use pkg-config to find freetype +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 +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 31bf1e4..a9fbe43 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -201,7 +201,7 @@ IF(FREETYPE_INCLUDE_DIR_freetype2) + MESSAGE(STATUS "Found freetype2 headers: ${FREETYPE_INCLUDE_DIR_freetype2}") + INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR_freetype2}) + ELSE(FREETYPE_INCLUDE_DIR_freetype2) +- EXEC_PROGRAM("freetype-config" ARGS "--cflags" OUTPUT_VARIABLE freetype2_CFLAGS) ++ EXEC_PROGRAM("pkg-config" ARGS "--cflags freetype2" OUTPUT_VARIABLE freetype2_CFLAGS) + IF(freetype2_CFLAGS) + MESSAGE(STATUS "Found freetype2 cflags: ${freetype2_CFLAGS}") + ADD_DEFINITIONS(${freetype2_CFLAGS}) +-- +2.1.0 + diff --git a/recipes-games/astromenace/astromenace/0002-CMakeLists.txt-use-pkg-config-to-find-sdl.patch b/recipes-games/astromenace/astromenace/0002-CMakeLists.txt-use-pkg-config-to-find-sdl.patch new file mode 100644 index 0000000..1b4cf74 --- /dev/null +++ b/recipes-games/astromenace/astromenace/0002-CMakeLists.txt-use-pkg-config-to-find-sdl.patch @@ -0,0 +1,35 @@ +From 41383de9b117a1af0f0ef642a6fe21dda1b75186 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 1 Nov 2015 22:52:27 +0100 +Subject: [PATCH 2/3] CMakeLists.txt: use pkg-config to find sdl +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 +--- + CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a9fbe43..f3c5b6b 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,10 +26,9 @@ ENDIF(DEFINED FS2VFS) + + + # depends +-set(SDL_CONFIG "sdl-config" CACHE STRING "Path to sdl-config script") +-EXEC_PROGRAM(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS) ++EXEC_PROGRAM("pkg-config" ARGS "--cflags sdl" OUTPUT_VARIABLE SDL_CFLAGS) + ADD_DEFINITIONS(${SDL_CFLAGS}) +-EXEC_PROGRAM(${SDL_CONFIG} ARGS "--libs" OUTPUT_VARIABLE SDL_LIBS) ++EXEC_PROGRAM("pkg-config" ARGS "--libs sdl" OUTPUT_VARIABLE SDL_LIBS) + + + IF (NOT APPLE) +-- +2.1.0 + diff --git a/recipes-games/astromenace/astromenace/0003-Loading.cpp-fix-level2-crash.patch b/recipes-games/astromenace/astromenace/0003-Loading.cpp-fix-level2-crash.patch new file mode 100644 index 0000000..575a3c0 --- /dev/null +++ b/recipes-games/astromenace/astromenace/0003-Loading.cpp-fix-level2-crash.patch @@ -0,0 +1,36 @@ +From a2a2f7fdee581b2d8d7619ddb9c1db35bbe63cfb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 2 Nov 2015 21:54:13 +0100 +Subject: [PATCH 4/4] Loading.cpp: fix level2 crash +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Taken from [1] + +[1] http://pkgs.fedoraproject.org/cgit/astromenace.git/tree/astromenace-level2-crash.patch + +Signed-off-by: Andreas Müller +--- + AstroMenaceSource/Loading.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/AstroMenaceSource/Loading.cpp b/AstroMenaceSource/Loading.cpp +index dafdd8c..c95946c 100755 +--- a/AstroMenaceSource/Loading.cpp ++++ b/AstroMenaceSource/Loading.cpp +@@ -1541,6 +1541,9 @@ void LoadGameData(int LoadType) + + for (int i=0; i