wesnoth: upgrade 1.10.7 -> 1.14.4

* they moved to SDL2 - necessary recipies are in meta-oe master * it seems editor is gone * run tested on sumo / build tested on amster Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-08-26 22:23:10 +02:00
parent 17a6c1ae80
commit 2b4316c190
3 changed files with 73 additions and 28 deletions
--- a/recipes-games/wesnoth/files/0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch
+++ b/recipes-games/wesnoth/files/0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch
@@ -1,6 +1,6 @@
 From 84ab712dfa56afbec12d0d96332d1aa1cc7ea399 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
-Date: Sun, 17 Dec 2017 16:00:18 +0100
+Date: Sun, 26 Aug 2018 21:39:47 +0200
 Subject: [PATCH] Find sdl CFLAGS with pkg-config - sdl-config is not usable
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -14,20 +14,20 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3764aad..e08acdb 100644
+index f5c0df9..1026001 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -33,8 +33,8 @@ find_package(X11)
+@@ -71,8 +71,8 @@ find_package(Gettext)
+ find_package(X11)
 
- if(NOT MSVC)
- 	#needed to get some SDL defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
-	set(SDL_CONFIG "sdl-config" CACHE STRING "Path to sdl-config script")
-	exec_program(${SDL_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL_CFLAGS)
-+	set(SDL_CONFIG "pkg-config" CACHE STRING "Path to sdl-config script")
-+	exec_program(${SDL_CONFIG} ARGS "sdl --cflags" OUTPUT_VARIABLE SDL_CFLAGS)
- 	add_definitions(${SDL_CFLAGS})
+ # needed to get some SDL2 defines in... (as of rev31694 -D_GNU_SOURCE=1 is required!)
+-set(SDL2_CONFIG "sdl2-config" CACHE STRING "Path to sdl2-config script")
+-exec_program(${SDL2_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE SDL2_CFLAGS)
+set(SDL_CONFIG "pkg-config" CACHE STRING "Path to sdl-config script")
+exec_program(${SDL_CONFIG} ARGS "sdl --cflags" OUTPUT_VARIABLE SDL_CFLAGS)
+ add_definitions(${SDL2_CFLAGS})
 
- 	# Use the safer `mkstemp' instead of `tmpnam' on POSIX systems.
+ if(NOT WIN32)
 -- 
-2.9.5
+2.14.4

--- a/recipes-games/wesnoth/files/0002-Do-not-do-the-ar-ranlib-configure-dance-it-won-t-wor.patch
+++ b/recipes-games/wesnoth/files/0002-Do-not-do-the-ar-ranlib-configure-dance-it-won-t-wor.patch
@@ -0,0 +1,49 @@
+From 5440f7ed37c8f3b170fda2a3b9e144cbb1291383 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Sun, 26 Aug 2018 21:59:24 +0200
+Subject: [PATCH] Do not do the ar/ranlib configure dance - it won't work in
+ oe-cross environment
+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@gmail.com>
+---
+ CMakeLists.txt | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1026001..15ad0bb 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -372,25 +372,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ 	endif(ENABLE_LTO)
+ endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ 
+-# 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)
+-else()
+-	MESSAGE("Using ar, ranlib, and default linker")
+-	find_program(NON_LTO_AR NAMES ar)
+-	find_program(NON_LTO_RANLIB NAMES ranlib)
+-	set(CMAKE_AR "${NON_LTO_AR}" CACHE STRING "Does not support LTO" FORCE)
+-	set(CMAKE_RANLIB "${NON_LTO_RANLIB}" CACHE STRING "Does not support 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}")
+-
+ # clean the pgo data
+ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${CMAKE_SOURCE_DIR}/pgo_data/")
+ 
+-- 
+2.14.4
+
--- a/recipes-games/wesnoth/wesnoth_1.14.4.bb
+++ b/recipes-games/wesnoth/wesnoth_1.14.4.bb
@@ -2,15 +2,16 @@ DESCRIPTION = "The Battle for Wesnoth is a turn-based strategy game with a fanta
 HOMEPAGE = "http://www.wesnoth.org/"
 SECTION = "games"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://copyright;md5=3cd35059318048afea9baa2fb45e339b"
+LIC_FILES_CHKSUM = "file://copyright;md5=794c9526b4086a97155c27908976bbfd"

-DEPENDS = "asio freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib boost pango libpng"
+DEPENDS = "asio freetype libsdl2-image libsdl2-mixer libsdl2-net libsdl2-ttf zlib boost pango libpng"

 SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"

 SRC_URI = " \
    ${SOURCEFORGE_MIRROR}/${PN}/${PN}-${SHRT_VER}/${P}/${P}.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 \
 "

 ARM_INSTRUCTION_SET = "arm"
@@ -18,7 +19,6 @@ ARM_INSTRUCTION_SET = "arm"
 inherit cmake pkgconfig

 EXTRA_OECMAKE = "\
-	-DENABLE_EDITOR=ON \
 	-DENABLE_LOW_MEM=ON \
 	-DENABLE_FRIBIDI=OFF \
 	\
@@ -26,7 +26,7 @@ EXTRA_OECMAKE = "\
 	-DENABLE_STRICT_COMPILATION=OFF \
 	"

-PACKAGES = "${PN}-editor ${PN}-doc ${PN}-music ${PN}-sounds \
+PACKAGES = "${PN}-doc ${PN}-music ${PN}-sounds \
 	${PN}-aoi ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l \
 	${PN}-nr ${PN}-sof ${PN}-sotbe ${PN}-thot ${PN}-trow \
 	${PN}-tsg ${PN}-tb ${PN}-utbs ${PN}-low\
@@ -37,7 +37,6 @@ PACKAGES = "${PN}-editor ${PN}-doc ${PN}-music ${PN}-sounds \
 	${PN}-server \
 	"

-DESCRIPTION_${PN}-editor = "Map Editor for The Battle for ${PN}"
 DESCRIPTION_${PN}-all = "The Battle for ${PN} with all campaigns, music and sounds"
 DESCRIPTION_${PN}-all-campaigns = "The Battle for ${PN} with all campaigns."
 DESCRIPTION_${PN}-sounds = "Optional sound package for The Battle for ${PN}"
@@ -48,7 +47,7 @@ DESCRIPTION_${PN}-server = "Optional Battle for Wesnoth server"
 ALLOW_EMPTY_${PN}-all-campaigns = "1"
 ALLOW_EMPTY_${PN}-all = "1"

-do_configure_prepend(){
+do_configure_prepend() {
 	export HOST_SYS="${HOST_SYS}"
 	export BUILD_SYS="${BUILD_SYS}"
 	export STAGING_LIBDIR="${STAGING_LIBDIR}"
@@ -56,6 +55,10 @@ do_configure_prepend(){
 	rm -f ${S}/cmake/FindBoost.cmake
 }

+do_configure_append() {
+    sed -i "s:isystem:I:g" ${B}/build.ninja
+}
+
 do_install_append() {
 	#ugly hack but otherwise it would have required to
 	#have MANDIR:STRING=share/man that would require a
@@ -72,8 +75,6 @@ RDEPENDS_${PN} = "${PN}-data tremor"

 RDEPENDS_${PN}-data = "bash python"

-RDEPENDS_${PN}-editor = "${PN}-data"
-
 RDEPENDS_${PN}-all-campaigns = "${PN} \
 	${PN}-aoi ${PN}-did ${PN}-ei ${PN}-httt ${PN}-l \
 	${PN}-nr ${PN}-sof ${PN}-sotbe ${PN}-thot ${PN}-trow \
@@ -104,6 +105,7 @@ FILES_${PN}-data = "\
 FILES_${PN} = "\
 	${bindir}/wesnoth \
 	${datadir}/icons \
+    ${datadir}/metainfo \
 	${datadir}/applications/wesnoth.desktop \
 	${datadir}/pixmaps/wesnoth-icon.png \
 "
@@ -118,12 +120,6 @@ FILES_${PN}-low ="\
       ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \
 "

-FILES_${PN}-editor = "\
-	${bindir}/wesnoth_editor \
-	${datadir}/applications/wesnoth_editor.desktop \
-	${datadir}/pixmaps/wesnoth_editor-icon.png \
-"
-
 FILES_${PN}-aoi = "\
 	${datadir}/wesnoth/data/campaigns/An_Orcish_Incursion \
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-aoi.mo \
@@ -189,5 +185,5 @@ FILES_${PN}-utbs = "\
 	${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-utbs.mo \
 "

-SRC_URI[md5sum] = "3f460a494530d32aa5d5d0f19c95efbd"
-SRC_URI[sha256sum] = "8a3b5a3409a57b646536e547094e1bb8bcd87797e00cd63184152222e377253e"
+SRC_URI[md5sum] = "b6b775109569c59a7aa8d6a7537b8694"
+SRC_URI[sha256sum] = "312dcd1d5f07eb85fdbe932c0e8727e2985bce0bd521a743f7bcddded15581c3"