Accepting request 948217 from games
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/948217 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL2?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
804312b699
@ -1,42 +0,0 @@
|
||||
From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001
|
||||
From: David Redondo <kde@david-redondo.de>
|
||||
Date: Fri, 10 Dec 2021 16:22:34 +0100
|
||||
Subject: [PATCH] Fix build against wayland 1.20
|
||||
|
||||
Fixes #5088
|
||||
---
|
||||
src/video/wayland/SDL_waylanddyn.h | 2 ++
|
||||
src/video/wayland/SDL_waylandsym.h | 4 ++++
|
||||
2 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h
|
||||
index 13b0884d0..226855560 100644
|
||||
--- a/src/video/wayland/SDL_waylanddyn.h
|
||||
+++ b/src/video/wayland/SDL_waylanddyn.h
|
||||
@@ -95,6 +95,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
|
||||
#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned)
|
||||
#define wl_proxy_set_tag (*WAYLAND_wl_proxy_set_tag)
|
||||
#define wl_proxy_get_tag (*WAYLAND_wl_proxy_get_tag)
|
||||
+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
|
||||
+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
|
||||
|
||||
#define wl_seat_interface (*WAYLAND_wl_seat_interface)
|
||||
#define wl_surface_interface (*WAYLAND_wl_surface_interface)
|
||||
diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
|
||||
index d6e6a761d..32e47d26e 100644
|
||||
--- a/src/video/wayland/SDL_waylandsym.h
|
||||
+++ b/src/video/wayland/SDL_waylandsym.h
|
||||
@@ -84,6 +84,10 @@ SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_18)
|
||||
SDL_WAYLAND_SYM(void, wl_proxy_set_tag, (struct wl_proxy *, const char * const *))
|
||||
SDL_WAYLAND_SYM(const char * const *, wl_proxy_get_tag, (struct wl_proxy *))
|
||||
|
||||
+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
|
||||
+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...))
|
||||
+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args))
|
||||
+
|
||||
SDL_WAYLAND_INTERFACE(wl_seat_interface)
|
||||
SDL_WAYLAND_INTERFACE(wl_surface_interface)
|
||||
SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c
|
||||
size 7294032
|
||||
Binary file not shown.
3
SDL2-2.0.20.tar.gz
Normal file
3
SDL2-2.0.20.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
|
||||
size 7207221
|
||||
BIN
SDL2-2.0.20.tar.gz.sig
Normal file
BIN
SDL2-2.0.20.tar.gz.sig
Normal file
Binary file not shown.
20
SDL2.changes
20
SDL2.changes
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jan 16 12:27:09 UTC 2022 - Carsten Ziepke <kieltux@gmail.com>
|
||||
|
||||
- Drop 0001-Fix-build-against-wayland-1.20.patch
|
||||
Fixed upstream: https://github.com/libsdl-org/SDL/pull/5092
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 11 19:47:23 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
- Update to release 2.0.20
|
||||
* SDL_RenderGeometryRaw() takes a pointer to SDL_Color, not
|
||||
int. You can cast color data in SDL_PIXELFORMAT_RGBA32 format
|
||||
(SDL_PIXELFORMAT_ABGR8888 on little endian systems) for this
|
||||
parameter.
|
||||
* Improved accuracy of horizontal and vertical line drawing
|
||||
when using OpenGL or OpenGLES.
|
||||
* Added the hint SDL_HINT_RENDER_LINE_METHOD to control the
|
||||
method of line drawing used, to select speed, correctness,
|
||||
and compatibility.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 17 10:40:12 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package SDL2
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -19,7 +19,7 @@
|
||||
%define sle_version 0
|
||||
Name: SDL2
|
||||
%define lname libSDL2-2_0-0
|
||||
Version: 2.0.18
|
||||
Version: 2.0.20
|
||||
Release: 0
|
||||
Summary: Simple DirectMedia Layer Library
|
||||
License: Zlib
|
||||
@ -33,7 +33,6 @@ Source3: %name.keyring
|
||||
Source4: baselibs.conf
|
||||
Patch1: sdl2-symvers.patch
|
||||
Patch2: sdl2-khronos.patch
|
||||
Patch3: 0001-Fix-build-against-wayland-1.20.patch
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: nasm
|
||||
@ -108,10 +107,10 @@ library.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
perl -i -pe 's{\r\n}{\n}g' *.txt
|
||||
perl -i -pe 's{\r\n}{\n}g' *.txt README.md
|
||||
|
||||
%build
|
||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||
%global _lto_cflags %_lto_cflags -ffat-lto-objects
|
||||
# In this instance, we do want --with-pic because of libSDL2main.a.
|
||||
%configure --with-pic --disable-alsa-shared --disable-video-directfb \
|
||||
--enable-video-kmsdrm --enable-video-wayland \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user