Re: [PR PATCH] [Updated] SDL2: update to 2.0.16.

[ardadem <ardadem@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]

There is an updated pull request by ardadem against master on the void-packages repository

https://github.com/ardadem/void-packages pr-sdl2-2.0.16
https://github.com/void-linux/void-packages/pull/32444

SDL2: update to 2.0.16.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32444.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-sdl2-2.0.16-32444.patch --]
[-- Type: text/x-diff, Size: 6547 bytes --]

From 4a8319f0be59a56f99f14d8dc172c9539a191e84 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:52:54 +0300
Subject: [PATCH 1/2] New package: libdecor-0.1.0_1

---
 common/shlibs             |  1 +
 srcpkgs/libdecor-devel    |  1 +
 srcpkgs/libdecor/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libdecor-devel
 create mode 100644 srcpkgs/libdecor/template

diff --git a/common/shlibs b/common/shlibs
index f96d3f36b3ae..f0680f1e3986 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4004,3 +4004,4 @@ liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
 libstemmer.so.2 libstemmer-2.1.0_1
+libdecor-0.so.0 libdecor-0.1.0_1
diff --git a/srcpkgs/libdecor-devel b/srcpkgs/libdecor-devel
new file mode 120000
index 000000000000..28d87097fa2b
--- /dev/null
+++ b/srcpkgs/libdecor-devel
@@ -0,0 +1 @@
+libdecor
\ No newline at end of file
diff --git a/srcpkgs/libdecor/template b/srcpkgs/libdecor/template
new file mode 100644
index 000000000000..af5a80dd9570
--- /dev/null
+++ b/srcpkgs/libdecor/template
@@ -0,0 +1,32 @@
+# Template file for 'libdecor'
+pkgname=libdecor
+version=0.1.0
+revision=1
+build_style=meson
+configure_args="-Ddemo=false -Ddbus=$(vopt_if dbus enabled disabled)"
+hostmakedepends="pkg-config wayland-devel"
+makedepends="wayland-devel wayland-protocols pango-devel
+ $(vopt_if dbus dbus-devel)"
+short_desc="Client-side decorations library for Wayland client"
+maintainer="Arda Demir <ddmirarda@gmail.com>"
+license="MIT"
+homepage="https://gitlab.gnome.org/jadahl/libdecor"
+distfiles="https://gitlab.gnome.org/jadahl/libdecor/-/archive/${version}/libdecor-${version}.tar.gz"
+checksum=1d5758cb49dcb9ceaa979ad14ceb6cdf39282af5ce12ebe6073dd193d6b2fb5e
+
+build_options="dbus"
+build_options_default="dbus"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libdecor-devel_package() {
+	depends="libdecor>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 9b910824924b6eb47d5287c1c6dcbc53aa1739f4 Mon Sep 17 00:00:00 2001
From: Arda Demir <ddmirarda@gmail.com>
Date: Tue, 10 Aug 2021 20:53:28 +0300
Subject: [PATCH 2/2] SDL2: update to 2.0.16.

---
 ...e2a59c8d41d67c6bc80f25b6e52670dddbbf.patch | 32 +++++++++++++++++++
 srcpkgs/SDL2/template                         | 24 +++++++++-----
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch

diff --git a/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
new file mode 100644
index 000000000000..5c62275830ab
--- /dev/null
+++ b/srcpkgs/SDL2/patches/ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf.patch
@@ -0,0 +1,32 @@
+From ae7ee2a59c8d41d67c6bc80f25b6e52670dddbbf Mon Sep 17 00:00:00 2001
+From: Ethan Lee <flibitijibibo@gmail.com>
+Date: Wed, 11 Aug 2021 09:59:43 -0400
+Subject: [PATCH] wayland: Ignore stateless/sizeless configs when starting in
+ fullscreen mode
+
+---
+ src/video/wayland/SDL_waylandwindow.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/src/video/wayland/SDL_waylandwindow.c b/src/video/wayland/SDL_waylandwindow.c
+index 025dd30ee..451d33b76 100644
+--- a/src/video/wayland/SDL_waylandwindow.c
++++ b/src/video/wayland/SDL_waylandwindow.c
+@@ -219,9 +219,15 @@ handle_configure_xdg_toplevel(void *data,
+ 
+             /* Foolishly do what the compositor says here. If it's wrong, don't
+              * blame us, we were explicitly instructed to do this.
++             *
++             * UPDATE: Nope, we can't actually do that, the compositor may give
++             * us a completely stateless, sizeless configure, with which we have
++             * to enforce our own state anyway.
+              */
+-            window->w = width;
+-            window->h = height;
++            if (width != 0 && height != 0) {
++                window->w = width;
++                window->h = height;
++            }
+ 
+             /* This part is good though. */
+             if (window->flags & SDL_WINDOW_ALLOW_HIGHDPI) {
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index 9013c2e73e21..b7c1db667dc4 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.0.14
+version=2.0.16
 revision=1
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath --enable-libudev
@@ -12,13 +12,14 @@ makedepends="alsa-lib-devel dbus-devel eudev-libudev-devel libusb-compat-devel
 short_desc="Simple DirectMedia Layer (version 2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="Zlib"
-homepage="http://www.libsdl.org/"
-distfiles="http://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
-checksum=d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
+homepage="https://www.libsdl.org/"
+changelog="https://raw.githubusercontent.com/libsdl-org/SDL/main/WhatsNew.txt"
+distfiles="https://www.libsdl.org/release/${pkgname}-${version}.tar.gz"
+checksum=65be9ff6004034b5b2ce9927b5a4db1814930f169c4b2dae0a1e4697075f287b
 
 # Package build options
-build_options="gles opengl pulseaudio sndio vulkan wayland x11"
-build_options_default="gles opengl pulseaudio sndio vulkan wayland x11"
+build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
+build_options_default="gles opengl pulseaudio pipewire sndio vulkan wayland x11"
 
 case "$XBPS_TARGET_MACHINE" in
 	arm*)
@@ -71,6 +72,13 @@ else
 	configure_args+=" --disable-pulseaudio"
 fi
 
+if [ "$build_option_pipewire" ]; then
+	configure_args+=" --enable-pipewire"
+	makedepends+=" pipewire-devel"
+else
+	configure_args+=" --disable-pipewire"
+fi
+
 if [ "$build_option_sndio" ]; then
 	configure_args+=" --enable-sndio"
 	makedepends+=" sndio-devel"
@@ -82,8 +90,8 @@ if [ "$build_option_wayland" ]; then
 	if [ -z "$build_option_gles" ]; then
 		msg_error "$pkgname: wayland option requires gles.\n"
 	fi
-	configure_args+=" --enable-video-wayland --disable-wayland-shared"
-	makedepends+=" libxkbcommon-devel wayland-devel wayland-protocols"
+	configure_args+=" --enable-video-wayland --disable-wayland-shared --enable-libdecor"
+	makedepends+=" libxkbcommon-devel libdecor-devel wayland-devel wayland-protocols"
 	if [ "$CROSS_BUILD" ]; then
 		hostmakedepends+=" wayland-devel"
 	fi