package/enet: new package
PATCH 1/3 package/enet: new package
enet will be used by supertuxkart 1.0.
---
Build tested with test-pkg -a
--- DEVELOPERS | 1 + package/Config.in | 1 + package/enet/Config.in | 16 ++++++++++++++++ package/enet/enet.hash | 3 +++ package/enet/enet.mk | 14 ++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/enet/Config.in create mode 100644 package/enet/enet.hash create mode 100644 package/enet/enet.mk
DEVELOPERS +1 -0
@@ -1916,6 +1916,7 @@ N: Romain Naour <[email protected]> F: package/aubio/ F: package/bullet/ F: package/efl/ +F: package/enet/ F: package/enlightenment/ F: package/flare-engine/ F: package/flare-game/
package/Config.in +1 -0
@@ -1532,6 +1532,7 @@ menu "Networking" source "package/czmq/Config.in" source "package/daq/Config.in" source "package/davici/Config.in" + source "package/enet/Config.in" source "package/filemq/Config.in" source "package/flickcurl/Config.in" source "package/fmlib/Config.in"
package/enet/Config.in new file +16 -0
@@ -0,0 +1,16 @@ +config BR2_PACKAGE_ENET + bool "enet" + help + ENet's purpose is to provide a relatively thin, simple + and robust network communication layer on top of UDP + (User Datagram Protocol).The primary feature it + provides is optional reliable, in-order delivery of + packets. + + ENet omits certain higher level networking features + such as authentication, lobbying, server discovery, + encryption, or other similar tasks that are + particularly application specific so that the library + remains flexible, portable, and easily embeddable. + + http://enet.bespin.org
package/enet/enet.hash new file +3 -0
@@ -0,0 +1,3 @@ +# Locally computed +sha256 98f6f57aab0a424469619ed3047728f0d3901ce8f0dea919c11e7966d807e870 enet-1.3.14.tar.gz +sha256 eebe647a9ef7e596b0e8b9216c215f169d762af1a27904a87bc2e05b83735d35 LICENSE
package/enet/enet.mk new file +14 -0
@@ -0,0 +1,14 @@ +################################################################################ +# +# enet +# +################################################################################ + +ENET_VERSION = 1.3.14 +ENET_SITE = http://enet.bespin.org/download +ENET_LICENSE = MIT +ENET_LICENSE_FILES = LICENSE + +ENET_INSTALL_STAGING = YES + +$(eval $(autotools-package))
Signature · 1 line
2.14.5
PATCH 2/3 package/libglew: bump to version 2.1.0
See 2.1.0 Change Log:
http://glew.sourceforge.net/log.html
---
supertuxkart needs glew >= 2.1.0.
--- package/libglew/libglew.hash | 9 +++++---- package/libglew/libglew.mk | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-)
package/libglew/libglew.hash +5 -4
@@ -1,5 +1,6 @@ -# From https://sourceforge.net/projects/glew/files/glew/2.0.0/ -sha1 6e15c84f7e1fad34cd3679f784a233744ddf048f glew-2.0.0.tgz -md5 2a2cd7c98f13854d2fcddae0d2b20411 glew-2.0.0.tgz +# From https://sourceforge.net/projects/glew/files/glew/2.1.0/ +sha1 18eca05460d0b61709fc115e632b6fe320718b44 glew-2.1.0.tgz +md5 b2ab12331033ddfaa50dc39345343980 glew-2.1.0.tgz # Locally computed: -sha256 c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764 glew-2.0.0.tgz +sha256 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95 glew-2.1.0.tgz +sha256 8991cd11befec7c6a63662700f03c0cc42e864b6e77c7e70b80297c951a7f0ff LICENSE.txt
package/libglew/libglew.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -LIBGLEW_VERSION = 2.0.0 +LIBGLEW_VERSION = 2.1.0 LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) LIBGLEW_LICENSE = BSD-3-Clause, MIT
Signature · 1 line
2.14.5
PATCH 3/3 package/supertuxkart: bump to version 1.0
In reply to Romain NaourRemove upstream patch 0001-Fix-3091.patch.
Add enet, libsquish and nettle new dependencies. Add host-pkgconf since the CMakeLists.txt now use pkg-config for enet.
Make sure that glew and wiiuse libraries from staging are used instead of bundled versions.
See:
http://blog.supertuxkart.net/2019/04/supertuxkart-10-release.html
--- package/supertuxkart/0001-Fix-3091.patch | 59 -------------------------------- package/supertuxkart/Config.in | 4 +++ package/supertuxkart/supertuxkart.hash | 8 ++--- package/supertuxkart/supertuxkart.mk | 13 +++++-- 4 files changed, 18 insertions(+), 66 deletions(-) delete mode 100644 package/supertuxkart/0001-Fix-3091.patch
package/supertuxkart/0001-Fix-3091.patch deleted +0 -59
@@ -1,59 +0,0 @@ -From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001 -From: Benau <[email protected]> -Date: Sun, 14 Jan 2018 10:19:37 +0800 -Subject: [PATCH] Fix #3091 - -Signed-off-by: Fabrice Fontaine <[email protected] -[Retrieved from: -https://github.com/supertuxkart/stk-code/commit/813b08bc73e4e93714b972ee56c64b4771735e01] ---- - lib/graphics_utils/mipmap/cpusimd.h | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/lib/graphics_utils/mipmap/cpusimd.h b/lib/graphics_utils/mipmap/cpusimd.h -index 1dc2c730b2..5e2cf30e5f 100644 ---- a/lib/graphics_utils/mipmap/cpusimd.h -+++ b/lib/graphics_utils/mipmap/cpusimd.h -@@ -38,11 +38,11 @@ - #include <mmintrin.h> - #define CPU_MMX_SUPPORT (1) - #endif --#if __SSE__ || _M_X64 || _M_IX86_FP >= 1 || CPU_ENABLE_SSE -+#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE - #include <xmmintrin.h> - #define CPU_SSE_SUPPORT (1) - #endif --#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2 || CPU_ENABLE_SSE2 -+#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2 - #include <emmintrin.h> - #define CPU_SSE2_SUPPORT (1) - #endif -@@ -95,23 +95,23 @@ - #define CPU_POPCNT_SUPPORT (1) - #endif - #if __LZCNT__ || CPU_ENABLE_LZCNT -- #include <lzcntintrin.h> -+ #include <x86intrin.h> - #define CPU_LZCNT_SUPPORT (1) - #endif - #if __F16C__ || CPU_ENABLE_F16C -- #include <f16cintrin.h> -+ #include <x86intrin.h> - #define CPU_F16C_SUPPORT (1) - #endif - #if __BMI__ || CPU_ENABLE_BMI -- #include <bmiintrin.h> -+ #include <x86intrin.h> - #define CPU_BMI_SUPPORT (1) - #endif - #if __BMI2__ || CPU_ENABLE_BMI2 -- #include <bmi2intrin.h> -+ #include <x86intrin.h> - #define CPU_BMI2_SUPPORT (1) - #endif - #if __TBM__ || CPU_ENABLE_TBM -- #include <tbmintrin.h> -+ #include <x86intrin.h> - #define CPU_TBM_SUPPORT (1) - #endif -
package/supertuxkart/Config.in +4 -0
@@ -10,12 +10,16 @@ config BR2_PACKAGE_SUPERTUXKART depends on BR2_PACKAGE_XORG7 depends on !BR2_TOOLCHAIN_USES_MUSL select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_ENET select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_LIBGLEW select BR2_PACKAGE_LIBGLU select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBSQUISH select BR2_PACKAGE_LIBVORBIS + select BR2_PACKAGE_NETTLE select BR2_PACKAGE_OPENAL select BR2_PACKAGE_XLIB_LIBXRANDR select BR2_PACKAGE_ZLIB
package/supertuxkart/supertuxkart.hash +4 -4
@@ -1,5 +1,5 @@ # Locally computed -sha256 d8014e7106ba84f98b5ec5f146249dcffc284fc4083f8f237ff420b9e2219cb0 supertuxkart-0.9.3-src.tar.xz -# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.3/ -sha1 2650ba20976472f10122a8600cc239507a9b6f24 supertuxkart-0.9.3-src.tar.xz -md5 8de5455b8fdbb92679e302b76c9041cf supertuxkart-0.9.3-src.tar.xz +sha256 6d88f43f0de5202766ba305c87e3d9843103e81d31b7193059286098d2a5d980 supertuxkart-1.0-src.tar.xz +# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/1.0/ +sha1 cd270c851c5b15fb69c6e78e9824d87187c1f801 supertuxkart-1.0-src.tar.xz +md5 3059ea9c146b50f40f2b59a606da0fc0 supertuxkart-1.0-src.tar.xz
package/supertuxkart/supertuxkart.mk +10 -3
@@ -4,7 +4,7 @@ # ################################################################################ -SUPERTUXKART_VERSION = 0.9.3 +SUPERTUXKART_VERSION = 1.0 SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION)
@@ -15,14 +15,19 @@ SUPERTUXKART_LICENSE = GPL-3.0+ SUPERTUXKART_LICENSE_FILES = COPYING SUPERTUXKART_DEPENDENCIES = \ + host-pkgconf \ freetype \ + enet \ jpeg \ libcurl \ libgl \ + libglew \ libglu \ libogg \ libpng \ + libsquish \ libvorbis \ + nettle \ openal \ xlib_libXrandr \ zlib
@@ -31,7 +36,9 @@ SUPERTUXKART_DEPENDENCIES = \ # the only user of the bundled libraries, turn off shared libraries entirely. # Disable In-game recorder (there is no libopenglrecorder package) SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \ - -DBUILD_RECORDER=OFF + -DBUILD_RECORDER=OFF \ + -DUSE_SYSTEM_GLEW=ON \ + -DUSE_SYSTEM_ENET=ON ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) SUPERTUXKART_DEPENDENCIES += libfribidi
@@ -42,7 +49,7 @@ endif ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) SUPERTUXKART_DEPENDENCIES += bluez5_utils -SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON +SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON -DUSE_SYSTEM_WIIUSE=ON else # Wiimote support relies on bluez5. SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF
Signature · 1 line
2.14.5
PATCH 1/3 package/enet: new package
In reply to Romain NaourQuoted 5 lines · On Mon, 22 Apr 2019 19:10:47 +0200 Romain Naour <[email protected]> wrote:
enet will be used by supertuxkart 1.0.
Signed-off-by Romain Naour <[email protected]>---
Build tested with test-pkg -a
Quoted 10 lines
--- DEVELOPERS | 1 + package/Config.in | 1 + package/enet/Config.in | 16 ++++++++++++++++ package/enet/enet.hash | 3 +++ package/enet/enet.mk | 14 ++++++++++++++ 5 files changed, 35 insertions(+) create mode 100644 package/enet/Config.in create mode 100644 package/enet/enet.hash create mode 100644 package/enet/enet.mk
Series applied. Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com