@@ -15,14 +15,13 @@ config BR2_PACKAGE_SUPERTUXKART
select BR2_PACKAGE_HARFBUZZ
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_LIBCURL
- select BR2_PACKAGE_LIBFRIBIDI
- select BR2_PACKAGE_LIBGLEW
select BR2_PACKAGE_LIBOGG
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_LIBSQUISH
select BR2_PACKAGE_LIBVORBIS
- select BR2_PACKAGE_NETTLE if !BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_MBEDTLS if !BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_OPENAL
+ select BR2_PACKAGE_SDL2
select BR2_PACKAGE_XLIB_LIBXRANDR
select BR2_PACKAGE_ZLIB
select BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HID if BR2_PACKAGE_BLUEZ5_UTILS # runtime
@@ -1,8 +1,3 @@
# Locally computed
-sha256 e9b02b0b11ab68aacaec38306903feffe59a501224805cd3645cebf10e880ae8 supertuxkart-1.1-src.tar.xz
-# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/1.1/
-sha1 68be26f4b15d30dede26563cbcc6de999036c5e0 supertuxkart-1.1-src.tar.xz
-md5 731569c58428f32a0e46943fad7ba1e3 supertuxkart-1.1-src.tar.xz
-
-# Locally computed
+sha256 eeabeb0d9801688a218f6f0a76ea3546a46a322ccaca9a258148ecacfe083ffd SuperTuxKart-1.3-src.tar.xz
sha256 d27207a5213f746aac53893e9ecc18456e9595d3ffa662bd1ec9eb10787c214a COPYING
@@ -4,9 +4,11 @@
#
################################################################################
-SUPERTUXKART_VERSION = 1.1
-SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz
-SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION)
+SUPERTUXKART_VERSION = 1.3
+SUPERTUXKART_SOURCE = SuperTuxKart-$(SUPERTUXKART_VERSION)-src.tar.xz
+# Do not use the github helper here, the generated tarball is *NOT*
+# the same as the one uploaded by upstream for the release.
+SUPERTUXKART_SITE = https://github.com/supertuxkart/stk-code/releases/download/$(SUPERTUXKART_VERSION)
# Supertuxkart itself is GPL-3.0+, but it bundles a few libraries with different
# licenses. Irrlicht, bullet and angelscript have Zlib license, while glew is
@@ -21,14 +23,13 @@ SUPERTUXKART_DEPENDENCIES = \
harfbuzz \
jpeg \
libcurl \
- libfribidi \
libgl \
- libglew \
libogg \
libpng \
libsquish \
libvorbis \
openal \
+ sdl2 \
xlib_libXrandr \
zlib
@@ -37,7 +38,6 @@ SUPERTUXKART_DEPENDENCIES = \
# Disable In-game recorder (there is no libopenglrecorder package)
SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \
-DBUILD_RECORDER=OFF \
- -DUSE_SYSTEM_GLEW=ON \
-DUSE_SYSTEM_ENET=ON \
-DUSE_SYSTEM_SQUISH=ON
@@ -49,12 +49,12 @@ else
SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF
endif
-# Prefer openssl (the default) over nettle.
+# Prefer openssl (the default) over mbedtls
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SUPERTUXKART_DEPENDENCIES += openssl
SUPERTUXKART_CONF_OPTS += -DUSE_CRYPTO_OPENSSL=ON
else
-SUPERTUXKART_DEPENDENCIES += nettle
+SUPERTUXKART_DEPENDENCIES += mbedtls
SUPERTUXKART_CONF_OPTS += -DUSE_CRYPTO_OPENSSL=OFF
endif
Switch to github to download the release archive. Add sdl2 dependency added by [1]. Remove FriBidi dependency replaced by SheenBidi library (bundled) for better unicode support [2] [3]. Remove libglew removed by [4]. Replace MbedTLS instead of Nettle [5]. [1] https://github.com/supertuxkart/stk-code/commit/00cb6c2d480d99785f52e0352bc3a21a803a467d [2] https://github.com/supertuxkart/stk-code/commit/13db1b83c1e7160276c87b1faa8b573bb390cce3 [3] https://github.com/supertuxkart/stk-code/commit/dc0a5a9c661a676941d202500713a7d736071838 [4] https://github.com/supertuxkart/stk-code/commit/3f0eb215f73e4edf8a91309e6de6db926f8dfa54 [5] https://github.com/supertuxkart/stk-code/commit/d753393f4dcec79f2bd5a60a853247b9d854e240 Signed-off-by: Romain Naour <romain.naour@gmail.com> --- package/supertuxkart/Config.in | 5 ++--- package/supertuxkart/supertuxkart.hash | 7 +------ package/supertuxkart/supertuxkart.mk | 16 ++++++++-------- 3 files changed, 11 insertions(+), 17 deletions(-)