summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-10-19 19:59:54 +0000
committerEric Hameleers <alien@slackware.com>2018-10-20 09:00:32 +0200
commitfcbdf0b9ccb30d2f290ae4fa408d342e285becde (patch)
tree89879de49945c1bccc0a79b4185bd54689c1ee37 /source/l
parentc6a82aeeef05882e1d86f49574cbec56268c0d04 (diff)
downloadcurrent-fcbdf0b9ccb30d2f290ae4fa408d342e285becde.tar.gz
Fri Oct 19 19:59:54 UTC 201820181019195954
a/file-5.35-x86_64-1.txz: Upgraded. a/glibc-zoneinfo-2018f-noarch-1.txz: Upgraded. a/kernel-firmware-20181018_d877533-noarch-1.txz: Upgraded. ap/ksh93-20181018_89d7b802-x86_64-1.txz: Upgraded. l/harfbuzz-2.0.0-x86_64-1.txz: Upgraded. l/libopusenc-0.2.1-x86_64-1.txz: Upgraded. l/opus-1.3-x86_64-1.txz: Upgraded. l/v4l-utils-1.16.1-x86_64-1.txz: Upgraded. n/NetworkManager-1.14.2-x86_64-1.txz: Upgraded. n/dnsmasq-2.80-x86_64-1.txz: Upgraded. n/openssh-7.9p1-x86_64-1.txz: Upgraded. x/mesa-18.2.3-x86_64-1.txz: Upgraded. x/xkeyboard-config-2.25-noarch-1.txz: Upgraded.
Diffstat (limited to 'source/l')
-rwxr-xr-xsource/l/harfbuzz/harfbuzz.SlackBuild2
-rwxr-xr-xsource/l/v4l-utils/v4l-utils.SlackBuild7
-rw-r--r--source/l/v4l-utils/v4l-utils.glibc228.diff32
3 files changed, 5 insertions, 36 deletions
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 354fa0fb..ca2cea44 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:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild
index 5a21c720..7c0e4137 100755
--- a/source/l/v4l-utils/v4l-utils.SlackBuild
+++ b/source/l/v4l-utils/v4l-utils.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=v4l-utils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -71,8 +71,6 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
cd $PKGNAM-$VERSION || exit 1
-zcat $CWD/v4l-utils.glibc228.diff.gz | patch -p1 --verbose || exit 1
-
# Make sure ownerships and permissions are sane:
chown -R root:root .
find . \
@@ -81,6 +79,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# qvidcap requires Qt5 - quit disabling it once we have that.
+
# Configure:
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -91,6 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man \
--infodir=/usr/info \
--disable-static \
+ --disable-qvidcap \
--build=$ARCH-slackware-linux || exit 1
# Build and install:
diff --git a/source/l/v4l-utils/v4l-utils.glibc228.diff b/source/l/v4l-utils/v4l-utils.glibc228.diff
deleted file mode 100644
index d072af74..00000000
--- a/source/l/v4l-utils/v4l-utils.glibc228.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./lib/libv4lconvert/control/libv4lcontrol.c.orig 2017-12-27 08:33:07.000000000 -0600
-+++ ./lib/libv4lconvert/control/libv4lcontrol.c 2018-09-18 19:07:39.598074096 -0500
-@@ -20,9 +20,7 @@
- */
-
- #include <sys/types.h>
--#if defined(MAJOR_IN_SYSMACROS)
- #include <sys/sysmacros.h>
--#endif
- #include <sys/mman.h>
- #include <fcntl.h>
- #include <sys/stat.h>
---- ./lib/libv4l2/libv4l2.c.orig 2017-12-27 07:50:55.000000000 -0600
-+++ ./lib/libv4l2/libv4l2.c 2018-09-18 19:07:39.596074096 -0500
-@@ -70,6 +70,7 @@
- #include <sys/types.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include "libv4l2.h"
- #include "libv4l2-priv.h"
- #include "libv4l-plugin.h"
---- ./utils/v4l2-ctl/v4l2-ctl.cpp.orig 2017-12-27 07:50:55.000000000 -0600
-+++ ./utils/v4l2-ctl/v4l2-ctl.cpp 2018-09-18 19:07:39.599074096 -0500
-@@ -33,6 +33,7 @@
- #include <errno.h>
- #include <sys/ioctl.h>
- #include <sys/time.h>
-+#include <sys/sysmacros.h>
- #include <dirent.h>
- #include <math.h>
-