DEVELOPERS: add me for supertuxkart package

PATCH New Romain Naour 2 participants 7 messages Nov 29, 2017 – Dec 3, 2017

lore

Share & tools

lore

Romain Naour

author

2017-11-29 22:29 UTC #0 lore raw

PATCH 1/2 DEVELOPERS: add me for supertuxkart package

Signed-off-by Romain Naour <[email protected]>

---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)

DEVELOPERS +1 -0

index 35507de..ce19f32 100644
@@ -1427,6 +1427,7 @@ F:	package/physfs/
 F:	package/solarus/
 F:	package/stress-ng/
 F:	package/supertux/
+F:	package/supertuxkart/
 F:	package/terminology/
 F:	package/upower/
 F:	package/xenomai/

Signature · 1 line

2.9.5

Romain Naour

author

2017-11-29 22:29 UTC #1 lore raw

PATCH 2/2 package/supertuxkart: bump to 0.9.3

Remove upstream patches.

See: http://blog.supertuxkart.net/2017/11/supertuxkart-093-released.html

Signed-off-by Romain Naour <[email protected]>

---
 ...001-irrlicht-Get-rid-of-unprefixed-cflags.patch | 34 -------------------
 ...x-boolean-return-type-for-jpeglib-s-callb.patch | 39 ----------------------
 package/supertuxkart/supertuxkart.hash             |  8 ++---
 package/supertuxkart/supertuxkart.mk               |  6 ++--
 4 files changed, 8 insertions(+), 79 deletions(-)
 delete mode 100644 package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch
 delete mode 100644 package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch

package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch deleted +0 ~~-34~~

deleted file mode 100644
index 351b587..0000000
@@ -1,34 +0,0 @@
-From 73bed675202cf1f1c748540a4363d7d99e161dca Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <[email protected]>
-Date: Thu, 9 Jun 2016 18:58:51 -0300
-Subject: [PATCH 1/2] irrlicht: Get rid of unprefixed cflags
-
-Cross-building requires proper include paths. This commit
-removes the unprefixed -I/usr/X11R6/include in irrlicht cflags.
-
-Signed-off-by: Ezequiel Garcia <[email protected]>
----
-Fix sent upstream as part of pull:
-https://github.com/supertuxkart/stk-code/pull/2554
-
- lib/irrlicht/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt
-index 46d54008c291..5f4975e3a6f9 100644
---- a/lib/irrlicht/CMakeLists.txt
-+++ b/lib/irrlicht/CMakeLists.txt
-@@ -25,8 +25,8 @@ elseif(MINGW)
-   add_definitions(-D_IRR_STATIC_LIB_)
-   add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff
- else()
--  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
--  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing -I/usr/X11R6/include")
-+  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
-+  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3  -fno-exceptions  -fstrict-aliasing")
-   if(CMAKE_COMPILER_IS_GNUCC)
- 	  set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fexpensive-optimizations")
-   endif()
--- 
-2.9.0
-

package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch deleted +0 ~~-39~~

deleted file mode 100644
index 1a89bea..0000000
@@ -1,39 +0,0 @@
-From fe71624eb39e0bc302a7603c79503fb12667dc2b Mon Sep 17 00:00:00 2001
-From: Ezequiel Garcia <[email protected]>
-Date: Sun, 3 Jul 2016 15:16:59 -0300
-Subject: [PATCH 2/2] irrlicht: Fix boolean return type for jpeglib's callback
-
-Building on certain toolchains can fail due to returning an integer
-instead of TRUE. In any case, only {TRUE,FALSE} should be used
-as 'boolean' jpeglib type. Fix this by returning TRUE.
-
-  CImageLoaderJPG.cpp: In static member function 'static boolean
-  irr::video::CImageLoaderJPG::fill_input_buffer(j_decompress_ptr)':
-  CImageLoaderJPG.cpp:69:9: error: invalid conversion from 'int' to 'boolean'
-  [-fpermissive]
-
-Signed-off-by: Romain Naour <[email protected]>
-Signed-off-by: Ezequiel Garcia <[email protected]>
----
-Fix sent upstream as part of pull:
-https://github.com/supertuxkart/stk-code/pull/2554
-
- lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp b/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
-index 8fc5222a1e9b..1811f31dd28f 100644
---- a/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
-+++ b/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp
-@@ -66,7 +66,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo)
- boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo)
- {
- 	// DO NOTHING
--	return 1;
-+	return TRUE;
- }
- 
- 
--- 
-2.9.0
-

package/supertuxkart/supertuxkart.hash +4 -4

index 45ad8c5..4bba3f2 100644
@@ -1,5 +1,5 @@
 # Locally computed
-sha256	0b080bb098a26adb552d6fd48905bcb6b1e873ef1567457d7268d7d3aaa48282  supertuxkart-0.9.2-src.tar.xz
-# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2/
-sha1	df3805a8f9dc556a0fc5af44442dae8126db5d5a  supertuxkart-0.9.2-src.tar.xz
-md5	f1f5081fd41b8eeb310b4edc07b9ee12  supertuxkart-0.9.2-src.tar.xz
+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

