Commit graph

21 commits

Author SHA1 Message Date
Peter Thompson d114494456 sdl2: add upstream patch to fix DirectFB renderer handling
The configure script enables the DirectFB video driver, but forgets to
enable the renderer driver, causing SDL_CreateRenderer() to fail. Add an upstream patch to fix this.

[Peter: reword/extend commit text,
	add git formatted patch from https://github.com/spurious/SDL-mirror]
Signed-off-by: Peter Thompson <peter.macleod.thompson@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-09-02 00:12:04 +02:00
Baruch Siach 5a8f887e7a sdl2: update license file hash
Copyright year update.

Fixes:
http://autobuild.buildroot.net/results/2c8/2c865463a4b7524114518c04dce9c94252433460/

Cc: Guillaume Gardet <guillaume.gardet@oliseo.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-05-01 09:35:41 +02:00
Peter Korsgaard f26654596e sdl2: bump version to 2.0.8
Drop now upstreamed patch.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
2018-04-30 17:38:31 +02:00
Peter Seiderer 8778c90254 sdl2: rpi video support needs OpenGL ES
Fixes [1]:

  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c: In function 'RPI_Create':
  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c:126:39: error: 'RPI_GLES_DefaultProfileConfig' undeclared (first use in this function); did you mean 'RPI_GLES_DeleteContext'?
       device->GL_DefaultProfileConfig = RPI_GLES_DefaultProfileConfig;
                                         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                                         RPI_GLES_DeleteContext
  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c:126:39: note: each undeclared identifier is reported only once for each function it appears in
  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c: In function 'RPI_CreateWindow':
  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c:281:17: error: 'SDL_VideoDevice {aka struct SDL_VideoDevice}' has no member named 'egl_data'; did you mean 'gl_data'?
       if (!_this->egl_data) {
                   ^~~~~~~~
                   gl_data
  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c:286:10: error: 'SDL_WindowData {aka struct SDL_WindowData}' has no member named 'egl_surface'
       wdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) &wdata->dispman_window);
            ^~
  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c:286:26: warning: implicit declaration of function 'SDL_EGL_CreateSurface'; did you mean 'SDL_Vulkan_CreateSurface'? [-Wimplicit-function-declaration]
       wdata->egl_surface = SDL_EGL_CreateSurface(_this, (NativeWindowType) &wdata->dispman_window);
                            ^~~~~~~~~~~~~~~~~~~~~
                            SDL_Vulkan_CreateSurface
  .../build/sdl2-2.0.7/src/video/raspberry/SDL_rpivideo.c:288:14: error: 'SDL_WindowData {aka struct SDL_WindowData}' has no member named 'egl_surface'
       if (wdata->egl_surface == EGL_NO_SURFACE) {
                ^~

[1] http://autobuild.buildroot.net/results/9612d43b192bbb88214a11fe18f8b8da6ad10313

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-02-28 14:55:22 +01:00
Guillermo A. Amaral d2c6eaade1 package/sdl2: Remove trailing backslash
Left over from 9f8a6fdf9

Signed-off-by: Guillermo A. Amaral <g@maral.me>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2018-01-22 22:29:03 +01:00
Guillermo A. Amaral 9f8a6fdf99 package/sdl2: Fix Raspberry Pi support for SDL2
Tweak build system to play well with Buildroot.

Signed-off-by: Guillermo A. Amaral <g@maral.me>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2018-01-18 22:13:34 +01:00
Peter Korsgaard 07a9f0200c sdl2: security bump to version 2.0.7
Fixes CVE-2017-2888 - An exploitable integer overflow vulnerability exists
when creating a new RGB Surface in SDL 2.0.5.  A specially crafted file can
cause an integer overflow resulting in too little memory being allocated
which can lead to a buffer overflow and potential code execution.  An
attacker can provide a specially crafted image file to trigger this
vulnerability.

Also add a hash for the license file while we're at it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-10-27 13:48:45 +02:00
Peter Korsgaard 3a798acf23 sdl2: explicitly disable raspberry pi video backend
Fixes:
http://autobuild.buildroot.net/results/d59/d5992dcc9a49ee77afaebdcc9448ac1868fa7de1/
http://autobuild.buildroot.net/results/e89/e894f21ce1983ee3bd8d65a8e59e1adab9a62707/

The configure script automatically enables support for the raspberry pi
video backend if it detects the rpi-userland package.  Unfortunately it
hardcodes a number of include/linker paths unsuitable for cross compilation,
breaking the build:

    if test x$enable_video = xyes -a x$enable_video_rpi = xyes; then
..
     RPI_CFLAGS="-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux"
     RPI_LDFLAGS="-L/opt/vc/lib -lbcm_host"
    fi

So explicitly disable it until the configure script is fixed.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-10-26 14:08:55 +02:00
Olivier Schonken 0891510dc6 sdl2: add KMS/DRM video driver support
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-10-08 15:34:23 +02:00
Olivier Schonken 3800932386 sdl2: Bump version to 2.0.6
Bump version and remove patches that were merged upstream

Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2017-10-01 23:23:21 +02:00
Adam Duskett e2a7822415 package makefiles: clean up backslash spacing.
The check-package script when ran gave warnings on only using
one space before backslashes on all of these makefiles.
This patch cleans up all warnings related to the one space before
backslashes rule in the make files in the package directory.

Signed-off-by: Adam Duskett <aduskett@codeblue.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-22 15:57:23 +02:00
Romain Naour e53da0534a Revert "package/sdl2: disable altivec built-in function for PowerPC"
The bug discovered while packaging supertux is now fixed by the previous
patch but the issue can still be present in other C++11 package if
-std=c++11 is used on PPC with Altivec vectorization.

This reverts commit d2903aaf13.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-15 12:16:15 +02:00
Rahul Bedarkar 2093053106 packages: use SPDX short identifier for zlib license
We want to use SPDX identifier for license string as much as possible.
SPDX short identifier for zlib license is Zlib.

This change is done using following command.
find . -name "*.mk" | xargs sed -ri '/LICENSE( )?[\+:]?=/s/zlib( )?(license)?/Zlib/g'

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-04-01 15:35:02 +02:00
Romain Naour d2903aaf13 package/sdl2: disable altivec built-in function for PowerPC
As reported in this bug report [1], altivec support in SDL break
arbitrary C++ code.

Issue reported by test-pkg script while testing supertux package:
    error: could not convert 'true' from 'bool' to '__vector(4) __bool int'

[1] https://bugs.debian.org/cgi-bin/bugreport.cgi/?bug=770670

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Sam Bobroff <sam.bobroff@au1.ibm.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-03-01 21:54:25 +01:00
Romain Naour 8cdf3f7bcd package/sdl2: enable OpenGL ES support
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-26 21:05:42 +01:00
Romain Naour 739b66e8d9 package/sdl2: enable opengl support
OpenGl support mean GLX so it require X11 support.
Select automatically BR2_PACKAGE_SDL2_X11 to enable minimal X11
libraries support (libx11 and libxext).

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-02-26 21:05:09 +01:00
Guillaume GARDET e26fcb76b4 sdl2: X11 support depends on MMU (fork)
Fixes:

  http://autobuild.buildroot.net/results/2f7/2f738830bf98eb7284f99c11856a8694467b3daa

Signed-off-by: Guillaume GARDET <guillaume.gardet@oliseo.fr>
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2017-01-20 13:25:48 +11:00
Bernd Kuhls 4091d60557 package/sdl2: fix build with gcc6
Fixes
http://autobuild.buildroot.net/results/b99/b997c2b6307deb48a42e9b317715a00b65f90149/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Tested-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-12-27 17:58:54 +01:00
Bernd Kuhls ef8733ac7d package/sdl2: fix build error on powerpc/powerpc64
Fixes
http://autobuild.buildroot.net/results/ffd/ffd689f1ba34ad43f52c38fe37da393a9d8b9d5e/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Tested-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-12-27 17:58:37 +01:00
Bernd Kuhls 50d7bf868b package/sdl2: bump version to 2.0.5
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-12-22 10:29:25 +01:00
Guillaume GARDET a5c6ba4eec sdl2: new package
[Romain:
  - Wrap Config.in help text at 72 columns.
  - Move sdl2 package after sdl modules in Config.in. (Arnout)
  - Explicitly disable dbus and wayland.
  - Remove double underscore (SDL2__*).
  - Unify autotools options to use --enable/--disable.
  - Use x-includes and x-libraries to avoid path poisoning.
  - Remove xlib_libXrender, xproto_inputproto and xproto_scrnsaverproto
    dependencies since the build system doesn't depend on them.
  - Add Xlib_libXi, xlib_libScrnSaver and xlib_libXxf86vm dependencies.
  - Handle autotools options (--enable/--disable) for each X11
    dependencies.]

[Thomas:
  - Minor tweaks to Config.in
  - Addition of hash file.
  - Addition of SDL2_CONFIG_SCRIPTS, as suggested by Vincent Stehlé.]

Signed-off-by: Guillaume GARDET <guillaume.gardet@oliseo.fr>
Signed-off-by: Romain Naour <romain.naour@openwide.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Romain Naour <romain.naour@openwide.fr>
Cc: Yann E. Morin <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-10-21 23:26:58 +02:00