From 1c9ee0a0942f227816ec2baddba5ec708d0fa4f549b45aacdb47397d75ef6290 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 11 Jan 2022 19:48:57 +0000 Subject: [PATCH 1/2] - Update to release 2.0.20 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=115 --- SDL2-2.0.18.tar.gz | 3 --- SDL2-2.0.18.tar.gz.sig | Bin 95 -> 0 bytes SDL2-2.0.20.tar.gz | 3 +++ SDL2-2.0.20.tar.gz.sig | Bin 0 -> 95 bytes SDL2.changes | 14 ++++++++++++++ SDL2.spec | 6 +++--- 6 files changed, 20 insertions(+), 6 deletions(-) delete mode 100644 SDL2-2.0.18.tar.gz delete mode 100644 SDL2-2.0.18.tar.gz.sig create mode 100644 SDL2-2.0.20.tar.gz create mode 100644 SDL2-2.0.20.tar.gz.sig diff --git a/SDL2-2.0.18.tar.gz b/SDL2-2.0.18.tar.gz deleted file mode 100644 index 6fb0b3d..0000000 --- a/SDL2-2.0.18.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c -size 7294032 diff --git a/SDL2-2.0.18.tar.gz.sig b/SDL2-2.0.18.tar.gz.sig deleted file mode 100644 index f86d47943959b0ea2525fd52a1e3544f2ff707d224976be246094dad86c81158..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeB(WnmCxVvrS6WD(U!j%^5DT3>$gL7TzS$>qz-te>$mB`)23nt_W`045^N&M@Cc udTT#l9Al!KT!EDBVwsZvwSq+q^J{9(D{tcX#n5DJy|TXj&C5K_!}0(bsUutf diff --git a/SDL2-2.0.20.tar.gz b/SDL2-2.0.20.tar.gz new file mode 100644 index 0000000..c3b0817 --- /dev/null +++ b/SDL2-2.0.20.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06 +size 7207221 diff --git a/SDL2-2.0.20.tar.gz.sig b/SDL2-2.0.20.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..76aeb20a6bf55c3c9c3eab8cc2524b0816f83e8c933b56581d566fbd425907b3 GIT binary patch literal 95 zcmeB(WnmCxVvrS6WD(U!j%^5DT3>$gL7TzS$>qz-te>$mCEi&)mw}5@048#0Im0|d v<2R8tN9Gr9S1er-a^50A%>5k;!-9kVH{D%e!P@fff!*F~7ExdQ-2zkr%1J13 literal 0 HcmV?d00001 diff --git a/SDL2.changes b/SDL2.changes index e4572c0..9db55db 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Jan 11 19:47:23 UTC 2022 - Jan Engelhardt + +- 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 diff --git a/SDL2.spec b/SDL2.spec index be2e6d0..f76115f 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -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 @@ -111,7 +111,7 @@ library. perl -i -pe 's{\r\n}{\n}g' *.txt %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 \ From 71d53642352f908193c2389c0f6f215db68e668339004da352a53491f2e69629 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 16 Jan 2022 15:56:40 +0000 Subject: [PATCH 2/2] Accepting request 946781 from home:Kieltux:branches:games - Drop 0001-Fix-build-against-wayland-1.20.patch Fixed upstream: https://github.com/libsdl-org/SDL/pull/5092 OBS-URL: https://build.opensuse.org/request/show/946781 OBS-URL: https://build.opensuse.org/package/show/games/SDL2?expand=0&rev=116 --- 0001-Fix-build-against-wayland-1.20.patch | 42 ----------------------- SDL2.changes | 6 ++++ SDL2.spec | 3 +- 3 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 0001-Fix-build-against-wayland-1.20.patch diff --git a/0001-Fix-build-against-wayland-1.20.patch b/0001-Fix-build-against-wayland-1.20.patch deleted file mode 100644 index def3141..0000000 --- a/0001-Fix-build-against-wayland-1.20.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e2ade2bfc46d915cd306c63c830b81d800b2575f Mon Sep 17 00:00:00 2001 -From: David Redondo -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 - diff --git a/SDL2.changes b/SDL2.changes index 9db55db..f061074 100644 --- a/SDL2.changes +++ b/SDL2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 16 12:27:09 UTC 2022 - Carsten Ziepke + +- 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 diff --git a/SDL2.spec b/SDL2.spec index f76115f..55b00aa 100644 --- a/SDL2.spec +++ b/SDL2.spec @@ -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,7 +107,7 @@ 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