Github messages for voidlinux
 help / color / mirror / Atom feed
From: tranzystorek-io <tranzystorek-io@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] SDL2: update to 2.28.0
Date: Thu, 29 Jun 2023 23:26:46 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44730@inbox.vuxu.org> (raw)

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

There is a new pull request by tranzystorek-io against master on the void-packages repository

https://github.com/tranzystorek-io/void-packages sdl
https://github.com/void-linux/void-packages/pull/44730

SDL2: update to 2.28.0
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/44730.patch is attached

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

From eaac39f26386e3bce38a9cf6599241f3b98c9379 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 29 Jun 2023 22:54:14 +0200
Subject: [PATCH] SDL2: update to 2.28.0

---
 .../SDL2/patches/fix-libdecor-api-usage.patch | 36 +++++++++++++++++++
 srcpkgs/SDL2/template                         |  4 +--
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch

diff --git a/srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch b/srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch
new file mode 100644
index 000000000000..b59ad6907512
--- /dev/null
+++ b/srcpkgs/SDL2/patches/fix-libdecor-api-usage.patch
@@ -0,0 +1,36 @@
+From 5d9013beb9a9d443441de12935720f41c231d061 Mon Sep 17 00:00:00 2001
+From: Anonymous Maarten <anonymous.maarten@gmail.com>
+Date: Fri, 26 May 2023 23:00:56 +0200
+Subject: [PATCH] wayland: don't use libdecor_frame_get_* functions when header
+ doesn't have it
+
+and we're statically linking to the library.
+This fixes building SDL with -DSDL_WAYLAND_SHARED=OFF
+
+(cherry picked from commit 5b5b67df203e9f8391e7e53aa5de54abf14c482e)
+(cherry picked from commit e6f635ca172027f57542b715787ac5b50f3f6d33)
+---
+ src/video/wayland/SDL_waylandsym.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
+index 4d6cdc95474a..c59bb30c9c81 100644
+--- a/src/video/wayland/SDL_waylandsym.h
++++ b/src/video/wayland/SDL_waylandsym.h
+@@ -217,6 +217,7 @@ SDL_WAYLAND_SYM(bool, libdecor_configuration_get_window_state, (struct libdecor_
+                                                                 enum libdecor_window_state *))
+ SDL_WAYLAND_SYM(int, libdecor_dispatch, (struct libdecor *, int))
+ 
++#if defined(SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_LIBDECOR) || defined(SDL_HAVE_LIBDECOR_GET_MIN_MAX)
+ /* Only found in libdecor 0.1.1 or higher, so failure to load them is not fatal. */
+ SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_min_content_size, (struct libdecor_frame *,\
+                                                             int *,\
+@@ -226,6 +227,8 @@ SDL_WAYLAND_SYM_OPT(void, libdecor_frame_get_max_content_size, (struct libdecor_
+                                                             int *))
+ #endif
+ 
++#endif
++
+ #undef SDL_WAYLAND_MODULE
+ #undef SDL_WAYLAND_SYM
+ #undef SDL_WAYLAND_SYM_OPT
diff --git a/srcpkgs/SDL2/template b/srcpkgs/SDL2/template
index d8fb73d1dd1a..007bee85ca23 100644
--- a/srcpkgs/SDL2/template
+++ b/srcpkgs/SDL2/template
@@ -1,6 +1,6 @@
 # Template file for 'SDL2'
 pkgname=SDL2
-version=2.26.5
+version=2.28.0
 revision=1
 build_style=cmake
 configure_args="-DSDL_ALSA=ON -DSDL_ESD=OFF -DSDL_RPATH=OFF
@@ -15,7 +15,7 @@ license="Zlib"
 homepage="https://www.libsdl.org/"
 changelog="https://raw.githubusercontent.com/libsdl-org/SDL/SDL2/WhatsNew.txt"
 distfiles="https://www.libsdl.org/release/SDL2-${version}.tar.gz"
-checksum=ad8fea3da1be64c83c45b1d363a6b4ba8fd60f5bde3b23ec73855709ec5eabf7
+checksum=d215ae4541e69d628953711496cd7b0e8b8d5c8d811d5b0f98fdc7fd1422998a
 
 # Package build options
 build_options="gles opengl pulseaudio pipewire sndio vulkan wayland x11"

             reply	other threads:[~2023-06-29 21:26 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-29 21:26 tranzystorek-io [this message]
2023-07-02  9:56 ` tranzystorek-io
2023-07-02 10:42 ` [PR PATCH] [Closed]: " tranzystorek-io

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44730@inbox.vuxu.org \
    --to=tranzystorek-io@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).