Skip to contentSkip to conversation

sdl2: Bump version to 2.0.6

PATCH Superseded Olivier Schonken 3 participants 9 messages Sep 26, 2017

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Olivier Schonken

author
#0 lore raw

PATCH 1/3 sdl2: Bump version to 2.0.6

Signed-off-by Olivier Schonken <[email protected]>
---
 package/sdl2/sdl2.hash | 4 ++--
 package/sdl2/sdl2.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/sdl2/sdl2.hash +2 -2
index d69d43811d..c0a8bfc77c 100644
@@ -1,2 +1,2 @@
-# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.5.tar.gz.sig
-sha256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785  SDL2-2.0.5.tar.gz
+# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.6.tar.gz.sig
+sha256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df  SDL2-2.0.6.tar.gz
package/sdl2/sdl2.mk +1 -1
index a0a4489677..e64628d0cd 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SDL2_VERSION = 2.0.5
+SDL2_VERSION = 2.0.6
 SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
 SDL2_SITE = http://www.libsdl.org/release
 SDL2_LICENSE = Zlib
Signature · 1 line
2.11.0
author
#1 lore raw

PATCH 2/3 sdl2: Remove patches that were merged upstream

Signed-off-by Olivier Schonken <[email protected]>
---
 package/sdl2/0001-ppc.patch  | 47 --------------------------------
 package/sdl2/0002-gcc6.patch | 64 --------------------------------------------
 2 files changed, 111 deletions(-)
 delete mode 100644 package/sdl2/0001-ppc.patch
 delete mode 100644 package/sdl2/0002-gcc6.patch
