From: Jan Palus Date: Wed, 31 Oct 2018 19:06:05 +0000 (+0100) Subject: up to 2.0.9 X-Git-Tag: auto/th/SDL2-2.0.9-1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=f5b3e9d01f0e13129293ecc60109d5a06dd5174d;p=packages%2FSDL2.git up to 2.0.9 --- diff --git a/SDL2.spec b/SDL2.spec index a884dc4..0458f6b 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -62,23 +62,21 @@ Summary: SDL (Simple DirectMedia Layer) - Game/Multimedia Library Summary(pl.UTF-8): SDL (Simple DirectMedia Layer) - Biblioteka do gier/multimediów Summary(zh_CN.UTF-8): SDL (Simple DirectMedia Layer) Generic APIs - 游戏/多媒体库 Name: SDL2 -Version: 2.0.8 -Release: 2 +Version: 2.0.9 +Release: 1 License: Zlib (BSD-like) Group: Libraries Source0: http://www.libsdl.org/release/%{name}-%{version}.tar.gz -# Source0-md5: 3800d705cef742c6a634f202c37f263f +# Source0-md5: f2ecfba915c54f7200f504d8b48a5dfe Patch0: %{name}-config.patch Patch1: %{name}-cflags.patch -Patch2: firewatch_fix.patch URL: http://www.libsdl.org/ %{?with_kms:BuildRequires: Mesa-libgbm-devel >= 9.0.0} -%{?with_wayland:BuildRequires: Mesa-libwayland-egl-devel} %{?with_directfb:BuildRequires: DirectFB-devel >= 1.0.0} %{?with_directfb:BuildRequires: FusionSound-devel >= 1.1.1} %{?with_gl:BuildRequires: OpenGL-GLX-devel} %{?with_gles:BuildRequires: OpenGLES-devel} -%{?with_alsa:BuildRequires: alsa-lib-devel >= 0.9.0} +%{?with_alsa:BuildRequires: alsa-lib-devel >= 1.0.11} %{?with_arts:BuildRequires: artsc-devel >= 1.1} BuildRequires: autoconf >= 2.59-9 BuildRequires: automake @@ -99,6 +97,7 @@ BuildRequires: tslib-devel BuildRequires: udev-devel # wayland-client, wayland-cursor %{?with_wayland:BuildRequires: wayland-devel} +%{?with_wayland:BuildRequires: wayland-egl-devel} BuildRequires: xorg-lib-libX11-devel BuildRequires: xorg-lib-libXScrnSaver-devel BuildRequires: xorg-lib-libXcursor-devel @@ -216,7 +215,6 @@ SDL - przykładowe programy. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__libtoolize} diff --git a/firewatch_fix.patch b/firewatch_fix.patch deleted file mode 100644 index f8aac36..0000000 --- a/firewatch_fix.patch +++ /dev/null @@ -1,84 +0,0 @@ - -# HG changeset patch -# User Ryan C. Gordon -# Date 1526575846 14400 -# Node ID 7babfecee045fac18d95e5936fede534ca54ed24 -# Parent 9e46f3dd75fd2e85e0e3ebb8a77329bc74a16e70 -dynapi: don't let system loader resolve the initializer to the wrong version. - -Fixes problems launching Firewatch on Linux (which statically links SDL but -also dynamically loads a system-wide copy from a plugin shared library) with -a newer SDL build. - -diff -r 9e46f3dd75fd -r 7babfecee045 src/dynapi/SDL_dynapi.c ---- a/src/dynapi/SDL_dynapi.c Fri May 11 09:37:00 2018 +0300 -+++ b/src/dynapi/SDL_dynapi.c Thu May 17 12:50:46 2018 -0400 -@@ -167,15 +167,10 @@ - #error Write me. - #endif - -- -- --/* Here's the exported entry point that fills in the jump table. */ --/* Use specific types when an "int" might suffice to keep this sane. */ --typedef Sint32 (SDLCALL *SDL_DYNAPI_ENTRYFN)(Uint32 apiver, void *table, Uint32 tablesize); --extern DECLSPEC Sint32 SDLCALL SDL_DYNAPI_entry(Uint32, void *, Uint32); -- --Sint32 --SDL_DYNAPI_entry(Uint32 apiver, void *table, Uint32 tablesize) -+/* we make this a static function so we can call the correct one without the -+ system's dynamic linker resolving to the wrong version of this. */ -+static Sint32 -+initialize_jumptable(Uint32 apiver, void *table, Uint32 tablesize) - { - SDL_DYNAPI_jump_table *output_jump_table = (SDL_DYNAPI_jump_table *) table; - -@@ -202,6 +197,18 @@ - } - - -+/* Here's the exported entry point that fills in the jump table. */ -+/* Use specific types when an "int" might suffice to keep this sane. */ -+typedef Sint32 (SDLCALL *SDL_DYNAPI_ENTRYFN)(Uint32 apiver, void *table, Uint32 tablesize); -+extern DECLSPEC Sint32 SDLCALL SDL_DYNAPI_entry(Uint32, void *, Uint32); -+ -+Sint32 -+SDL_DYNAPI_entry(Uint32 apiver, void *table, Uint32 tablesize) -+{ -+ return initialize_jumptable(apiver, table, tablesize); -+} -+ -+ - /* Obviously we can't use SDL_LoadObject() to load SDL. :) */ - /* Also obviously, we never close the loaded library. */ - #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) -@@ -260,7 +267,7 @@ - SDL_InitDynamicAPILocked(void) - { - const char *libname = SDL_getenv_REAL("SDL_DYNAMIC_API"); -- SDL_DYNAPI_ENTRYFN entry = SDL_DYNAPI_entry; /* funcs from here by default. */ -+ SDL_DYNAPI_ENTRYFN entry = NULL; /* funcs from here by default. */ - - if (libname) { - entry = (SDL_DYNAPI_ENTRYFN) get_sdlapi_entry(libname, "SDL_DYNAPI_entry"); -@@ -268,16 +275,15 @@ - /* !!! FIXME: fail to startup here instead? */ - /* !!! FIXME: definitely warn user. */ - /* Just fill in the function pointers from this library. */ -- entry = SDL_DYNAPI_entry; - } - } - -- if (entry(SDL_DYNAPI_VERSION, &jump_table, sizeof (jump_table)) < 0) { -+ if (!entry || (entry(SDL_DYNAPI_VERSION, &jump_table, sizeof (jump_table)) < 0)) { - /* !!! FIXME: fail to startup here instead? */ - /* !!! FIXME: definitely warn user. */ - /* Just fill in the function pointers from this library. */ -- if (entry != SDL_DYNAPI_entry) { -- if (!SDL_DYNAPI_entry(SDL_DYNAPI_VERSION, &jump_table, sizeof (jump_table))) { -+ if (!entry) { -+ if (!initialize_jumptable(SDL_DYNAPI_VERSION, &jump_table, sizeof (jump_table))) { - /* !!! FIXME: now we're screwed. Should definitely abort now. */ - } - } -