package/supertuxkart/supertuxkart.mk +4 -2

index dc4b232..3775621 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SUPERTUXKART_VERSION = 0.9.2
+SUPERTUXKART_VERSION = 0.9.3
 SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz
 SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION)

@@ -29,7 +29,9 @@ SUPERTUXKART_DEPENDENCIES = \
 
 # Since supertuxkart is not installing libstkirrlicht.so, and since it is
 # the only user of the bundled libraries, turn off shared libraries entirely.
-SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF
+# Disable In-game recorder (there is no libopenglrecorder package)
+SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF \
+	-DBUILD_RECORDER=OFF
 
 ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y)
 SUPERTUXKART_DEPENDENCIES += libfribidi

Signature · 1 line

2.9.5

Thomas Petazzoni

2017-11-29 22:45 UTC #2 lore raw

PATCH 2/2 package/supertuxkart: bump to 0.9.3

Hello,

Quoted 5 lines · Romain Naour

Remove upstream patches.
See: http://blog.supertuxkart.net/2017/11/supertuxkart-093-released.html
Signed-off-by Romain Naour <[email protected]>

Quoted 8 lines

---
 ...001-irrlicht-Get-rid-of-unprefixed-cflags.patch | 34 -------------------
 ...x-boolean-return-type-for-jpeglib-s-callb.patch | 39 ----------------------
 package/supertuxkart/supertuxkart.hash             |  8 ++---
 package/supertuxkart/supertuxkart.mk               |  6 ++--
 4 files changed, 8 insertions(+), 79 deletions(-)
 delete mode 100644 package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch
 delete mode 100644 package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch

This doesn't apply to the next branch. Could you look why, and resend rebased on the next branch?

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Romain Naour

author

2017-11-29 22:54 UTC #3 lore raw

PATCH 2/2 package/supertuxkart: bump to 0.9.3

Hi Thomas,

Le 29/11/2017 ? 23:45, Thomas Petazzoni a ?crit?:

Quoted 17 lines

Hello,

Quoted 5 lines · Romain Naour

Remove upstream patches.
See: http://blog.supertuxkart.net/2017/11/supertuxkart-093-released.html
Signed-off-by Romain Naour <[email protected]>

Quoted 8 lines

---
 ...001-irrlicht-Get-rid-of-unprefixed-cflags.patch | 34 -------------------
 ...x-boolean-return-type-for-jpeglib-s-callb.patch | 39 ----------------------
 package/supertuxkart/supertuxkart.hash             |  8 ++---
 package/supertuxkart/supertuxkart.mk               |  6 ++--
 4 files changed, 8 insertions(+), 79 deletions(-)
 delete mode 100644 package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch
 delete mode 100644 package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch

Quoted 2 lines

This doesn't apply to the next branch. Could you look why, and resend rebased on the next branch?

This patch is based on the next branch, I think it's a patchwork issue (line ending)

http://code.bulix.org/j236x2-233444?raw

Sorry, I can't do anything.
The patch must be fixed while applying :-/

Best regards,
Romain

Quoted 5 lines

Thanks!
Thomas

Thomas Petazzoni

2017-12-03 22:20 UTC #4 lore raw

PATCH 2/2 package/supertuxkart: bump to 0.9.3

Hello,

Quoted 9 lines · Romain Naour

Quoted 2 lines
This doesn't apply to the next branch. Could you look why, and resend rebased on the next branch?
This patch is based on the next branch, I think it's a patchwork issue (line ending)
http://code.bulix.org/j236x2-233444?raw
Sorry, I can't do anything.
The patch must be fixed while applying :-/

Indeed, it was a line ending problem, so I've fixed up the patch.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2017-12-03 22:19 UTC #5 lore raw

PATCH 2/2 package/supertuxkart: bump to 0.9.3

In reply to Romain Naour

Hello,

Quoted 5 lines · Romain Naour

Remove upstream patches.
See: http://blog.supertuxkart.net/2017/11/supertuxkart-093-released.html
Signed-off-by Romain Naour <[email protected]>

Quoted 8 lines

---
 ...001-irrlicht-Get-rid-of-unprefixed-cflags.patch | 34 -------------------
 ...x-boolean-return-type-for-jpeglib-s-callb.patch | 39 ----------------------
 package/supertuxkart/supertuxkart.hash             |  8 ++---
 package/supertuxkart/supertuxkart.mk               |  6 ++--
 4 files changed, 8 insertions(+), 79 deletions(-)
 delete mode 100644 package/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch
 delete mode 100644 package/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch

Applied to master. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2017-11-29 22:44 UTC #6 lore raw

PATCH 1/2 DEVELOPERS: add me for supertuxkart package

In reply to Romain Naour

Hello,

Quoted 4 lines · Romain Naour

Signed-off-by Romain Naour <[email protected]>
---
 DEVELOPERS | 1 +
 1 file changed, 1 insertion(+)

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com