mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-29 14:16:31 +00:00
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>
This commit is contained in:
Olivier Schonken
Peter Korsgaard
parent
5a6a18f07c
commit
3800932386
@ -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 =
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -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;
|
|
||||||
|
|
||||||
@ -1,2 +1,2 @@
|
|||||||
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.5.tar.gz.sig
|
# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.6.tar.gz.sig
|
||||||
sha256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SDL2-2.0.5.tar.gz
|
sha256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df SDL2-2.0.6.tar.gz
|
||||||
|
|||||||
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
SDL2_VERSION = 2.0.5
|
SDL2_VERSION = 2.0.6
|
||||||
SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
|
SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz
|
||||||
SDL2_SITE = http://www.libsdl.org/release
|
SDL2_SITE = http://www.libsdl.org/release
|
||||||
SDL2_LICENSE = Zlib
|
SDL2_LICENSE = Zlib
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user