From f1f18cea2328cfd8a1d05b07d87402af2415e6a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 17 Dec 2017 13:13:34 +0100 Subject: [PATCH 1/2] supertuxkart: update 0.9.2 -> 0.9.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While we are at it do major rework: * Fix LICENCE * Fix FILES * Select OpenGlesv2 by default - BSPs can ovveride this selection * Add wayland PACKAGECONFIG enabled by distro Signed-off-by: Andreas Müller --- .../supertuxkart/supertuxkart_0.9.2.bb | 17 ------- .../supertuxkart/supertuxkart_0.9.3.bb | 45 +++++++++++++++++++ 2 files changed, 45 insertions(+), 17 deletions(-) delete mode 100644 recipes-games/supertuxkart/supertuxkart_0.9.2.bb create mode 100644 recipes-games/supertuxkart/supertuxkart_0.9.3.bb diff --git a/recipes-games/supertuxkart/supertuxkart_0.9.2.bb b/recipes-games/supertuxkart/supertuxkart_0.9.2.bb deleted file mode 100644 index 4b1d092..0000000 --- a/recipes-games/supertuxkart/supertuxkart_0.9.2.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "SuperTuxKart is a kart racing game featuring Tux and his friends" -HOMEAPAGE = "http://supertuxkart.sourceforge.net" -SECTION = "x11/application" -LICENSE = "GPLv2 & GPLv3+ " -LIC_FILES_CHKSUM = "file://COPYING;md5=a71cb78659d60f2ced58a594cb65bfba" - -DEPENDS = "libogg libvorbis libxrandr virtual/libgl openal-soft fribidi curl libpng libjpeg-turbo freetype" - -inherit cmake - -SRC_URI = "http://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/${PV}/supertuxkart-${PV}-src.tar.xz;protocol=https \ -" - -SRC_URI[md5sum] = "f1f5081fd41b8eeb310b4edc07b9ee12" -SRC_URI[sha256sum] = "0b080bb098a26adb552d6fd48905bcb6b1e873ef1567457d7268d7d3aaa48282" - -FILES-${PN} += " /usr/share/icons /usr/share/appdata" diff --git a/recipes-games/supertuxkart/supertuxkart_0.9.3.bb b/recipes-games/supertuxkart/supertuxkart_0.9.3.bb new file mode 100644 index 0000000..b1e8ec2 --- /dev/null +++ b/recipes-games/supertuxkart/supertuxkart_0.9.3.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "SuperTuxKart is a kart racing game featuring Tux and his friends" +HOMEAPAGE = "http://supertuxkart.sourceforge.net" +SECTION = "x11/application" +LICENSE = "GPLv2 & GPLv3+ & CC-BY-SA-3.0 & PD" +LIC_FILES_CHKSUM = "file://COPYING;md5=b0e65d539fc395f6c95b79063eab9bb3" + +DEPENDS = " \ + libogg \ + libvorbis \ + libxrandr \ + virtual/libgles2 \ + openal-soft \ + fribidi \ + curl \ + libpng \ + libjpeg-turbo \ + freetype \ +" + +inherit cmake gtk-icon-cache distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = " \ + https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/${PV}/supertuxkart-${PV}-src.tar.xz \ +" + +SRC_URI[md5sum] = "8de5455b8fdbb92679e302b76c9041cf" +SRC_URI[sha256sum] = "d8014e7106ba84f98b5ec5f146249dcffc284fc4083f8f237ff420b9e2219cb0" + +# Give BSP the chance to override GL +SELECTGL ??= "-DUSE_GLES2=ON" + +EXTRA_OECMAKE = " \ + ${SELECTGL} \ +" +PACKAGECONFIG ??= " \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)} \ +" +PACKAGECONFIG[wayland] = "-DENABLE_WAYLAND_DEVICE=ON,-DENABLE_WAYLAND_DEVICE=OFF,wayland" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/appdata \ +" From ff091e73b6624edd6f9bd07e8cfec4c6552ad8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 17 Dec 2017 16:05:50 +0100 Subject: [PATCH 2/2] wesnoth: fix build for recent oe-core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * use pkg-config instead of sdl-config * fix package qa by adding bash and python to RDEPENDS * add ALLOW_EMPTY_${PN}-all-campaigns = "1" * fix wsnoth-sof: Sceptre_Of_Fire was renamed to Sceptre_of_Fire * fix wsnoth-thot: The_Hammer_Of_Thursagan was renamed to The_Hammer_of_Thursagan Signed-off-by: Andreas Müller --- ...with-pkg-config-sdl-config-is-not-us.patch | 33 +++++++++++++++++++ recipes-games/wesnoth/wesnoth_1.10.7.bb | 15 ++++++--- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 recipes-games/wesnoth/files/0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch diff --git 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 new file mode 100644 index 0000000..561dabd --- /dev/null +++ b/recipes-games/wesnoth/files/0001-Find-sdl-CFLAGS-with-pkg-config-sdl-config-is-not-us.patch @@ -0,0 +1,33 @@ +From 84ab712dfa56afbec12d0d96332d1aa1cc7ea399 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 17 Dec 2017 16:00:18 +0100 +Subject: [PATCH] Find sdl CFLAGS with pkg-config - sdl-config is not usable +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 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3764aad..e08acdb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,8 +33,8 @@ 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}) + + # Use the safer `mkstemp' instead of `tmpnam' on POSIX systems. +-- +2.9.5 + diff --git a/recipes-games/wesnoth/wesnoth_1.10.7.bb b/recipes-games/wesnoth/wesnoth_1.10.7.bb index 40b9bac..a2f8016 100644 --- a/recipes-games/wesnoth/wesnoth_1.10.7.bb +++ b/recipes-games/wesnoth/wesnoth_1.10.7.bb @@ -8,11 +8,14 @@ DEPENDS = "asio freetype libsdl-image libsdl-mixer libsdl-net libsdl-ttf zlib bo SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${SHRT_VER}/${P}/${P}.tar.bz2" +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 \ +" ARM_INSTRUCTION_SET = "arm" -inherit cmake +inherit cmake pkgconfig EXTRA_OECMAKE = "\ -DENABLE_EDITOR=ON \ @@ -42,6 +45,8 @@ DESCRIPTION_${PN}-music = "Optional music package for The Battle for ${PN}" DESCRIPTION_${PN}-data = "Mandatory data package for The Battle for ${PN}" DESCRIPTION_${PN}-server = "Optional Battle for Wesnoth server" +ALLOW_EMPTY_${PN}-all-campaigns = "1" + do_configure_prepend(){ export HOST_SYS="${HOST_SYS}" export BUILD_SYS="${BUILD_SYS}" @@ -64,6 +69,8 @@ do_install_append() { RDEPENDS_${PN} = "${PN}-data tremor" +RDEPENDS_${PN}-data = "bash python" + RDEPENDS_${PN}-editor = "${PN}-data" RDEPENDS_${PN}-all-campaigns = "${PN} \ @@ -147,7 +154,7 @@ FILES_${PN}-nr = "\ " FILES_${PN}-sof = "\ - ${datadir}/wesnoth/data/campaigns/Sceptre_Of_Fire \ + ${datadir}/wesnoth/data/campaigns/Sceptre_of_Fire \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-sof.mo \ " @@ -157,7 +164,7 @@ FILES_${PN}-sotbe = "\ " FILES_${PN}-thot = "\ - ${datadir}/wesnoth/data/campaigns/The_Hammer_Of_Thursagan \ + ${datadir}/wesnoth/data/campaigns/The_Hammer_of_Thursagan \ ${datadir}/wesnoth/translations/*/LC_MESSAGES/wesnoth-thot.mo \ "