[Buildroot] [PATCH 1/3] sdl2: Bump version to 2.0.6

[Buildroot] [PATCH 1/3] sdl2: Bump version to 2.0.6

[Olivier Schonken]

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 package/sdl2/sdl2.hash | 4 ++--
 package/sdl2/sdl2.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/sdl2/sdl2.hash b/package/sdl2/sdl2.hash
index d69d43811d..c0a8bfc77c 100644
--- a/package/sdl2/sdl2.hash
+++ b/package/sdl2/sdl2.hash
@@ -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
diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
index a0a4489677..e64628d0cd 100644
--- a/package/sdl2/sdl2.mk
+++ b/package/sdl2/sdl2.mk
@@ -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
-- 
2.11.0

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

[Olivier Schonken]

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 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

diff --git a/package/sdl2/0001-ppc.patch b/package/sdl2/0001-ppc.patch
deleted file mode 100644
index 0161103067..0000000000
--- a/package/sdl2/0001-ppc.patch
+++ /dev/null
@@ -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 <bernd.kuhls@t-online.de>
-
-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 =
-
-
-
-
diff --git a/package/sdl2/0002-gcc6.patch b/package/sdl2/0002-gcc6.patch
deleted file mode 100644
index 6b5e901dfe..0000000000
--- a/package/sdl2/0002-gcc6.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Sam Lantinga <slouken@libsdl.org>
-# Date 1479201270 28800
-# Node ID ea44906e19b837f4d5b309525ca79ed9d00b1897
-# Parent  6b2307dbec54f0bf4d5d8abf86241e29f3a03562
-Fixed bug 3490 - Build failure with --enable-video-directfb
-
-felix
-
-Building SDL 2.0.5, or even the Mercurial snapshot (r10608) with GCC 6.2.1 and --enable-video-directfb generates a number of compiler diagnostics and fails.
-
-Downloaded from upstream repo
-https://hg.libsdl.org/SDL/rev/ea44906e19b8
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_render.c
---- a/src/video/directfb/SDL_DirectFB_render.c	Tue Nov 15 01:12:27 2016 -0800
-+++ b/src/video/directfb/SDL_DirectFB_render.c	Tue Nov 15 01:14:30 2016 -0800
-@@ -1273,7 +1273,7 @@
-                      Uint32 format, void * pixels, int pitch)
- {
-     Uint32 sdl_format;
--    void * laypixels;
-+    unsigned char* laypixels;
-     int laypitch;
-     DFBSurfacePixelFormat dfb_format;
-     DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata;
-@@ -1303,7 +1303,7 @@
-     SDL_Window *window = renderer->window;
-     SDL_DFB_WINDOWDATA(window);
-     Uint32 sdl_format;
--    void * laypixels;
-+    unsigned char* laypixels;
-     int laypitch;
-     DFBSurfacePixelFormat dfb_format;
- 
-diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_shape.c
---- a/src/video/directfb/SDL_DirectFB_shape.c	Tue Nov 15 01:12:27 2016 -0800
-+++ b/src/video/directfb/SDL_DirectFB_shape.c	Tue Nov 15 01:14:30 2016 -0800
-@@ -37,17 +37,19 @@
- SDL_WindowShaper*
- DirectFB_CreateShaper(SDL_Window* window) {
-     SDL_WindowShaper* result = NULL;
-+    SDL_ShapeData* data;
-+    int resized_properly;
- 
-     result = malloc(sizeof(SDL_WindowShaper));
-     result->window = window;
-     result->mode.mode = ShapeModeDefault;
-     result->mode.parameters.binarizationCutoff = 1;
-     result->userx = result->usery = 0;
--    SDL_ShapeData* data = SDL_malloc(sizeof(SDL_ShapeData));
-+    data = SDL_malloc(sizeof(SDL_ShapeData));
-     result->driverdata = data;
-     data->surface = NULL;
-     window->shaper = result;
--    int resized_properly = DirectFB_ResizeWindowShape(window);
-+    resized_properly = DirectFB_ResizeWindowShape(window);
-     SDL_assert(resized_properly == 0);
- 
-     return result;
-
-- 
2.11.0

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

[Olivier Schonken]

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
---
 package/sdl2/Config.in | 7 +++++++
 package/sdl2/sdl2.mk   | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in
index a2971edc89..f29b3c7c38 100644
--- a/package/sdl2/Config.in
+++ b/package/sdl2/Config.in
@@ -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
diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk
index e64628d0cd..facb41e527 100644
--- a/package/sdl2/sdl2.mk
+++ b/package/sdl2/sdl2.mk
@@ -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))
-- 
2.11.0

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

[Thomas Petazzoni]

Hello,

On Tue, 26 Sep 2017 16:47:22 +0200, Olivier Schonken wrote:
> Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

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

[Thomas Petazzoni]

Hello,

On Tue, 26 Sep 2017 16:47:23 +0200, Olivier Schonken wrote:

> +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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

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

[Olivier Schonken]

Hi

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

Regards

Olivier

On 26 September 2017 at 17:07, Thomas Petazzoni <
thomas.petazzoni@free-electrons.com> wrote:

> Hello,
>
> On Tue, 26 Sep 2017 16:47:23 +0200, Olivier Schonken wrote:
>
> > +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
> --
> 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>

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

[Arnout Vandecappelle]

On 26-09-17 17:10, Olivier Schonken wrote:
> 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]

-- 
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

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

[Thomas Petazzoni]

Hello,

On Tue, 26 Sep 2017 21:36:40 +0200, Arnout Vandecappelle wrote:

>  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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

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

[Arnout Vandecappelle]

On 26-09-17 21:42, Thomas Petazzoni wrote:
> Hello,
> 
> On Tue, 26 Sep 2017 21:36:40 +0200, Arnout Vandecappelle wrote:
> 
>>  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.

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

 Regards,
 Arnout

-- 
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