diff options
Diffstat (limited to 'source/l')
| -rwxr-xr-x | source/l/alsa-lib/alsa-lib.SlackBuild | 4 | ||||
| -rw-r--r-- | source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch | 72 | ||||
| -rwxr-xr-x | source/l/alsa-oss/alsa-oss.SlackBuild | 4 | ||||
| -rw-r--r-- | source/l/alsa-oss/alsa-oss.glibc228.diff | 10 | ||||
| -rwxr-xr-x | source/l/alsa-plugins/alsa-plugins.SlackBuild | 5 | ||||
| -rw-r--r-- | source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch | 34 | ||||
| -rwxr-xr-x | source/l/gtk+3/gtk+3.SlackBuild | 5 | ||||
| -rw-r--r-- | source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch | 42 |
8 files changed, 49 insertions, 127 deletions
diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild index 0c2b56c10..d6c6517c6 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-lib VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -81,8 +81,6 @@ if [ ! -r src/conf/smixer.conf ]; then cp -a $CWD/smixer.conf src/conf fi -zcat $CWD/alsa-lib.fix.pcm.interval.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch b/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch deleted file mode 100644 index fa8f379a8..000000000 --- a/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b420056604f06117c967b65d43d01536c5ffcbc9 Mon Sep 17 00:00:00 2001 -From: Timo Wischer <twischer@de.adit-jv.com> -Date: Thu, 18 Oct 2018 13:33:24 +0200 -Subject: [PATCH] pcm: interval: Interpret (x x+1] correctly and return x+1 - -Without this change an interval of (x x+1] will be interpreted as an -empty interval but the right value would be x+1. -This leads to a failing snd_pcm_hw_params() call which returns -EINVAL. - -An example issue log is given in the following: -snd_pcm_hw_params failed with err -22 (Invalid argument) -ACCESS: MMAP_NONINTERLEAVED -FORMAT: S16_LE -SUBFORMAT: STD -SAMPLE_BITS: 16 -FRAME_BITS: 16 -CHANNELS: 1 -RATE: 16000 -PERIOD_TIME: (15999 16000] -PERIOD_SIZE: (255 256] -PERIOD_BYTES: (510 512] -PERIODS: [2 3) -BUFFER_TIME: 32000 -BUFFER_SIZE: 512 -BUFFER_BYTES: 1024 - -In case of (x x+1) we have to interpret it anyway as a single value of x to -compensate rounding issues. -For example the period size will result in an interval of (352 353) when -the period time is 16ms and the sample rate 22050 Hz -(16ms * 22,05 kHz = 352,8 frames). But 352 has to be chosen to allow a -buffer size of 705 (32ms * 22,05 kHz = 705,6 frames) which has to be >= 2x -period size to avoid Xruns. The buffer size will not end up with an -interval of (705 706) simular to the period size because -snd_pcm_rate_hw_refine_cchange() calls snd_interval_floor() for the buffer -size. Therefore this value will be interpreted as an integer interval -instead of a real interval further on. - -This issue seems to exist since the change of 9bb985c38 ("pcm: -snd_interval_refine_first/last: exclude value only if also excluded -before") - -Signed-off-by: Timo Wischer <twischer@de.adit-jv.com> -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - src/pcm/interval_inline.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/pcm/interval_inline.h b/src/pcm/interval_inline.h -index a68e292..d9a30b2 100644 ---- a/src/pcm/interval_inline.h -+++ b/src/pcm/interval_inline.h -@@ -51,12 +51,14 @@ INTERVAL_INLINE int snd_interval_single(const snd_interval_t *i) - { - assert(!snd_interval_empty(i)); - return (i->min == i->max || -- (i->min + 1 == i->max && i->openmax)); -+ (i->min + 1 == i->max && (i->openmin || i->openmax))); - } - - INTERVAL_INLINE int snd_interval_value(const snd_interval_t *i) - { - assert(snd_interval_single(i)); -+ if (i->openmin && !i->openmax) -+ return i->max; - return i->min; - } - --- -1.7.11.7 - - diff --git a/source/l/alsa-oss/alsa-oss.SlackBuild b/source/l/alsa-oss/alsa-oss.SlackBuild index d7cd02929..5a0732058 100755 --- a/source/l/alsa-oss/alsa-oss.SlackBuild +++ b/source/l/alsa-oss/alsa-oss.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-oss VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -76,8 +76,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/alsa-oss.glibc228.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/alsa-oss/alsa-oss.glibc228.diff b/source/l/alsa-oss/alsa-oss.glibc228.diff deleted file mode 100644 index d44b38065..000000000 --- a/source/l/alsa-oss/alsa-oss.glibc228.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./alsa/stdioemu.c.orig 2018-04-03 02:01:38.000000000 -0500 -+++ ./alsa/stdioemu.c 2018-09-18 18:42:01.227057630 -0500 -@@ -37,7 +37,6 @@ - #endif - - #include <stdio.h> --#include <libio.h> - - struct fd_cookie { - int fd; diff --git a/source/l/alsa-plugins/alsa-plugins.SlackBuild b/source/l/alsa-plugins/alsa-plugins.SlackBuild index dc4ed9845..7fde7eb26 100755 --- a/source/l/alsa-plugins/alsa-plugins.SlackBuild +++ b/source/l/alsa-plugins/alsa-plugins.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-plugins VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,9 +77,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 -# Upstream fix for USB devices causing a double free: -zcat $CWD/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch b/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch deleted file mode 100644 index 9b3a81599..000000000 --- a/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Tue, 23 Oct 2018 09:32:46 +0200 -Subject: [PATCH] a52_close: set slave to NULL to avoid double pcm free in - open fcn - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - a52/pcm_a52.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c -index e431fd0..b005bc2 100644 ---- a/a52/pcm_a52.c -+++ b/a52/pcm_a52.c -@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd, - static int a52_close(snd_pcm_ioplug_t *io) - { - struct a52_ctx *rec = io->private_data; -+ snd_pcm_t *slave = rec->slave; - - a52_free(rec); -- if (rec->slave) -- return snd_pcm_close(rec->slave); -+ if (slave) { -+ rec->slave = NULL; -+ return snd_pcm_close(slave); -+ } - return 0; - } - --- -1.7.11.7 - diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild index 9b5460922..7d880bde7 100755 --- a/source/l/gtk+3/gtk+3.SlackBuild +++ b/source/l/gtk+3/gtk+3.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gtk+3 VERSION=${VERSION:-$(echo gtk+-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,6 +79,9 @@ find . \ zcat $CWD/gtk.typo.fix.diff.gz | patch -p1 --verbose || exit 1 +# Fix segfault: +zcat $CWD/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch.gz | patch -p1 --verbose || exit 1 + # Regenerate ./configure: libtoolize --copy --force autoreconf -vif diff --git a/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch b/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch new file mode 100644 index 000000000..99806d194 --- /dev/null +++ b/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch @@ -0,0 +1,42 @@ +From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001 +From: Daniel Boles <dboles.src@gmail.com> +Date: Thu, 13 Dec 2018 17:20:13 +0100 +Subject: [PATCH] x11: Fix deprecation macro use + +G_GNUC_END_IGNORE_DEPRECATIONS terminates the if statement and does not +consider the following block to be part of the if. So that block was +always taken irregardless of the pattern. + +Fixes #1280 +--- + gdk/x11/gdkwindow-x11.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c +index 97ada6d739..764e39495f 100644 +--- a/gdk/x11/gdkwindow-x11.c ++++ b/gdk/x11/gdkwindow-x11.c +@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow *window, + double r, g, b, a; + cairo_surface_t *surface; + cairo_matrix_t matrix; ++ cairo_pattern_t *parent_relative_pattern; + + if (GDK_WINDOW_DESTROYED (window)) + return; +@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow *window, + } + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +- if (pattern == gdk_x11_get_parent_relative_pattern ()) ++ parent_relative_pattern = gdk_x11_get_parent_relative_pattern (); + G_GNUC_END_IGNORE_DEPRECATIONS ++ ++ if (pattern == parent_relative_pattern) + { + GdkWindow *parent; + +-- +2.18.1 + + |