diff options
Diffstat (limited to 'source/l')
| -rw-r--r-- | source/l/glib2/glib-2.74.1-gnome-keyring-cpu.patch | 131 | ||||
| -rwxr-xr-x | source/l/glib2/glib2.SlackBuild | 4 | ||||
| -rwxr-xr-x | source/l/newt/newt.SlackBuild | 2 | ||||
| -rw-r--r-- | source/l/pipewire/b46d8a8c921a8da6883610ad4b68da95bf59b59e.patch | 30 | ||||
| -rwxr-xr-x | source/l/pipewire/pipewire.SlackBuild | 4 |
5 files changed, 168 insertions, 3 deletions
diff --git a/source/l/glib2/glib-2.74.1-gnome-keyring-cpu.patch b/source/l/glib2/glib-2.74.1-gnome-keyring-cpu.patch new file mode 100644 index 000000000..8cb07a280 --- /dev/null +++ b/source/l/glib2/glib-2.74.1-gnome-keyring-cpu.patch @@ -0,0 +1,131 @@ +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3029 +https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3039 (backport PR we've used) +https://bugs.gentoo.org/878995 +https://bugs.gentoo.org/878351 + +From e2f283d7c8c5ab3aeb2f281a27ec7c0f24b86868 Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Fri, 28 Oct 2022 11:21:04 -0400 +Subject: [PATCH 1/2] Revert "Handling collision between standard i/o file + descriptors and newly created ones" + +g_unix_open_pipe tries to avoid the standard io fd range +when getting pipe fds. This turns out to be a bad idea because +certain buggy programs rely on it using that range. + +This reverts commit d9ba6150909818beb05573f54f26232063492c5b +--- a/glib/glib-unix.c ++++ b/glib/glib-unix.c +@@ -108,17 +108,6 @@ g_unix_open_pipe (int *fds, + ecode = pipe2 (fds, pipe2_flags); + if (ecode == -1 && errno != ENOSYS) + return g_unix_set_error_from_errno (error, errno); +- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */ +- else if (fds[0] < 3 || fds[1] < 3) +- { +- int old_fds[2] = { fds[0], fds[1] }; +- gboolean result = g_unix_open_pipe (fds, flags, error); +- close (old_fds[0]); +- close (old_fds[1]); +- +- if (!result) +- g_unix_set_error_from_errno (error, errno); +- } + else if (ecode == 0) + return TRUE; + /* Fall through on -ENOSYS, we must be running on an old kernel */ +@@ -127,19 +116,6 @@ g_unix_open_pipe (int *fds, + ecode = pipe (fds); + if (ecode == -1) + return g_unix_set_error_from_errno (error, errno); +- /* Don't reassign pipes to stdin, stdout, stderr if closed meanwhile */ +- else if (fds[0] < 3 || fds[1] < 3) +- { +- int old_fds[2] = { fds[0], fds[1] }; +- gboolean result = g_unix_open_pipe (fds, flags, error); +- close (old_fds[0]); +- close (old_fds[1]); +- +- if (!result) +- g_unix_set_error_from_errno (error, errno); +- +- return result; +- } + + if (flags == 0) + return TRUE; +GitLab +From 4526620d8c485f5dfba6ddca33f91670982f82eb Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Mon, 31 Oct 2022 09:17:55 -0400 +Subject: [PATCH 2/2] glib-unix: Add test to make sure g_unix_open_pipe will + intrude standard range + +Now that we know it's a bad idea to avoid the standard io fd range +when getting pipe fds for g_unix_open_pipe, we should test to make sure +we don't inadvertently try to do it again. + +This commit adds that test. +--- a/glib/tests/unix.c ++++ b/glib/tests/unix.c +@@ -24,8 +24,11 @@ + #include "config.h" + + #include "glib-unix.h" ++#include "gstdio.h" ++ + #include <string.h> + #include <pwd.h> ++#include <unistd.h> + + static void + test_pipe (void) +@@ -52,6 +55,39 @@ test_pipe (void) + g_assert (g_str_has_prefix (buf, "hello")); + } + ++static void ++test_pipe_stdio_overwrite (void) ++{ ++ GError *error = NULL; ++ int pipefd[2], ret; ++ gboolean res; ++ int stdin_fd; ++ ++ stdin_fd = dup (STDIN_FILENO); ++ g_assert_cmpint (stdin_fd, >, 0); ++ ++ g_close (STDIN_FILENO, &error); ++ g_assert_no_error (error); ++ ++ res = g_unix_open_pipe (pipefd, FD_CLOEXEC, &error); ++ g_assert_no_error (error); ++ g_assert_true (res); ++ ++ g_assert_cmpint (pipefd[0], ==, STDIN_FILENO); ++ ++ g_close (pipefd[0], &error); ++ g_assert_no_error (error); ++ ++ g_close (pipefd[1], &error); ++ g_assert_no_error (error); ++ ++ ret = dup2 (stdin_fd, STDIN_FILENO); ++ g_assert_cmpint (ret, >=, 0); ++ ++ g_close (stdin_fd, &error); ++ g_assert_no_error (error); ++} ++ + static void + test_error (void) + { +@@ -337,6 +373,7 @@ main (int argc, + g_test_init (&argc, &argv, NULL); + + g_test_add_func ("/glib-unix/pipe", test_pipe); ++ g_test_add_func ("/glib-unix/pipe-stdio-overwrite", test_pipe_stdio_overwrite); + g_test_add_func ("/glib-unix/error", test_error); + g_test_add_func ("/glib-unix/nonblocking", test_nonblocking); + g_test_add_func ("/glib-unix/sighup", test_sighup); +GitLab diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index c3ff80303..2424b9616 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glib2 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,6 +77,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +zcat $CWD/glib-2.74.1-gnome-keyring-cpu.patch.gz | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/l/newt/newt.SlackBuild b/source/l/newt/newt.SlackBuild index 5c9ffc0bb..db12aa63e 100755 --- a/source/l/newt/newt.SlackBuild +++ b/source/l/newt/newt.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=newt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-7} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/pipewire/b46d8a8c921a8da6883610ad4b68da95bf59b59e.patch b/source/l/pipewire/b46d8a8c921a8da6883610ad4b68da95bf59b59e.patch new file mode 100644 index 000000000..70af7d0ad --- /dev/null +++ b/source/l/pipewire/b46d8a8c921a8da6883610ad4b68da95bf59b59e.patch @@ -0,0 +1,30 @@ +From b46d8a8c921a8da6883610ad4b68da95bf59b59e Mon Sep 17 00:00:00 2001 +From: Wim Taymans <wtaymans@redhat.com> +Date: Wed, 16 Nov 2022 20:45:38 +0100 +Subject: [PATCH] alsa: force playback start when buffer is full + +When we try to play data but the ringbuffer is full, we need to start +the device or else we will stay in this situation forever and stay +silent. + +Fixes #2830 +--- + spa/plugins/alsa/alsa-pcm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/spa/plugins/alsa/alsa-pcm.c b/spa/plugins/alsa/alsa-pcm.c +index fed56e7bb..5e0a60b37 100644 +--- a/spa/plugins/alsa/alsa-pcm.c ++++ b/spa/plugins/alsa/alsa-pcm.c +@@ -2128,7 +2128,7 @@ again: + + state->sample_count += total_written; + +- if (SPA_UNLIKELY(!state->alsa_started && total_written > 0)) ++ if (SPA_UNLIKELY(!state->alsa_started && (total_written > 0 || frames == 0))) + do_start(state); + + return 0; +-- +GitLab + diff --git a/source/l/pipewire/pipewire.SlackBuild b/source/l/pipewire/pipewire.SlackBuild index a601917b7..474b3a626 100755 --- a/source/l/pipewire/pipewire.SlackBuild +++ b/source/l/pipewire/pipewire.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pipewire VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -89,6 +89,8 @@ find . \ # Add media-session: ( cd subprojects ; tar xf $CWD/media-session.tar.lz ) +cat $CWD/b46d8a8c921a8da6883610ad4b68da95bf59b59e.patch | patch -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" |