zepto-forks/meta-games
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wesnoth: Update to stable 1.16.2

Browse Source 
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
Marko Lindqvist
2022-02-16 10:55:46 +02:00
parent 032d8b0c5e
commit a4082d0792
3 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
recipes-games/wesnoth/files/0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch
View File

@@ -9,25 +9,18 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index becfff5..c1f477e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,8 @@ find_package(X11)
# needed to get some SDL2 defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
if(NOT MINGW)
- set(SDL2_CONFIG "sdl2-config" CACHE STRING "Path to sdl2-config script")
- exec_program(${SDL2_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
+ set(SDL2_CONFIG "pkg-config" CACHE STRING "Path to sdl-config script")
+ exec_program(${SDL2_CONFIG} ARGS "sdl2 --cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
add_definitions(${SDL2_CFLAGS})
else()
# equivalent to sdl2-config --cflags --libs
--
2.30.2
diff -Nurd wesnoth-1.16.2/CMakeLists.txt wesnoth-1.16.2/CMakeLists.txt
--- wesnoth-1.16.2/CMakeLists.txt 2022-01-16 20:10:36.000000000 +0200
+++ wesnoth-1.16.2/CMakeLists.txt 2022-02-15 20:53:25.921752194 +0200
@@ -81,8 +81,8 @@
if(NOT WIN32)
# needed to get some SDL2 defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
if(NOT MINGW)
- set(SDL2_CONFIG "sdl2-config" CACHE STRING "Path to sdl2-config script")
- exec_program(${SDL2_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
+ set(SDL2_CONFIG "pkg-config" CACHE STRING "Path to sdl2-config script")
+ exec_program(${SDL2_CONFIG} ARGS "sdl2 --cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
add_definitions(${SDL2_CFLAGS})
else()
# equivalent to sdl2-config --cflags --libs

40
recipes-games/wesnoth/files/0002-Do-not-do-the-ar-ranlib-configure-dance-it-won-t-wor.patch
View File

@@ -10,30 +10,24 @@ Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
CMakeLists.txt | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1f477e..a8c5320 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -407,15 +407,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif(ENABLE_LTO)
endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
diff -Nurd wesnoth-1.16.2/CMakeLists.txt wesnoth-1.16.2/CMakeLists.txt
--- wesnoth-1.16.2/CMakeLists.txt 2022-02-15 20:58:36.302540566 +0200
+++ wesnoth-1.16.2/CMakeLists.txt 2022-02-15 21:00:50.488654972 +0200
@@ -360,16 +360,6 @@
endif()
endif()
-# set CMAKE_AR and CMAKE_RANLIB to use LTO-enabled variants if LTO is enabled
-if(ENABLE_LTO)
- MESSAGE("Using gcc-ar and gcc-ranlib")
- find_program(LTO_AR NAMES gcc-ar)
- find_program(LTO_RANLIB NAMES gcc-ranlib)
- set(CMAKE_AR "${LTO_AR}" CACHE STRING "Supports LTO" FORCE)
- set(CMAKE_RANLIB "${LTO_RANLIB}" CACHE STRING "Supports LTO" FORCE)
-endif()
-MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
- if(ENABLE_LTO)
- MESSAGE("Using gcc-ar and gcc-ranlib")
- find_program(LTO_AR NAMES gcc-ar)
- find_program(LTO_RANLIB NAMES gcc-ranlib)
- set(CMAKE_AR "${LTO_AR}" CACHE STRING "Supports LTO" FORCE)
- set(CMAKE_RANLIB "${LTO_RANLIB}" CACHE STRING "Supports LTO" FORCE)
- endif()
- MARK_AS_ADVANCED(LTO_AR LTO_RANLIB NON_LTO_AR NON_LTO_RANLIB)
-
# add in extra flags
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_RELEASE}")
--
2.30.2
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} ${LINK_EXTRA_FLAGS_CONFIG} ${LINK_EXTRA_FLAGS_RELEASE}")

4
recipes-games/wesnoth/wesnoth_1.15.12.bb → recipes-games/wesnoth/wesnoth_1.16.2.bb
View File

@@ -9,12 +9,12 @@ DEPENDS = "asio freetype libsdl2-image libsdl2-mixer libsdl2-net libsdl2-ttf zli
SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
SRC_URI = " \
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${BP}/${BP}.tar.bz2 \
${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}-${SHRT_VER}/${BP}/${BP}.tar.bz2 \
file://0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch \
file://0002-Do-not-do-the-ar-ranlib-configure-dance-it-won-t-wor.patch \
"
SRC_URI[sha256sum] = "bc591dda4b0f8ff013bb44baadfc622e81548ab6a8fa98d844908e435ccfb618"
SRC_URI[sha256sum] = "729fd0903a28af502240d08c0a27b9ff50e534677644b639d8fd33823a7a9799"
ARM_INSTRUCTION_SET = "arm"