Skip to contentSkip to conversation

sdl2: Bump version to 2.0.6

PATCH New Olivier Schonken 3 participants 4 messages Oct 1, 2017 – Oct 8, 2017

lore
Share & tools
lore

Olivier Schonken

author
#0 lore raw

PATCH v2 1/2 sdl2: Bump version to 2.0.6

Bump version and remove patches that were merged upstream

Signed-off-by Olivier Schonken <[email protected]>

---
Changes v1 -> v2:
-Merged Version number bump and patch removal commits

 package/sdl2/0001-ppc.patch  | 47 --------------------------------
 package/sdl2/0002-gcc6.patch | 64 --------------------------------------------
 package/sdl2/sdl2.hash       |  4 +--
 package/sdl2/sdl2.mk         |  2 +-
 4 files changed, 3 insertions(+), 114 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

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 v2 2/2 sdl2: Add KMS/DRM(experimental) video driver support

Signed-off-by Olivier Schonken <[email protected]>

---
Changes v1 -> v2:
-Implementation stays same as other video drivers for now. If a cleanup
is required, that can be part of a larger effort touching other video drivers as well.

20170926144723.17619-1-olivier.schonken at gmail.com

 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
Applied
#2 lore raw

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

Hello,

Quoted 6 lines · Olivier Schonken
Signed-off-by Olivier Schonken <[email protected]>

---
Changes v1 -> v2:
-Implementation stays same as other video drivers for now. If a cleanup
is required, that can be part of a larger effort touching other video drivers as well.

Applied to master, thanks.

Thomas

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