diff options
Diffstat (limited to 'source/l')
3 files changed, 1 insertions, 64 deletions
diff --git a/source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch b/source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch deleted file mode 100644 index 84dd8b22..00000000 --- a/source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch +++ /dev/null @@ -1,61 +0,0 @@ -Submitted by: Pierre Labastie (pierre_DOT_labastie_AT_neuf_DOT_fr) -Date: 2019-08-12 -Initial Package Version: 1.16.0 -Upstream Status: Comitted -Origin: https://cgit.freedesktop.org/gstreamer/gst-plugins-good -Description: Fixes circular dependencies in headers introduced - by glibc-2.30 - -From 29c3570901e1c145dce57824ddc9276fddf0d808 Mon Sep 17 00:00:00 2001 -From: Nicolas Dufresne <nicolas.dufresne@collabora.com> -Date: Tue, 6 Aug 2019 22:27:40 -0400 -Subject: [PATCH] v4l2: Fix type compatibility issue with glibc 2.30 - -From now on, we will use linux/types.h on Linux, and use typedef of the -various flavour of BSD. - -Fixes #635 ---- - sys/v4l2/ext/types-compat.h | 21 ++++++++++++++------- - 1 file changed, 14 insertions(+), 7 deletions(-) - -diff --git a/sys/v4l2/ext/types-compat.h b/sys/v4l2/ext/types-compat.h -index d3673dd49..ea21c9513 100644 ---- a/sys/v4l2/ext/types-compat.h -+++ b/sys/v4l2/ext/types-compat.h -@@ -24,6 +24,11 @@ - #ifndef __TYPES_COMPAT_H__ - #define __TYPES_COMPAT_H__ - -+#ifdef __linux__ -+#include <linux/types.h> -+#include <asm/ioctl.h> -+ -+#else /* One of the BSDs */ - /* From linux/types.h */ - #ifndef __bitwise__ - # ifdef __CHECKER__ -@@ -41,12 +46,14 @@ - # endif - #endif - --#define __u64 guint64 --#define __u32 guint32 --#define __u16 guint16 --#define __u8 guint8 --#define __s64 gint64 --#define __s32 gint32 --#define __le32 guint32 __bitwise -+typedef guint8 __u8; -+typedef guint16 __u16; -+typedef gint32 __s32; -+typedef guint32 __u32; -+typedef gint64 __s64; -+typedef guint64 __u64; -+typedef guint32 __bitwise __le32; -+ -+#endif - - #endif /* __TYPES_COMPAT_H__ */ --- -2.21.0 diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index da0de0d0..2444a964 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -88,8 +88,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/gst-plugins-good-1.16.0-v4l2_fix-1.patch.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild b/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild index e4cd6aae..401a8acd 100755 --- a/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild +++ b/source/l/gst-plugins-libav/gst-plugins-libav.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gst-plugins-libav VERSION=${VERSION:-$(echo gst-libav-*.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 |