diff options
Diffstat (limited to 'source/l/pulseaudio')
| -rw-r--r-- | source/l/pulseaudio/020_no-parallel-make.diff | 22 | ||||
| -rwxr-xr-x | source/l/pulseaudio/pulseaudio.SlackBuild | 6 | ||||
| -rw-r--r-- | source/l/pulseaudio/pulseaudio.elogind.meson.diff | 52 |
3 files changed, 1 insertions, 79 deletions
diff --git a/source/l/pulseaudio/020_no-parallel-make.diff b/source/l/pulseaudio/020_no-parallel-make.diff deleted file mode 100644 index 6b552e33e..000000000 --- a/source/l/pulseaudio/020_no-parallel-make.diff +++ /dev/null @@ -1,22 +0,0 @@ ---- src/Makefile.am.orig 2014-02-14 23:45:45.000000000 +1000 -+++ src/Makefile.am 2014-10-26 21:59:33.220234317 +1000 -@@ -19,6 +19,8 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. - -+.NOTPARALLEL: -+ - ################################### - # Extra directories # - ################################### ---- Makefile.am.orig 2014-01-24 04:57:55.000000000 +1000 -+++ Makefile.am 2014-10-26 21:58:47.090622189 +1000 -@@ -15,6 +15,8 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. - -+.NOTPARALLEL: -+ - ACLOCAL_AMFLAGS = -I m4 - - EXTRA_DIST = \ diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild index dab661bf6..39d4b77b3 100755 --- a/source/l/pulseaudio/pulseaudio.SlackBuild +++ b/source/l/pulseaudio/pulseaudio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pulseaudio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -77,7 +77,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -zcat $CWD/020_no-parallel-make.diff.gz | patch -p0 --verbose || exit 1 zcat $CWD/030_posix-completion.diff.gz | patch -p0 --verbose || exit 1 # https://bugzilla.redhat.com/show_bug.cgi?id=1234710 @@ -93,9 +92,6 @@ echo "X-MATE-Autostart-Phase=Initialization" >> src/daemon/pulseaudio.desktop.in # If autospawn isn't working, start-pulseaudio-x11 should start it manually: zcat $CWD/pulseaudio-autostart.patch.gz | patch -p1 --verbose || exit 1 -# Add support for meson to detect elogind: -zcat $CWD/pulseaudio.elogind.meson.diff.gz | patch -p1 --verbose || exit 1 - # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" diff --git a/source/l/pulseaudio/pulseaudio.elogind.meson.diff b/source/l/pulseaudio/pulseaudio.elogind.meson.diff deleted file mode 100644 index 8538a3683..000000000 --- a/source/l/pulseaudio/pulseaudio.elogind.meson.diff +++ /dev/null @@ -1,52 +0,0 @@ -diff -urN pulseaudio-14.0.orig/meson.build pulseaudio-14.0/meson.build ---- pulseaudio-14.0.orig/meson.build 2020-11-23 20:31:13.000000000 +0200 -+++ pulseaudio-14.0/meson.build 2020-12-24 22:24:03.166596631 +0200 -@@ -602,6 +602,11 @@ - systemduserunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir') - endif - -+libelogind_dep = dependency('libelogind', required : get_option('elogind')) -+if libelogind_dep.found() -+ cdata.set('HAVE_SYSTEMD_LOGIN', 1) -+endif -+ - x11_dep = dependency('x11-xcb', required : get_option('x11')) - if x11_dep.found() - xcb_dep = dependency('xcb', required : true, version : '>= 1.6') -@@ -829,6 +834,7 @@ - 'Enable udev: @0@'.format(udev_dep.found()), - ' Enable HAL->udev compat: @0@'.format(get_option('hal-compat')), - 'Enable systemd: @0@'.format(libsystemd_dep.found()), -+ 'Enable elogind: @0@'.format(libelogind_dep.found()), - # 'Enable TCP Wrappers: @0@'.format(${ENABLE_TCPWRAP}), - 'Enable libsamplerate: @0@'.format(samplerate_dep.found()), - 'Enable IPv6: @0@'.format(get_option('ipv6')), -diff -urN pulseaudio-14.0.orig/meson_options.txt pulseaudio-14.0/meson_options.txt ---- pulseaudio-14.0.orig/meson_options.txt 2020-11-11 04:07:46.000000000 +0200 -+++ pulseaudio-14.0/meson_options.txt 2020-12-24 22:18:27.921584579 +0200 -@@ -135,6 +135,9 @@ - option('systemd', - type : 'feature', value : 'auto', - description : 'Optional systemd support') -+option('elogind', -+ type : 'feature', value : 'auto', -+ description : 'Optional elogind support') - option('udev', - type : 'feature', value : 'auto', - description : 'Optional udev support') -diff -urN pulseaudio-14.0.orig/src/modules/meson.build pulseaudio-14.0/src/modules/meson.build ---- pulseaudio-14.0.orig/src/modules/meson.build 2020-11-11 04:07:46.000000000 +0200 -+++ pulseaudio-14.0/src/modules/meson.build 2020-12-24 22:20:06.143588110 +0200 -@@ -188,6 +188,12 @@ - ] - endif - -+if libelogind_dep.found() -+ all_modules += [ -+ [ 'module-systemd-login', 'module-systemd-login.c', [], [], [libelogind_dep] ], -+ ] -+endif -+ - if udev_dep.found() - all_modules += [ [ 'module-udev-detect', 'module-udev-detect.c', [], [], [udev_dep] ] ] - if get_option('hal-compat') |