package/sdl2/0001-ppc.patch deleted +0 -47
deleted file mode 100644
index 0161103067..0000000000
@@ -1,47 +0,0 @@
-Fixed bug 3466 - Can't build 2.0.5 on ppc64
-
-/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32':
-/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c:127:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
-const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
-^ 
-
-Downloaded from upstream repo
-https://hg.libsdl.org/SDL/rev/5184186d4366
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-
-diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c
---- a/src/video/SDL_blit_N.c	Wed Oct 19 21:22:42 2016 -0700
-+++ b/src/video/SDL_blit_N.c	Sat Oct 22 11:01:55 2016 -0700
-@@ -118,12 +118,6 @@
-         16, 8, 0, 24,
-         0, NULL
-     };
--    if (!srcfmt) {
--        srcfmt = &default_pixel_format;
--    }
--    if (!dstfmt) {
--        dstfmt = &default_pixel_format;
--    }
-     const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00,
-                                                        0x04, 0x04, 0x04, 0x04,
-                                                        0x08, 0x08, 0x08, 0x08,
-@@ -136,6 +130,14 @@
-     Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift);
-     Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift);
-     Uint32 amask;
-+
-+    if (!srcfmt) {
-+        srcfmt = &default_pixel_format;
-+    }
-+    if (!dstfmt) {
-+        dstfmt = &default_pixel_format;
-+    }
-+
-     /* Use zero for alpha if either surface doesn't have alpha */
-     if (dstfmt->Amask) {
-         amask =
-
-
-
-
package/sdl2/0002-gcc6.patch deleted +0 -64

64 lines not on this page · raw message

Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/3 sdl2: Remove patches that were merged upstream

Hello,

Quoted 1 line · Olivier Schonken
Signed-off-by Olivier Schonken <[email protected]>

If those patches were merged in 2.0.6, then this patch should be squashed into the one doing the 2.0.6 bump.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#3 lore raw

PATCH 3/3 sdl2: Add KMS/DRM(experimental) video driver support

In reply to Olivier Schonken
Signed-off-by Olivier Schonken <[email protected]>
---
 package/sdl2/Config.in | 7 +++++++
 package/sdl2/sdl2.mk   | 7 +++++++
 2 files changed, 14 insertions(+)
package/sdl2/Config.in +7 -0
index a2971edc89..f29b3c7c38 100644
@@ -29,6 +29,13 @@ comment "X11 video driver needs X.org"
 	depends on !BR2_PACKAGE_XORG7
 	depends on BR2_USE_MMU
 
+config BR2_PACKAGE_SDL2_KMSDRM
+	bool "KMS/DRM video driver"
+	depends on BR2_PACKAGE_LIBDRM
+
+comment "KMS/DRM video driver needs libdrm"
+	depends on !BR2_PACKAGE_LIBDRM
+
 config BR2_PACKAGE_SDL2_OPENGL
 	bool "OpenGL (GLX)"
 	depends on BR2_PACKAGE_HAS_LIBGL
package/sdl2/sdl2.mk +7 -0
index e64628d0cd..facb41e527 100644
@@ -125,4 +125,11 @@ else
 SDL2_CONF_OPTS += --disable-alsa
 endif
 
+ifeq ($(BR2_PACKAGE_SDL2_KMSDRM),y)
+SDL2_DEPENDENCIES += libdrm
+SDL2_CONF_OPTS += --enable-video-kmsdrm
+else
+SDL2_CONF_OPTS += --disable-video-kmsdrm
+endif
+
 $(eval $(autotools-package))
Signature · 1 line
2.11.0
#4 lore raw

PATCH 3/3 sdl2: Add KMS/DRM(experimental) video driver support

Hello,

package/sdl2/Config.in comment "X11 video driver needs X.org" · line 34

Quoted 3 lines · Olivier Schonken
package/sdl2/Config.in +3 -0
+config BR2_PACKAGE_SDL2_KMSDRM
+	bool "KMS/DRM video driver"
+	depends on BR2_PACKAGE_LIBDRM

Please use a "select" here for libdrm. Don't forget to replicate the dependencies.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
author
#5 lore raw

PATCH 3/3 sdl2: Add KMS/DRM(experimental) video driver support

Hi

I tried to fit in with the style of the rest of the video drivers, should they then change as well?

Regards

Olivier

Quoted 11 lines · Thomas Petazzoni

Hello,

package/sdl2/Config.in comment "X11 video driver needs X.org" · line 34

Quoted 3 lines · Olivier Schonken
package/sdl2/Config.in +3 -0
+config BR2_PACKAGE_SDL2_KMSDRM
+     bool "KMS/DRM video driver"
+     depends on BR2_PACKAGE_LIBDRM

Please use a "select" here for libdrm. Don't forget to replicate the dependencies.

Quoted 8 lines

Best regards,

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

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170926/9fb17898/attachment.html>

#6 lore raw

PATCH 3/3 sdl2: Add KMS/DRM(experimental) video driver support

Quoted 4 lines · Olivier Schonken

Hi

I tried to fit in with the style of the rest of the video drivers, should they then change as well?

XORG7 is a special case, we never select it (and we assume it's obvious that
you need X to be able to use X stuff). But if you look at e.g. BR2_PACKAGE_SDL2_X11, it selects BR2_PACKAGE_XLIB_LIBX11 and BR2_PACKAGE_XLIB_LIBXEXT rather than depending on them.

BR2_PACKAGE_DIRECTFB should indeed be selected instead of depended on. That's
historical accident, because sdl2 was largely copied from sdl, and sdl had this construct since 2009 when there were no clear rules yet about select/depend.

Regards,
Arnout

[snip]

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
#7 lore raw

PATCH 3/3 sdl2: Add KMS/DRM(experimental) video driver support

Hello,

Quoted 8 lines · Arnout Vandecappelle

XORG7 is a special case, we never select it (and we assume it's obvious that
you need X to be able to use X stuff). But if you look at e.g. BR2_PACKAGE_SDL2_X11, it selects BR2_PACKAGE_XLIB_LIBX11 and BR2_PACKAGE_XLIB_LIBXEXT rather than depending on them.

BR2_PACKAGE_DIRECTFB should indeed be selected instead of depended on. That's
historical accident, because sdl2 was largely copied from sdl, and sdl had this construct since 2009 when there were no clear rules yet about select/depend.

For sdl2, it would be useful to look at the review discussion. I'm wondering if I didn't suggest to have a "depends on" for DirectFB, just for the sake of having something consistent between the different graphics backends. I don't remember.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#8 lore raw

PATCH 3/3 sdl2: Add KMS/DRM(experimental) video driver support

Quoted 9 lines · Thomas Petazzoni

Hello,

Quoted 5 lines · Arnout Vandecappelle

XORG7 is a special case, we never select it (and we assume it's obvious that
you need X to be able to use X stuff). But if you look at e.g. BR2_PACKAGE_SDL2_X11, it selects BR2_PACKAGE_XLIB_LIBX11 and BR2_PACKAGE_XLIB_LIBXEXT rather than depending on them.

Quoted 8 lines
Quoted 3 lines

BR2_PACKAGE_DIRECTFB should indeed be selected instead of depended on. That's
historical accident, because sdl2 was largely copied from sdl, and sdl had this construct since 2009 when there were no clear rules yet about select/depend.

For sdl2, it would be useful to look at the review discussion. I'm wondering if I didn't suggest to have a "depends on" for DirectFB, just for the sake of having something consistent between the different graphics backends. I don't remember.

Nope, it was like that in Guillaume's first submission and nobody commented on it.

Regards,
Arnout

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF