From 5da7e8a26cdfb7bf46216d05738c0f5388d42ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 20 Mar 2019 22:37:03 +0100 Subject: [PATCH] supertux: upgrade 0.5.1 -> 0.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- ...in-PHYSFS_getPrefDir-autodetection-d.patch | 26 +-- ...orce-ussage-of-supertux-s-version-of.patch | 37 ---- ...ded-paths-as-system-causes-trouble-w.patch | 163 ++++++++++++++++++ ...PROGRAM-make-explicitly-for-external.patch | 59 +++++++ ...s-compile-flags-to-external-projects.patch | 87 ---------- ...ded-paths-as-system-causes-trouble-w.patch | 127 -------------- ...{supertux2_0.5.1.bb => supertux2_0.6.0.bb} | 16 +- 7 files changed, 243 insertions(+), 272 deletions(-) delete mode 100644 recipes-games/supertux/files/0002-CMakeLists.txt-force-ussage-of-supertux-s-version-of.patch create mode 100644 recipes-games/supertux/files/0002-do-not-set-included-paths-as-system-causes-trouble-w.patch create mode 100644 recipes-games/supertux/files/0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch delete mode 100644 recipes-games/supertux/files/0003-pass-compile-flags-to-external-projects.patch delete mode 100644 recipes-games/supertux/files/0004-do-not-set-included-paths-as-system-causes-trouble-w.patch rename recipes-games/supertux/{supertux2_0.5.1.bb => supertux2_0.6.0.bb} (69%) diff --git a/recipes-games/supertux/files/0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch b/recipes-games/supertux/files/0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch index d4a2c05..d50f817 100644 --- a/recipes-games/supertux/files/0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch +++ b/recipes-games/supertux/files/0001-CMakeLists.txt-Pin-PHYSFS_getPrefDir-autodetection-d.patch @@ -1,6 +1,6 @@ From 4256cd336e766f545516151dda924d65423e0b50 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 26 Sep 2016 00:04:33 +0200 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 20 Mar 2019 20:10:52 +0100 Subject: [PATCH] CMakeLists.txt: Pin PHYSFS_getPrefDir - autodetection does not work MIME-Version: 1.0 @@ -9,24 +9,24 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andreas Müller +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 cf97246..28ebada 100644 +index 9dd3877..9e50b57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -173,7 +173,7 @@ INCLUDE_DIRECTORIES(SYSTEM ${VORBIS_INCLUDE_DIR}) - INCLUDE(CheckSymbolExists) +@@ -217,7 +217,7 @@ include_directories(SYSTEM ${VORBIS_INCLUDE_DIR}) + include(CheckSymbolExists) - FIND_PACKAGE(PhysFS) --CHECK_SYMBOL_EXISTS("PHYSFS_getPrefDir" "${PHYSFS_INCLUDE_DIR}/physfs.h" HAVE_PHYSFS_GETPREFDIR) -+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) + find_package(PhysFS) +-check_symbol_exists("PHYSFS_getPrefDir" "${PHYSFS_INCLUDE_DIR}/physfs.h" HAVE_PHYSFS_GETPREFDIR) ++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) -- -2.5.5 +2.20.1 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 deleted file mode 100644 index 2b9f625..0000000 --- a/recipes-games/supertux/files/0002-CMakeLists.txt-force-ussage-of-supertux-s-version-of.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2c5a2bb208cc22166c919800fe4e6b1c65f5ff84 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -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 ---- - 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-do-not-set-included-paths-as-system-causes-trouble-w.patch b/recipes-games/supertux/files/0002-do-not-set-included-paths-as-system-causes-trouble-w.patch new file mode 100644 index 0000000..5617a81 --- /dev/null +++ b/recipes-games/supertux/files/0002-do-not-set-included-paths-as-system-causes-trouble-w.patch @@ -0,0 +1,163 @@ +From a8d486d174dfbc25abbe69ed14a502692bffcb5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 20 Mar 2019 20:05:34 +0100 +Subject: [PATCH] do not set included paths as system - causes trouble with >= + gcc-6 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fixes errors as: +| /home/superandy/tmp/oe-core-glibc/sysroots/raspberrypi2/usr/include/c++/6.2.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory +| #include_next + ^ +further information at [1] + +[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 40 ++++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 20 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9e50b57..cf70210 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -134,7 +134,7 @@ else(ENABLE_BOOST_STATIC_LIBS) + set(Boost_USE_STATIC_LIBS FALSE) + endif(ENABLE_BOOST_STATIC_LIBS) + find_package(Boost REQUIRED COMPONENTS filesystem system date_time locale) +-include_directories(SYSTEM ${Boost_INCLUDE_DIR}) ++include_directories(${Boost_INCLUDE_DIR}) + link_directories(${Boost_LIBRARY_DIRS}) + + find_package(PNG REQUIRED) +@@ -182,14 +182,14 @@ if(ENABLE_OPENGL) + set(OpenGL_GL_PREFERENCE "LEGACY") + find_package(OpenGL) + if(OPENGL_FOUND) +- include_directories(SYSTEM ${OPENGL_INCLUDE_DIR}) ++ include_directories(${OPENGL_INCLUDE_DIR}) + set(HAVE_OPENGL TRUE) + endif(OPENGL_FOUND) + + if(GLBINDING_ENABLED) + find_package(GLBINDING REQUIRED) + if(GLBINDING_FOUND) +- include_directories(SYSTEM ${GLBINDING_INCLUDES}) ++ include_directories(${GLBINDING_INCLUDES}) + add_definitions(-DUSE_GLBINDING) + IF (GLBINDING_DEBUG_OUTPUT) + add_definitions(-DUSE_GLBINDING_DEBUG_OUTPUT) +@@ -198,7 +198,7 @@ if(ENABLE_OPENGL) + else() + find_package(GLEW REQUIRED) + if(GLEW_FOUND) +- include_directories(SYSTEM ${GLEW_INCLUDE_DIR}) ++ include_directories(${GLEW_INCLUDE_DIR}) + endif(GLEW_FOUND) + endif() + endif() +@@ -209,10 +209,10 @@ if(VCPKG_BUILD) + else() + find_package(OpenAL REQUIRED) + endif() +-include_directories(SYSTEM ${OPENAL_INCLUDE_DIR}) ++include_directories(${OPENAL_INCLUDE_DIR}) + + find_package(OggVorbis REQUIRED) +-include_directories(SYSTEM ${VORBIS_INCLUDE_DIR}) ++include_directories(${VORBIS_INCLUDE_DIR}) + + include(CheckSymbolExists) + +@@ -262,7 +262,7 @@ if(NOT USE_SYSTEM_PHYSFS) + set(PHYSFS_INCLUDE_DIR "${PHYSFS_PREFIX}/include/") + endif() + +-include_directories(BEFORE SYSTEM ${PHYSFS_INCLUDE_DIR}) ++include_directories(BEFORE ${PHYSFS_INCLUDE_DIR}) + + + ## The curl headers are in the standard include path in dependencies +@@ -283,12 +283,12 @@ if(WIN32 AND VCPKG_BUILD) + endif() + endif() + if(CURL_FOUND) +- include_directories(SYSTEM ${CURL_INCLUDE_DIR}) ++ include_directories(${CURL_INCLUDE_DIR}) + set(HAVE_LIBCURL TRUE) + endif(CURL_FOUND) + + #find_package(ICONV REQUIRED) +-#include_directories(SYSTEM ${ICONV_INCLUDE_DIR}) ++#include_directories(${ICONV_INCLUDE_DIR}) + #link_libraries(${ICONV_LIBRARY}) + + if(EXISTS "${CMAKE_SOURCE_DIR}/.git") +@@ -411,7 +411,7 @@ else() + set_target_properties(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}") + endif() + +-include_directories(SYSTEM ${SQUIRREL_PREFIX}/include) ++include_directories(${SQUIRREL_PREFIX}/include) + + ## Also build external/tinygettext + +@@ -440,7 +440,7 @@ ExternalProject_Add(tinygettext + add_library(tinygettext_lib STATIC IMPORTED) + set_target_properties(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}") + +-include_directories(SYSTEM ${TINYGETTEXT_PREFIX}/include) ++include_directories(${TINYGETTEXT_PREFIX}/include) + + ## external/SDL_ttf with patches + find_package(Freetype REQUIRED) +@@ -463,16 +463,16 @@ ExternalProject_Add(SDL_ttf + add_library(SDL_ttf_lib STATIC IMPORTED) + set_target_properties(SDL_ttf_lib PROPERTIES IMPORTED_LOCATION "${SDL_TTF_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2_ttf${CMAKE_STATIC_LIBRARY_SUFFIX}") + link_directories(${SDL_TTF_PREFIX}/lib) +-include_directories(SYSTEM ${SDL_TTF_PREFIX}/include/SDL2) ++include_directories(${SDL_TTF_PREFIX}/include/SDL2) + + ## Some additional include paths + + include_directories(${CMAKE_BINARY_DIR}/) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/) +-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/) +-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/) +-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/) +-include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_SavePNG/) + + if(WIN32) + add_definitions(-D_USE_MATH_DEFINES -DNOMINMAX) +@@ -494,7 +494,7 @@ add_library(sexp STATIC ${SEXP_SOURCES_CXX}) + + file(GLOB SAVEPNG_SOURCES_CXX RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} external/SDL_SavePNG/savepng.c) + add_library(savepng STATIC ${SAVEPNG_SOURCES_CXX}) +-target_include_directories(savepng SYSTEM PUBLIC ${SDL2_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}) ++target_include_directories(savepng PUBLIC ${SDL2_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}) + target_link_libraries(savepng PUBLIC ${PNG_LIBRARIES}) + + if(HAVE_OPENGL) +@@ -746,9 +746,9 @@ if(VCPKG_BUILD) + target_include_directories(supertux2_lib PUBLIC ${CURL_INCLUDE_DIRS}) + endif() + +-target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL2_INCLUDE_DIRS}) +-target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL2IMAGE_INCLUDE_DIRS}) +-target_include_directories(supertux2_lib SYSTEM PUBLIC ${SDL_TTF_PREFIX}/include/SDL2) ++target_include_directories(supertux2_lib PUBLIC ${SDL2_INCLUDE_DIRS}) ++target_include_directories(supertux2_lib PUBLIC ${SDL2IMAGE_INCLUDE_DIRS}) ++target_include_directories(supertux2_lib PUBLIC ${SDL_TTF_PREFIX}/include/SDL2) + if(VCPKG_BUILD) + target_link_libraries(supertux2_lib PRIVATE SDL2::SDL2main SDL2::SDL2 SDL2_image) + else() +-- +2.20.1 + diff --git a/recipes-games/supertux/files/0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch b/recipes-games/supertux/files/0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch new file mode 100644 index 0000000..ce43383 --- /dev/null +++ b/recipes-games/supertux/files/0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch @@ -0,0 +1,59 @@ +From 2c3eba355933b0b190ed2e44e9a256224fd32b13 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 20 Mar 2019 17:26:28 +0100 +Subject: [PATCH] Set DCMAKE_MAKE_PROGRAM=make explicitly for external sources +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Seems current version of cmake is forgetful on this: + +| CMake Error: CMake was unable to find a build program corresponding to "Unix Makefiles". CMAKE_MAKE_PROGRAM is not set. You probably need to select a different build tool. + + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cf70210..ac223ca 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -241,6 +241,7 @@ if(NOT USE_SYSTEM_PHYSFS) + ExternalProject_Add(physfs + SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/physfs/" + CMAKE_ARGS ++ -DCMAKE_MAKE_PROGRAM=make + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} + -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} +@@ -386,6 +387,7 @@ set(SQUIRREL_PREFIX ${CMAKE_BINARY_DIR}/squirrel/ex) + ExternalProject_Add(squirrel + SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/squirrel/" + CMAKE_ARGS ++ -DCMAKE_MAKE_PROGRAM=make + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} +@@ -423,6 +425,7 @@ set(TINYGETTEXT_PREFIX ${CMAKE_BINARY_DIR}/tinygettext/) + ExternalProject_Add(tinygettext + SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/tinygettext/" + CMAKE_ARGS ++ -DCMAKE_MAKE_PROGRAM=make + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} +@@ -454,6 +457,7 @@ set(SDL_TTF_PREFIX ${CMAKE_BINARY_DIR}/SDL_ttf/) + ExternalProject_Add(SDL_ttf + SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/SDL_ttf/" + CMAKE_ARGS ++ -DCMAKE_MAKE_PROGRAM=make + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} + -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} + -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} +-- +2.20.1 + diff --git a/recipes-games/supertux/files/0003-pass-compile-flags-to-external-projects.patch b/recipes-games/supertux/files/0003-pass-compile-flags-to-external-projects.patch deleted file mode 100644 index 8186fa6..0000000 --- a/recipes-games/supertux/files/0003-pass-compile-flags-to-external-projects.patch +++ /dev/null @@ -1,87 +0,0 @@ -From cfe8277b69aedf2ed9ae2befbae72aa22d312c41 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 19 Oct 2016 15:41:56 +0200 -Subject: [PATCH 1/2] pass compile flags to external projects -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In sysrooted environments (e.g yocto cross envirnomen we get strange errors -without passing the flags: - - make[4]: Entering directory - '/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/supertux2/0.5.0-r0/build/tinygettext-prefix/src/tinygettext-build/CMakeFiles/CMakeTmp' - - Building C object CMakeFiles/cmTC_cad2b.dir/testCCompiler.c.o - - /home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux/usr/bin/arm-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-gcc - -O2 -pipe -g -feliminate-unused-debug-types - -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/supertux2/0.5.0-r0=/usr/src/debug/supertux2/0.5.0-r0 - -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux= - -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/sysroots/raspberrypi2= - -o CMakeFiles/cmTC_cad2b.dir/testCCompiler.c.o -c - /home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/supertux2/0.5.0-r0/build/tinygettext-prefix/src/tinygettext-build/CMakeFiles/CMakeTmp/testCCompiler.c - - Linking C executable cmTC_cad2b - - /home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux/usr/bin/cmake -E - cmake_link_script CMakeFiles/cmTC_cad2b.dir/link.txt --verbose=1 - - /home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux/usr/bin/arm-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-gcc - -O2 -pipe -g -feliminate-unused-debug-types - -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/work/cortexa7t2hf-neon-vfpv4-angstrom-linux-gnueabi/supertux2/0.5.0-r0=/usr/src/debug/supertux2/0.5.0-r0 - -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux= - -fdebug-prefix-map=/home/superandy/tmp/oe-core-glibc/sysroots/raspberrypi2= - -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed - CMakeFiles/cmTC_cad2b.dir/testCCompiler.c.o -o cmTC_cad2b -rdynamic - - /home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux/usr/libexec/arm-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/6.2.0/ld: - error: cannot open crt1.o: No such file or directory - - /home/superandy/tmp/oe-core-glibc/sysroots/x86_64-linux/usr/libexec/arm-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/6.2.0/ld: - error: cannot open crti.o: No such file or directory - -... - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cf97246..045bfbd 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -198,7 +198,9 @@ IF(NOT USE_SYSTEM_PHYSFS) - SOURCE_DIR "${CMAKE_SOURCE_DIR}/external/physfs/" - CMAKE_ARGS - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -+ -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -DCMAKE_INSTALL_PREFIX=${PHYSFS_PREFIX} - -DLIB_SUFFIX=${LIB_SUFFIX} - -DPHYSFS_BUILD_SHARED=${PHYSFS_BUILD_SHARED} -@@ -330,7 +332,9 @@ ExternalProject_Add(squirrel - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -+ -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -DCMAKE_INSTALL_PREFIX=${SQUIRREL_PREFIX} - -DINSTALL_INC_DIR=include) - -@@ -365,7 +369,9 @@ ExternalProject_Add(tinygettext - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -+ -DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -+ -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS} - -DBUILD_SHARED_LIBS=OFF - -DHAVE_SDL=ON - -DCMAKE_INSTALL_PREFIX=${TINYGETTEXT_PREFIX} --- -2.5.5 - diff --git a/recipes-games/supertux/files/0004-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 deleted file mode 100644 index f571abd..0000000 --- a/recipes-games/supertux/files/0004-do-not-set-included-paths-as-system-causes-trouble-w.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 21c018a516a1d3299c26043d518fa627e9268dd6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 19 Oct 2016 15:53:44 +0200 -Subject: [PATCH 2/2] do not set included paths as system - causes trouble with - gcc-6 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fixes errors as: -| /home/superandy/tmp/oe-core-glibc/sysroots/raspberrypi2/usr/include/c++/6.2.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory -| #include_next - ^ -further information at [1] - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129 - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 28 ++++++++++++++-------------- - 1 file changed, 14 insertions(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 045bfbd..63e3072 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -119,7 +119,7 @@ ELSE(ENABLE_BOOST_STATIC_LIBS) - SET(Boost_USE_STATIC_LIBS FALSE) - ENDIF(ENABLE_BOOST_STATIC_LIBS) - FIND_PACKAGE(Boost REQUIRED COMPONENTS filesystem system date_time) --INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIR}) -+INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR}) - LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) - - IF(WIN32) -@@ -143,14 +143,14 @@ OPTION(GLBINDING_DEBUG_OUTPUT "Enable glbinding debug output for each called Ope - IF(ENABLE_OPENGL) - FIND_PACKAGE(OpenGL) - IF(OPENGL_FOUND) -- INCLUDE_DIRECTORIES(SYSTEM ${OPENGL_INCLUDE_DIR}) -+ INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) - SET(HAVE_OPENGL TRUE) - ENDIF(OPENGL_FOUND) - - IF(GLBINDING_ENABLED) - FIND_PACKAGE(GLBINDING REQUIRED) - IF(GLBINDING_FOUND) -- INCLUDE_DIRECTORIES(SYSTEM ${GLBINDING_INCLUDES}) -+ INCLUDE_DIRECTORIES(${GLBINDING_INCLUDES}) - ADD_DEFINITIONS(-DUSE_GLBINDING) - IF (GLBINDING_DEBUG_OUTPUT) - ADD_DEFINITIONS(-DUSE_GLBINDING_DEBUG_OUTPUT) -@@ -159,16 +159,16 @@ IF(ENABLE_OPENGL) - ELSE() - FIND_PACKAGE(GLEW REQUIRED) - IF(GLEW_FOUND) -- INCLUDE_DIRECTORIES(SYSTEM ${GLEW_INCLUDE_DIR}) -+ INCLUDE_DIRECTORIES(${GLEW_INCLUDE_DIR}) - ENDIF(GLEW_FOUND) - ENDIF() - ENDIF(ENABLE_OPENGL) - - FIND_PACKAGE(OpenAL REQUIRED) --INCLUDE_DIRECTORIES(SYSTEM ${OPENAL_INCLUDE_DIR}) -+INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR}) - - FIND_PACKAGE(OggVorbis REQUIRED) --INCLUDE_DIRECTORIES(SYSTEM ${VORBIS_INCLUDE_DIR}) -+INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR}) - - INCLUDE(CheckSymbolExists) - -@@ -218,19 +218,19 @@ IF(NOT USE_SYSTEM_PHYSFS) - SET(PHYSFS_INCLUDE_DIR "${PHYSFS_PREFIX}/include/") - ENDIF() - --INCLUDE_DIRECTORIES(BEFORE SYSTEM ${PHYSFS_INCLUDE_DIR}) -+INCLUDE_DIRECTORIES(BEFORE ${PHYSFS_INCLUDE_DIR}) - - - ## The curl headers are in the standard include path in dependencies - ## so it's not required to add them here - FIND_PACKAGE(CURL REQUIRED) - IF(CURL_FOUND) -- INCLUDE_DIRECTORIES(SYSTEM ${CURL_INCLUDE_DIR}) -+ INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR}) - SET(HAVE_LIBCURL TRUE) - ENDIF(CURL_FOUND) - - #FIND_PACKAGE(ICONV REQUIRED) --#INCLUDE_DIRECTORIES(SYSTEM ${ICONV_INCLUDE_DIR}) -+#INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) - #LINK_LIBRARIES(${ICONV_LIBRARY}) - - IF(EXISTS "${CMAKE_SOURCE_DIR}/.git") -@@ -355,7 +355,7 @@ ELSE() - SET_TARGET_PROPERTIES(sqstdlib_lib PROPERTIES IMPORTED_LOCATION "${SQUIRREL_PREFIX}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}sqstdlib_static${CMAKE_STATIC_LIBRARY_SUFFIX}") - ENDIF() - --INCLUDE_DIRECTORIES(SYSTEM ${SQUIRREL_PREFIX}/include) -+INCLUDE_DIRECTORIES(${SQUIRREL_PREFIX}/include) - - ## Also build external/tinygettext - -@@ -381,15 +381,15 @@ ExternalProject_Add(tinygettext - ADD_LIBRARY(tinygettext_lib STATIC IMPORTED) - SET_TARGET_PROPERTIES(tinygettext_lib PROPERTIES IMPORTED_LOCATION "${TINYGETTEXT_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_STATIC_LIBRARY_PREFIX}tinygettext${CMAKE_STATIC_LIBRARY_SUFFIX}") - --INCLUDE_DIRECTORIES(SYSTEM ${TINYGETTEXT_PREFIX}/include) -+INCLUDE_DIRECTORIES(${TINYGETTEXT_PREFIX}/include) - - ## Some additional include paths - - include_directories(${CMAKE_BINARY_DIR}/) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/) --include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/) --include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/) --include_directories(SYSTEM ${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/) -+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/sexp-cpp/include/) - - IF(WIN32) - ADD_DEFINITIONS(-D_USE_MATH_DEFINES -DNOMINMAX) --- -2.5.5 - diff --git a/recipes-games/supertux/supertux2_0.5.1.bb b/recipes-games/supertux/supertux2_0.6.0.bb similarity index 69% rename from recipes-games/supertux/supertux2_0.5.1.bb rename to recipes-games/supertux/supertux2_0.6.0.bb index bfa7408..1c71872 100644 --- a/recipes-games/supertux/supertux2_0.5.1.bb +++ b/recipes-games/supertux/supertux2_0.6.0.bb @@ -1,14 +1,15 @@ +SUMMARY = "SuperTux is a classic 2D jump'n run sidescroller game" DESCRIPTION = "SuperTux is a classic 2D jump'n run sidescroller game in a style similar to the original Super Mario games covered under the GPL" HOMEAPAGE = "http://supertux.lethargik.org" SECTION = "x11/application" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d32239bcb673463ab874e80d47fae504" -DEPENDS = "boost libsdl2 libsdl2-image libvorbis curl openal-soft physfs glew" +DEPENDS = "boost libsdl2 libsdl2-image libvorbis curl openal-soft physfs glew freetype" # somehow boost is not dragged in RDEPENDS_${PN} += "boost" -inherit cmake +inherit cmake pkgconfig gtk-icon-cache # With Ninja it fails with: # ninja: error: 'squirrel/lib/libsquirrel_static.a', needed by 'supertux2', missing and no known rule to make it @@ -17,18 +18,17 @@ 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 \ - 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 \ + file://0002-do-not-set-included-paths-as-system-causes-trouble-w.patch \ + file://0003-Set-DCMAKE_MAKE_PROGRAM-make-explicitly-for-external.patch \ " -SRC_URI[md5sum] = "b8b678362e3c5c9e366fb1fb3550a2e0" -SRC_URI[sha256sum] = "c9dc3b42991ce5c5d0d0cb94e44c4ec2373ad09029940f0e92331e7e9ada0ac5" +SRC_URI[md5sum] = "00514b8042d26a4ff7806b8d282c9a6b" +SRC_URI[sha256sum] = "c4c3e5fa6f90e87b8c5ad6b22a179e9a9839bf997e7f219e22bbcd1c97223ac0" S = "${WORKDIR}/SuperTux-v${PV}-Source" EXTRA_OECMAKE = "-DINSTALL_SUBDIR_BIN=bin -DCMAKE_BUILD_TYPE=RELEASE" FILES_${PN} += " \ - ${datadir}/appdata \ + ${datadir}/metainfo \ ${datadir}/games/supertux2 \ "