Accepting request 619462 from games
OBS-URL: https://build.opensuse.org/request/show/619462 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL2?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3801ff1c20
84
7babfecee045.patch
Normal file
84
7babfecee045.patch
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
|
||||||
|
# HG changeset patch
|
||||||
|
# User Ryan C. Gordon <icculus@icculus.org>
|
||||||
|
# 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. */
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
191
SDL2-endian.patch
Normal file
191
SDL2-endian.patch
Normal file
@ -0,0 +1,191 @@
|
|||||||
|
Index: SDL2-2.0.8/include/SDL_endian.h
|
||||||
|
===================================================================
|
||||||
|
--- SDL2-2.0.8.orig/include/SDL_endian.h
|
||||||
|
+++ SDL2-2.0.8/include/SDL_endian.h
|
||||||
|
@@ -34,29 +34,17 @@
|
||||||
|
* \name The two types of endianness
|
||||||
|
*/
|
||||||
|
/* @{ */
|
||||||
|
-#define SDL_LIL_ENDIAN 1234
|
||||||
|
-#define SDL_BIG_ENDIAN 4321
|
||||||
|
+#define SDL_LIL_ENDIAN __ORDER_LITTLE_ENDIAN__
|
||||||
|
+#define SDL_BIG_ENDIAN __ORDER_BIG_ENDIAN__
|
||||||
|
/* @} */
|
||||||
|
|
||||||
|
#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */
|
||||||
|
-#ifdef __linux__
|
||||||
|
-#include <endian.h>
|
||||||
|
-#define SDL_BYTEORDER __BYTE_ORDER
|
||||||
|
-#else /* __linux__ */
|
||||||
|
-#if defined(__hppa__) || \
|
||||||
|
- defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
|
||||||
|
- (defined(__MIPS__) && defined(__MISPEB__)) || \
|
||||||
|
- defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
|
||||||
|
- defined(__sparc__)
|
||||||
|
-#define SDL_BYTEORDER SDL_BIG_ENDIAN
|
||||||
|
-#else
|
||||||
|
-#define SDL_BYTEORDER SDL_LIL_ENDIAN
|
||||||
|
-#endif
|
||||||
|
-#endif /* __linux__ */
|
||||||
|
+#define SDL_BYTEORDER __BYTE_ORDER__
|
||||||
|
#endif /* !SDL_BYTEORDER */
|
||||||
|
|
||||||
|
|
||||||
|
#include "begin_code.h"
|
||||||
|
+#include <byteswap.h>
|
||||||
|
/* Set up for C function definitions, even when using C++ */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
@@ -65,149 +53,23 @@ extern "C" {
|
||||||
|
/**
|
||||||
|
* \file SDL_endian.h
|
||||||
|
*/
|
||||||
|
-#if defined(__GNUC__) && defined(__i386__) && \
|
||||||
|
- !(__GNUC__ == 2 && __GNUC_MINOR__ == 95 /* broken gcc version */)
|
||||||
|
SDL_FORCE_INLINE Uint16
|
||||||
|
SDL_Swap16(Uint16 x)
|
||||||
|
{
|
||||||
|
- __asm__("xchgb %b0,%h0": "=q"(x):"0"(x));
|
||||||
|
- return x;
|
||||||
|
+ return bswap_16(x);
|
||||||
|
}
|
||||||
|
-#elif defined(__GNUC__) && defined(__x86_64__)
|
||||||
|
-SDL_FORCE_INLINE Uint16
|
||||||
|
-SDL_Swap16(Uint16 x)
|
||||||
|
-{
|
||||||
|
- __asm__("xchgb %b0,%h0": "=Q"(x):"0"(x));
|
||||||
|
- return x;
|
||||||
|
-}
|
||||||
|
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
|
||||||
|
-SDL_FORCE_INLINE Uint16
|
||||||
|
-SDL_Swap16(Uint16 x)
|
||||||
|
-{
|
||||||
|
- int result;
|
||||||
|
|
||||||
|
- __asm__("rlwimi %0,%2,8,16,23": "=&r"(result):"0"(x >> 8), "r"(x));
|
||||||
|
- return (Uint16)result;
|
||||||
|
-}
|
||||||
|
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
|
||||||
|
-SDL_FORCE_INLINE Uint16
|
||||||
|
-SDL_Swap16(Uint16 x)
|
||||||
|
-{
|
||||||
|
- __asm__("rorw #8,%0": "=d"(x): "0"(x):"cc");
|
||||||
|
- return x;
|
||||||
|
-}
|
||||||
|
-#elif defined(__WATCOMC__) && defined(__386__)
|
||||||
|
-extern _inline Uint16 SDL_Swap16(Uint16);
|
||||||
|
-#pragma aux SDL_Swap16 = \
|
||||||
|
- "xchg al, ah" \
|
||||||
|
- parm [ax] \
|
||||||
|
- modify [ax];
|
||||||
|
-#else
|
||||||
|
-SDL_FORCE_INLINE Uint16
|
||||||
|
-SDL_Swap16(Uint16 x)
|
||||||
|
-{
|
||||||
|
- return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
|
||||||
|
-}
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
-#if defined(__GNUC__) && defined(__i386__)
|
||||||
|
SDL_FORCE_INLINE Uint32
|
||||||
|
SDL_Swap32(Uint32 x)
|
||||||
|
{
|
||||||
|
- __asm__("bswap %0": "=r"(x):"0"(x));
|
||||||
|
- return x;
|
||||||
|
+ return bswap_32(x);
|
||||||
|
}
|
||||||
|
-#elif defined(__GNUC__) && defined(__x86_64__)
|
||||||
|
-SDL_FORCE_INLINE Uint32
|
||||||
|
-SDL_Swap32(Uint32 x)
|
||||||
|
-{
|
||||||
|
- __asm__("bswapl %0": "=r"(x):"0"(x));
|
||||||
|
- return x;
|
||||||
|
-}
|
||||||
|
-#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
|
||||||
|
-SDL_FORCE_INLINE Uint32
|
||||||
|
-SDL_Swap32(Uint32 x)
|
||||||
|
-{
|
||||||
|
- Uint32 result;
|
||||||
|
-
|
||||||
|
- __asm__("rlwimi %0,%2,24,16,23": "=&r"(result):"0"(x >> 24), "r"(x));
|
||||||
|
- __asm__("rlwimi %0,%2,8,8,15": "=&r"(result):"0"(result), "r"(x));
|
||||||
|
- __asm__("rlwimi %0,%2,24,0,7": "=&r"(result):"0"(result), "r"(x));
|
||||||
|
- return result;
|
||||||
|
-}
|
||||||
|
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__)) && !defined(__mcoldfire__)
|
||||||
|
-SDL_FORCE_INLINE Uint32
|
||||||
|
-SDL_Swap32(Uint32 x)
|
||||||
|
-{
|
||||||
|
- __asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0": "=d"(x): "0"(x):"cc");
|
||||||
|
- return x;
|
||||||
|
-}
|
||||||
|
-#elif defined(__WATCOMC__) && defined(__386__)
|
||||||
|
-extern _inline Uint32 SDL_Swap32(Uint32);
|
||||||
|
-#ifndef __SW_3 /* 486+ */
|
||||||
|
-#pragma aux SDL_Swap32 = \
|
||||||
|
- "bswap eax" \
|
||||||
|
- parm [eax] \
|
||||||
|
- modify [eax];
|
||||||
|
-#else /* 386-only */
|
||||||
|
-#pragma aux SDL_Swap32 = \
|
||||||
|
- "xchg al, ah" \
|
||||||
|
- "ror eax, 16" \
|
||||||
|
- "xchg al, ah" \
|
||||||
|
- parm [eax] \
|
||||||
|
- modify [eax];
|
||||||
|
-#endif
|
||||||
|
-#else
|
||||||
|
-SDL_FORCE_INLINE Uint32
|
||||||
|
-SDL_Swap32(Uint32 x)
|
||||||
|
-{
|
||||||
|
- return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
|
||||||
|
- ((x >> 8) & 0x0000FF00) | (x >> 24)));
|
||||||
|
-}
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
-#if defined(__GNUC__) && defined(__i386__)
|
||||||
|
-SDL_FORCE_INLINE Uint64
|
||||||
|
-SDL_Swap64(Uint64 x)
|
||||||
|
-{
|
||||||
|
- union
|
||||||
|
- {
|
||||||
|
- struct
|
||||||
|
- {
|
||||||
|
- Uint32 a, b;
|
||||||
|
- } s;
|
||||||
|
- Uint64 u;
|
||||||
|
- } v;
|
||||||
|
- v.u = x;
|
||||||
|
- __asm__("bswapl %0 ; bswapl %1 ; xchgl %0,%1": "=r"(v.s.a), "=r"(v.s.b):"0"(v.s.a),
|
||||||
|
- "1"(v.s.
|
||||||
|
- b));
|
||||||
|
- return v.u;
|
||||||
|
-}
|
||||||
|
-#elif defined(__GNUC__) && defined(__x86_64__)
|
||||||
|
-SDL_FORCE_INLINE Uint64
|
||||||
|
-SDL_Swap64(Uint64 x)
|
||||||
|
-{
|
||||||
|
- __asm__("bswapq %0": "=r"(x):"0"(x));
|
||||||
|
- return x;
|
||||||
|
-}
|
||||||
|
-#else
|
||||||
|
SDL_FORCE_INLINE Uint64
|
||||||
|
SDL_Swap64(Uint64 x)
|
||||||
|
{
|
||||||
|
- Uint32 hi, lo;
|
||||||
|
-
|
||||||
|
- /* Separate into high and low 32-bit values and swap them */
|
||||||
|
- lo = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
|
||||||
|
- x >>= 32;
|
||||||
|
- hi = SDL_static_cast(Uint32, x & 0xFFFFFFFF);
|
||||||
|
- x = SDL_Swap32(lo);
|
||||||
|
- x <<= 32;
|
||||||
|
- x |= SDL_Swap32(hi);
|
||||||
|
- return (x);
|
||||||
|
+ return bswap_64(x);
|
||||||
|
}
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
|
||||||
|
SDL_FORCE_INLINE float
|
||||||
|
SDL_SwapFloat(float x)
|
||||||
13
SDL2.changes
13
SDL2.changes
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jun 24 22:40:23 UTC 2018 - robert.munteanu@gmail.com
|
||||||
|
|
||||||
|
- Add 7babfecee045.patch, fixes launching Firewatch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 11 11:08:39 UTC 2018 - crrodriguez@opensuse.org
|
||||||
|
|
||||||
|
- SDL2-endian.patch: bring up patch from SDL1, use optimized
|
||||||
|
byteswap routines from the C library.
|
||||||
|
- build with --disable-3dnow, do not pass -m3dnow to the compiler
|
||||||
|
modern cpus do not support this instructions at all.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Sat Mar 17 10:14:15 UTC 2018 - ytz1995@hotmail.com
|
Sat Mar 17 10:14:15 UTC 2018 - ytz1995@hotmail.com
|
||||||
|
|
||||||
|
|||||||
@ -31,6 +31,8 @@ Source2: http://libsdl.org/release/%name-%version.tar.gz.sig
|
|||||||
Source3: %name.keyring
|
Source3: %name.keyring
|
||||||
Source4: baselibs.conf
|
Source4: baselibs.conf
|
||||||
Patch1: sdl2-symvers.patch
|
Patch1: sdl2-symvers.patch
|
||||||
|
Patch2: SDL2-endian.patch
|
||||||
|
Patch3: 7babfecee045.patch
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: dos2unix
|
BuildRequires: dos2unix
|
||||||
@ -109,7 +111,7 @@ library.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -P 1 -p1
|
%patch -P 1 -P 2 -p1 -P 3
|
||||||
dos2unix WhatsNew.txt
|
dos2unix WhatsNew.txt
|
||||||
dos2unix TODO.txt
|
dos2unix TODO.txt
|
||||||
dos2unix BUGS.txt
|
dos2unix BUGS.txt
|
||||||
@ -129,7 +131,8 @@ dos2unix COPYING.txt
|
|||||||
--enable-sse2=no \
|
--enable-sse2=no \
|
||||||
%endif
|
%endif
|
||||||
--enable-sse3=no \
|
--enable-sse3=no \
|
||||||
--disable-rpath
|
--disable-rpath \
|
||||||
|
--disable-3dnow
|
||||||
make %{?_smp_mflags} V=1
|
make %{?_smp_mflags} V=1
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user