community/supertuxkart: upgrade to 1.2

3 files changed, 55 insertions, 6 deletions

diff --git a/community/supertuxkart/0001-network_config-use-ns_name_uncompress.patch b/community/supertuxkart/0001-network_config-use-ns_name_uncompress.patch
new file mode 100644
index 0000000000..dc11b31f98
--- /dev/null
+++ b/community/supertuxkart/0001-network_config-use-ns_name_uncompress.patch
@@ -0,0 +1,25 @@
+From fe82f77786d24b812b8d226195fdb196d8ecb35f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
+Date: Fri, 28 Aug 2020 19:30:38 -0300
+Subject: [PATCH] network_config: use ns_name_uncompress
+
+---
+ src/network/network_config.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network/network_config.cpp b/src/network/network_config.cpp
+index 605254808..d4e08cc5e 100644
+--- a/src/network/network_config.cpp
++++ b/src/network/network_config.cpp
+@@ -587,7 +587,7 @@ void NetworkConfig::fillStunList(std::vector<std::pair<std::string, int> >* l,
+         for (unsigned i = 0; i < srv.size(); i++)
+         {
+             char server_name[512] = {};
+-            if (ns_name_ntop(srv[i] + SRV_SERVER, server_name, 512) < 0)
++            if (ns_name_uncompress(response, response + response_len, srv[i] + SRV_SERVER, server_name, 512) < 0)
+                 continue;
+             uint16_t port = ns_get16(srv[i] + SRV_PORT);
+             uint16_t weight = ns_get16(srv[i] + SRV_WEIGHT);
+-- 
+2.28.0
+
diff --git a/community/supertuxkart/APKBUILD b/community/supertuxkart/APKBUILD
index e2c0131a93..d9c0d6b255 100644
--- a/community/supertuxkart/APKBUILD
+++ b/community/supertuxkart/APKBUILD
@@ -1,17 +1,20 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=supertuxkart
-pkgver=1.1
-pkgrel=2
+pkgver=1.2
+pkgrel=0
 arch="all"
 url="https://supertuxkart.net/"
 pkgdesc="Kart racing game featuring Tux and his friends"
 license="GPL-3.0-or-later"
 depends="$pkgname-data"
-makedepends="cmake glew-dev jpeg-dev libpng-dev libxrandr-dev wayland-dev libxkbcommon-dev bluez-dev openal-soft-dev libvorbis-dev freetype-dev fribidi-dev curl-dev harfbuzz-dev"
-source="$pkgname-$pkgver.tar.xz::https://downloads.sourceforge.net/supertuxkart/supertuxkart-$pkgver-src.tar.xz"
+makedepends="cmake glew-dev jpeg-dev libpng-dev libxrandr-dev wayland-dev libxkbcommon-dev bluez-dev openal-soft-dev libvorbis-dev freetype-dev fribidi-dev curl-dev harfbuzz-dev sdl2-dev"
+source="$pkgname-$pkgver.tar.xz::https://github.com/supertuxkart/stk-code/releases/download/$pkgver/SuperTuxKart-$pkgver-src.tar.xz
+        find-directfb-include.patch
+        0001-network_config-use-ns_name_uncompress.patch
+        "
 subpackages="$pkgname-static $pkgname-data::noarch"
-builddir="$srcdir/$pkgname-$pkgver-src"
+builddir="$srcdir/SuperTuxKart-$pkgver-src"
 
 prepare() {
         default_prepare
@@ -54,4 +57,6 @@ data() {
                 "$subpkgdir"/usr/share/supertuxkart
 }
 
-sha512sums="81d5ff59bb33eba8a00547239d54cacfde25eed0c56c857712a00a62032e4cf371cdd367159eaa4bfec6d4dd5781b705e41b58a26b864aa43678cfe9926bb804  supertuxkart-1.1.tar.xz"
+sha512sums="bc7079af9b3d85b3e4839ebb3eee293fb8bfe95450165172caa28b8ad1a9e97c59618d77c2208a86090f1840aa9a4b4b6898c1053fa6f5d7dfbfe17b69536835  supertuxkart-1.2.tar.xz
+fee686f8eaa72e0ed93c7bf38f2375b3206fcbb914af27228ae27d69311921dd4e43a4de4aed06903364bfeb63cbae344270f3556c553d497296296fb8d6f563  find-directfb-include.patch
+15c7c89a3e27164fba680b5e5a1fbcd751f5ea403774edd705601b78b0276b59720f8400e17de2741fe9367dac193bf2a05a8c4f2f94abe9d15b8231e6dbddf8  0001-network_config-use-ns_name_uncompress.patch"
diff --git a/community/supertuxkart/find-directfb-include.patch b/community/supertuxkart/find-directfb-include.patch
new file mode 100644
index 0000000000..e0b1f7a8df
--- /dev/null
+++ b/community/supertuxkart/find-directfb-include.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e4db9ca94..313ee4c9e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -295,11 +295,13 @@ if (NOT SERVER_ONLY)
+     # SDL2
+     find_library(SDL2_LIBRARY NAMES SDL2 libSDL2)
+     find_path(SDL2_INCLUDEDIR NAMES SDL.h PATH_SUFFIXES SDL2 include/SDL2 include PATHS)
++    find_path(DIRECTFB_INCLUDEDIR NAMES directfb.h directfb++.h PATH_SUFFIXES directfb include/directfb include PATHS)
+     if (NOT SDL2_LIBRARY OR NOT SDL2_INCLUDEDIR)
+         message(FATAL_ERROR "SDL2 not found. "
+             "SDL2 is required to handle gamepad in SuperTuxKart.")
+     else()
+-        include_directories("${SDL2_INCLUDEDIR}")
++        include_directories(${SDL2_INCLUDEDIR})
++       include_directories(${DIRECTFB_INCLUDEDIR})
+         MESSAGE(STATUS "Use system SDL2: ${SDL2_LIBRARY}")
+     endif()
+ endif()