From 2edad658dcbd5a5e12b3d32a7ed6c4b6f99cda39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 3 Sep 2019 00:18:02 +0200 Subject: [PATCH 1/3] wesnoth: upgrade 1.14.7 -> 1.15.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 1.14.7 was broken since boost 1.71 * build RelWithDebInfo instead of Debug target: reduce size and avoid already-stripped warnings * get rid of -isystem hack: it is not necessary anymore Signed-off-by: Andreas Müller --- .../{wesnoth_1.14.7.bb => wesnoth_1.15.1.bb} | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) rename recipes-games/wesnoth/{wesnoth_1.14.7.bb => wesnoth_1.15.1.bb} (92%) diff --git a/recipes-games/wesnoth/wesnoth_1.14.7.bb b/recipes-games/wesnoth/wesnoth_1.15.1.bb similarity index 92% rename from recipes-games/wesnoth/wesnoth_1.14.7.bb rename to recipes-games/wesnoth/wesnoth_1.15.1.bb index 835245d..1907414 100644 --- a/recipes-games/wesnoth/wesnoth_1.14.7.bb +++ b/recipes-games/wesnoth/wesnoth_1.15.1.bb @@ -9,13 +9,13 @@ DEPENDS = "asio freetype libsdl2-image libsdl2-mixer libsdl2-net libsdl2-ttf zli SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${SHRT_VER}/${BP}/${BP}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${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[md5sum] = "40ea96af963c1817f3b62e687031fa18" -SRC_URI[sha256sum] = "475e6ce3720edf76cfc3a9b9ac015067d473a46d164dcc4406b3c8f7d8dc5e48" +SRC_URI[md5sum] = "4d4a7ee12a97b774b6636b4856947938" +SRC_URI[sha256sum] = "854726ec68dcb26f78f65b01a90b3bc51fd985598e59c7cc2ef72999ff2366e8" ARM_INSTRUCTION_SET = "arm" @@ -25,7 +25,7 @@ EXTRA_OECMAKE = "\ -DENABLE_LOW_MEM=ON \ -DENABLE_FRIBIDI=OFF \ \ - -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DENABLE_STRICT_COMPILATION=OFF \ " @@ -58,10 +58,6 @@ 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 @@ -70,8 +66,8 @@ do_install_append() { mv ${D}${prefix}/man ${D}${mandir} fi - rm -Rf ${D}/run - rm -Rf ${D}/var + rm -Rf ${D}/run + rm -Rf ${D}/var } RDEPENDS_${PN} = "${PN}-data tremor" @@ -109,7 +105,7 @@ FILES_${PN} = "\ ${bindir}/wesnoth \ ${datadir}/icons \ ${datadir}/metainfo \ - ${datadir}/applications/wesnoth.desktop \ + ${datadir}/applications/org.wesnoth.Wesnoth.desktop \ ${datadir}/pixmaps/wesnoth-icon.png \ " From a13b28e440d9ef82845a65b0e9f26be5f5266b23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 10 Oct 2019 01:46:39 +0200 Subject: [PATCH 2/3] gnome-games: gnome.bbclass is gone we need to inherit gnomebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This just fixes parsing - was not build tested Signed-off-by: Andreas Müller --- recipes-games/gnome-games/gnome-chess_3.24.1.bb | 2 +- recipes-games/gnome-games/gnome-games_2.32.1.bb | 2 +- recipes-games/gnome-games/gnome-robots_3.22.1.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes-games/gnome-games/gnome-chess_3.24.1.bb b/recipes-games/gnome-games/gnome-chess_3.24.1.bb index 958c739..a10593e 100644 --- a/recipes-games/gnome-games/gnome-chess_3.24.1.bb +++ b/recipes-games/gnome-games/gnome-chess_3.24.1.bb @@ -7,7 +7,7 @@ DEPENDS = "libgames-support glib-2.0 gtk+3 librsvg libcanberra intltool-native i GNOME_COMPRESS_TYPE="xz" -inherit gnome gettext +inherit gnomebase gettext SRC_URI[archive.md5sum] = "56eaa655a7989fd04ce0de3c66c2d8f8" SRC_URI[archive.sha256sum] = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3" diff --git a/recipes-games/gnome-games/gnome-games_2.32.1.bb b/recipes-games/gnome-games/gnome-games_2.32.1.bb index 0c9c1da..9f4c711 100644 --- a/recipes-games/gnome-games/gnome-games_2.32.1.bb +++ b/recipes-games/gnome-games/gnome-games_2.32.1.bb @@ -7,7 +7,7 @@ DEPENDS = "glib-2.0 gtk+ cairo gstreamer librsvg python-pygtk libcanberra guile GNOME_COMPRESS_TYPE="bz2" -inherit gnome python-dir +inherit gnomebase python-dir SRC_URI += " \ file://0001-In-cross-environment-we-have-to-prepend-the-sysroot-.patch \ diff --git a/recipes-games/gnome-games/gnome-robots_3.22.1.bb b/recipes-games/gnome-games/gnome-robots_3.22.1.bb index 7405571..223c031 100644 --- a/recipes-games/gnome-games/gnome-robots_3.22.1.bb +++ b/recipes-games/gnome-games/gnome-robots_3.22.1.bb @@ -7,7 +7,7 @@ DEPENDS = "libgnome-games-support glib-2.0 gtk+3 librsvg libcanberra intltool-na GNOME_COMPRESS_TYPE="xz" -inherit gnome +inherit gnomebase SRC_URI[archive.md5sum] = "adc8b1ddfff21e344eb461db0785eb08" SRC_URI[archive.sha256sum] = "5cd4564d7eb876fe4ef332dc568bcf7b1515d8ec9f66e53c2bae5331e0182dd4" From d91a5205e0c628b24a2c30e42b882f0d0f4d44a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 10 Oct 2019 01:49:00 +0200 Subject: [PATCH 3/3] Mark zeus as compatible release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/layer.conf b/conf/layer.conf index 28daae2..26606b6 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,4 +8,4 @@ BBFILE_COLLECTIONS += "games-layer" BBFILE_PATTERN_games-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_games-layer = "15" -LAYERSERIES_COMPAT_games-layer = "rocko sumo thud warrior" +LAYERSERIES_COMPAT_games-layer = "rocko sumo thud warrior zeus"