aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Willing <chris.willing@iinet.net.au>2014-10-29 10:34:40 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2014-10-30 20:27:33 +0700
commite00e0f2245087f33fa53f7c71640fa60558e208e (patch)
treeb3e1369d90659b6d9d746d22813757b2b7d84b49
parent1d65a02bb6a315b0448b9ae16bcc3d00b568b1b7 (diff)
audio/pulseaudio: Patch to enforce prevention of parallel makes.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--audio/pulseaudio/020_no-parallel-make.diff22
-rw-r--r--audio/pulseaudio/pulseaudio.SlackBuild3
2 files changed, 24 insertions, 1 deletions
diff --git a/audio/pulseaudio/020_no-parallel-make.diff b/audio/pulseaudio/020_no-parallel-make.diff
new file mode 100644
index 0000000000000..6b552e33eba5f
--- /dev/null
+++ b/audio/pulseaudio/020_no-parallel-make.diff
@@ -0,0 +1,22 @@
+--- 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/audio/pulseaudio/pulseaudio.SlackBuild b/audio/pulseaudio/pulseaudio.SlackBuild
index a81e299cbd7bf..5a09c249cab35 100644
--- a/audio/pulseaudio/pulseaudio.SlackBuild
+++ b/audio/pulseaudio/pulseaudio.SlackBuild
@@ -7,7 +7,7 @@
PRGNAM=pulseaudio
VERSION=${VERSION:-5.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -45,6 +45,7 @@ cd $TMP
rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
cd $PRGNAM-$VERSION
+#patch -p0 < $CWD/020_no-parallel-make.diff
sed -i -e '/@PA_BINARY@/ imkdir -p \$HOME/.config/pulse' src/daemon/start-pulseaudio-x11.in
sed -i -e '/@PA_BINARY@/ imkdir -p \$HOME/.config/pulse' src/daemon/start-pulseaudio-kde.in
echo "X-MATE-Autostart-Phase=Initialization" >>src/daemon/pulseaudio.desktop.in