From c123f13205659ffee3767b94ebbf88631e9b8a7ba4a145cc77d4f85e3da350d6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 9 Oct 2019 14:25:38 +0000 Subject: [PATCH 1/3] Accepting request 736688 from home:sndirsch:branches:games - sdl2-khronos.patch * fixes build on i586 (boo#1153455) OBS-URL: https://build.opensuse.org/request/show/736688 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=93 --- SDL2.changes | 6 ++++++ SDL2.spec | 1 + sdl2-khronos.patch | 15 +++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 sdl2-khronos.patch diff --git a/SDL2.changes b/SDL2.changes index 45114a6..c73b976 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Oct 9 13:34:31 UTC 2019 - Stefan Dirsch + +- sdl2-khronos.patch + * fixes build on i586 (boo#1153455) + ------------------------------------------------------------------- Fri Aug 23 11:19:59 UTC 2019 - Jan Engelhardt diff --git a/SDL2.spec b/SDL2.spec index 2d2e229..51e98ac 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -34,6 +34,7 @@ Source4: baselibs.conf Patch1: sdl2-symvers.patch Patch2: SDL2-endian.patch Patch3: CVE-2019-13616.patch +Patch4: sdl2-khronos.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ diff --git a/sdl2-khronos.patch b/sdl2-khronos.patch new file mode 100644 index 0000000..6735e10 --- /dev/null +++ b/sdl2-khronos.patch @@ -0,0 +1,15 @@ +diff -u -r SDL2-2.0.10.orig/include/SDL_opengl_glext.h SDL2-2.0.10/include/SDL_opengl_glext.h +--- SDL2-2.0.10.orig/include/SDL_opengl_glext.h 2019-10-09 15:30:46.237981000 +0200 ++++ SDL2-2.0.10/include/SDL_opengl_glext.h 2019-10-09 15:31:37.783940000 +0200 +@@ -469,8 +469,9 @@ + typedef long GLsizeiptr; + typedef long GLintptr; + #else +-typedef ptrdiff_t GLsizeiptr; +-typedef ptrdiff_t GLintptr; ++#include ++typedef khronos_ssize_t GLsizeiptr; ++typedef khronos_intptr_t GLintptr; + #endif + #define GL_BUFFER_SIZE 0x8764 + #define GL_BUFFER_USAGE 0x8765 From bd4110cc08fc8f614c615fa999830d2799c2bcc16f86ed120747c0e286d90e04 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 9 Oct 2019 14:28:30 +0000 Subject: [PATCH 2/3] add patch meta OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=94 --- sdl2-khronos.patch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sdl2-khronos.patch b/sdl2-khronos.patch index 6735e10..c484bc9 100644 --- a/sdl2-khronos.patch +++ b/sdl2-khronos.patch @@ -1,3 +1,7 @@ +From: sndirsch@suse.com +Date: 2019-10-09 14:00:03+0000 +References: https://bugzilla.opensuse.org/show_bug.cgi?id=1153455 + diff -u -r SDL2-2.0.10.orig/include/SDL_opengl_glext.h SDL2-2.0.10/include/SDL_opengl_glext.h --- SDL2-2.0.10.orig/include/SDL_opengl_glext.h 2019-10-09 15:30:46.237981000 +0200 +++ SDL2-2.0.10/include/SDL_opengl_glext.h 2019-10-09 15:31:37.783940000 +0200 From 8c238150764c7683f8d077ec3d69aefbbe95f505039a59926e7204bcbfc19add Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 9 Oct 2019 14:33:11 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=95 --- SDL2.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SDL2.changes b/SDL2.changes index c73b976..dcbfbce 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -2,7 +2,7 @@ Wed Oct 9 13:34:31 UTC 2019 - Stefan Dirsch - sdl2-khronos.patch - * fixes build on i586 (boo#1153455) + * fixes build on i586 (boo#1153455) ------------------------------------------------------------------- Fri Aug 23 11:19:59 UTC 2019 - Jan Engelhardt