diff options
Diffstat (limited to 'source/l')
-rwxr-xr-x | source/l/boost/boost.SlackBuild | 6 | ||||
-rwxr-xr-x | source/l/ffmpeg/ffmpeg.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/harfbuzz/harfbuzz.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/libical/libical.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/libvisio/libvisio.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/qt/qt-nowebkit.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/raptor2/raptor2.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/v4l-utils/v4l-utils.SlackBuild | 2 |
8 files changed, 13 insertions, 7 deletions
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index 231d3607..c80d1788 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -100,6 +100,7 @@ find . \ # # Next, we build boost using bjam ./b2 \ + $NUMJOBS \ --layout=system \ --build-dir=build-python2 \ --prefix=/usr \ @@ -118,6 +119,7 @@ find . \ # # And then install boost.. ./b2 \ + $NUMJOBS \ --layout=system \ --build-dir=build-python2 \ --prefix=$PKG/usr \ @@ -145,6 +147,7 @@ sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VER --with-libraries=python || exit 1 ./b2 \ + $NUMJOBS \ --layout=system \ --build-dir=build-python3 \ --prefix=/usr \ @@ -162,6 +165,7 @@ sed -e '/using python/ s@;@: /usr/include/python${PYTHON_VERSION/3*/${PYTHON_VER stage || exit 1 ./b2 \ + $NUMJOBS \ --layout=system \ --build-dir=build-python3 \ --prefix=$PKG/usr \ diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index db43a8ca..81547356 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ffmpeg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild index 0a4ae61f..9221c187 100755 --- a/source/l/harfbuzz/harfbuzz.SlackBuild +++ b/source/l/harfbuzz/harfbuzz.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=harfbuzz 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 diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild index b5582edd..5d66000e 100755 --- a/source/l/libical/libical.SlackBuild +++ b/source/l/libical/libical.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libical 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 diff --git a/source/l/libvisio/libvisio.SlackBuild b/source/l/libvisio/libvisio.SlackBuild index 9c548aae..5f6fe9f4 100755 --- a/source/l/libvisio/libvisio.SlackBuild +++ b/source/l/libvisio/libvisio.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libvisio VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/qt/qt-nowebkit.SlackBuild b/source/l/qt/qt-nowebkit.SlackBuild index 62826985..6ce37fad 100755 --- a/source/l/qt/qt-nowebkit.SlackBuild +++ b/source/l/qt/qt-nowebkit.SlackBuild @@ -43,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) -BUILD=${BUILD:-11} +BUILD=${BUILD:-12} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild index c018f91c..a85a98b6 100755 --- a/source/l/raptor2/raptor2.SlackBuild +++ b/source/l/raptor2/raptor2.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=raptor2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-6} +BUILD=${BUILD:-7} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index 7c0e4137..17982dc1 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -80,6 +80,7 @@ find . \ -exec chmod 644 {} \; # qvidcap requires Qt5 - quit disabling it once we have that. +# qv4l2 requires Qt5 - quit disabling it once we have that. # Configure: CFLAGS="$SLKCFLAGS" \ @@ -92,6 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --disable-static \ --disable-qvidcap \ + --disable-qv4l2 \ --build=$ARCH-slackware-linux || exit 1 # Build and install: |