From 504d2cf4a83362597fab1ca53dbb2e639029e860 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Mon, 1 Feb 2016 09:37:43 +0000 Subject: multimedia/mpv: Remove NUMJOBS support. The main issue was not supporting "-j", people can specify it via BUILD_OPTS. Signed-off-by: David Spencer --- multimedia/mpv/README | 17 +++-------------- multimedia/mpv/mpv.SlackBuild | 6 +----- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/multimedia/mpv/README b/multimedia/mpv/README index 2bb44ef5b8..88fdc366f0 100644 --- a/multimedia/mpv/README +++ b/multimedia/mpv/README @@ -18,24 +18,13 @@ Dependencies are autodetected. Some optional dependencies are disabled by default and may be enabled (see BUILD_OPTS). Optional dependencies that are enabled by default may be disabled (see BUILD_OPTS). -NUMJOBS: -The default number of jobs to be run during the build process is set to 1; -To override, set NUMJOBS to your preference prior to or at build time. If -you run into suspected bugs with mpv, I recommend first building and installing -mpv with NUMJOBS set to the default of 1. e.g.: - -~# NUMJOBS=2 sh mpv.SlackBuild - -or, if you use fakeroot to build packages: - -~# fakeroot env NUMJOBS=2 sh mpv.SlackBuild - BUILD_OPTS: To override the default for build options, set the shell variable BUILD_OPTS prior to or at build time. For example, to enable cdda and openal, which are -disabled by default, you could use the following: +disabled by default, and to build with four jobs in parallel, you could use the +following: -~# BUILD_OPTS="--enable-cdda --enable-openal" sh mpv.SlackBuild +~# BUILD_OPTS="--enable-cdda --enable-openal --jobs=4" sh mpv.SlackBuild or, if you use fakeroot to build packages: diff --git a/multimedia/mpv/mpv.SlackBuild b/multimedia/mpv/mpv.SlackBuild index d48308ba44..4f32f15489 100644 --- a/multimedia/mpv/mpv.SlackBuild +++ b/multimedia/mpv/mpv.SlackBuild @@ -76,12 +76,8 @@ find -L . \ DOCS="Copyright LICENSE README.md RELEASE_NOTES" MANUAL="DOCS/*.md DOCS/*.rst DOCS/*.txt DOCS/client_api_examples/" -# By default, play it safe since it is so easy to override. -NUMJOBS=${NUMJOBS:-1} - # This leaves an opening for build options. BUILD_OPTS=${BUILD_OPTS:-""} -BUILD_OPTS="$BUILD_OPTS --jobs=$NUMJOBS" # Setting CFLAGS and CXXFLAGS breaks configure. ./waf configure \ @@ -92,7 +88,7 @@ BUILD_OPTS="$BUILD_OPTS --jobs=$NUMJOBS" --docdir=/usr/doc/$PRGNAM-$VERSION \ $BUILD_OPTS -./waf --jobs=$NUMJOBS build +./waf build ./waf --destdir=$PKG install for f in $PKG/etc/mpv/*.conf ; do -- cgit v1.2.3