Hello community, here is the log from the commit of package SDL for openSUSE:Factory checked in at 2019-03-08 11:58:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SDL (Old) and /work/SRC/openSUSE:Factory/.SDL.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "SDL" Fri Mar 8 11:58:57 2019 rev:55 rq:681137 version:1.2.15 Changes: -------- --- /work/SRC/openSUSE:Factory/SDL/SDL.changes 2017-07-04 11:54:51.771187640 +0200 +++ /work/SRC/openSUSE:Factory/.SDL.new.28833/SDL.changes 2019-03-08 11:59:00.215979259 +0100 @@ -1,0 +2,10 @@ +Sun Mar 3 19:35:44 UTC 2019 - Martin Hauke <[email protected]> + +- Add patch: + * SDL-1.2.15-Use-system-glext.h.patch + Mesa-18.2.6 changed GL_GLEXT_VERSION and that conflicts with + the bundled glext.h definitions. + Use system glext.h instead via GL/gl.h. + See: https://bugzilla.redhat.com/show_bug.cgi?id=1662778 + +------------------------------------------------------------------- New: ---- SDL-1.2.15-Use-system-glext.h.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SDL.spec ++++++ --- /var/tmp/diff_new_pack.fWcFEy/_old 2019-03-08 11:59:01.991978958 +0100 +++ /var/tmp/diff_new_pack.fWcFEy/_new 2019-03-08 11:59:01.991978958 +0100 @@ -1,7 +1,7 @@ # # spec file for package SDL # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -23,7 +23,7 @@ Version: 1.2.15 Release: 0 Summary: Simple DirectMedia Layer Library -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/X11 Url: http://libsdl.org/ @@ -37,6 +37,7 @@ Patch1: SDL_sdl_endian.patch Patch2: sdl-lfs.patch Patch3: libsdl-1.2.15-resizing.patch +Patch4: SDL-1.2.15-Use-system-glext.h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: nasm @@ -62,8 +63,8 @@ %package -n %lname Summary: Simple DirectMedia Layer Library -Group: System/Libraries # SDL was used last in 11.1 +Group: System/Libraries Provides: SDL = %version Obsoletes: SDL < %version # bnc437293 @@ -78,8 +79,8 @@ %package -n libSDL-devel Summary: SDL Library Developer Files -Group: Development/Libraries/X11 # SDL-devel was used last in 11.1 +Group: Development/Libraries/X11 Provides: SDL-devel = %version Obsoletes: SDL-devel < %version # bnc437293 @@ -104,6 +105,7 @@ %patch1 %patch2 %patch -P 3 -p1 +%patch4 -p1 # remove the file to provide sufficient evidence that we are # not using this file during the build [bnc#508111] rm -f src/joystick/darwin/10.3.9-FIX/IOHIDLib.h ++++++ SDL-1.2.15-Use-system-glext.h.patch ++++++ >From cf8a0c3d75005436d3ed3ea0ae258cdef5b10ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <[email protected]> Date: Mon, 14 Jan 2019 12:10:21 +0100 Subject: [PATCH] Use system glext.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mesa-18.2.6 changed GL_GLEXT_VERSION and that conflicts with the bundled glext.h definitions. Use system glext.h instead via GL/gl.h. Signed-off-by: Petr Písař <[email protected]> --- include/SDL_opengl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h index 3d791d6..3a77b11 100644 --- a/include/SDL_opengl.h +++ b/include/SDL_opengl.h @@ -33,6 +33,8 @@ #endif #include <windows.h> #endif +/* mesa changes GL_GLEXT_VERSION, use system glext.h instead via GL/gl.h */ +#define NO_SDL_GLEXT #ifndef NO_SDL_GLEXT #define __glext_h_ /* Don't let gl.h include glext.h */ #endif -- 2.17.2
