summaryrefslogtreecommitdiff
path: root/source/l/gst-plugins-good
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-09-10 21:28:36 +0000
committerEric Hameleers <alien@slackware.com>2019-09-11 08:59:49 +0200
commit5ff08990e972ccd99e36e94e44746710b95adba4 (patch)
tree04a09ed3f52ba082354d61ba078cc9f12d3444ae /source/l/gst-plugins-good
parentf58aff2430624d43f64162ea66101f0ed804755f (diff)
downloadcurrent-5ff08990e972ccd99e36e94e44746710b95adba4.tar.gz
Tue Sep 10 21:28:36 UTC 201920190910212836
a/glibc-solibs-2.30-x86_64-1.txz: Upgraded. a/kernel-firmware-20190909_6c6918a-noarch-1.txz: Upgraded. a/kernel-generic-4.19.72-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.72-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.72-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.72-x86-1.txz: Upgraded. k/kernel-source-4.19.72-noarch-1.txz: Upgraded. l/gdk-pixbuf2-2.38.2-x86_64-1.txz: Upgraded. l/glibc-2.30-x86_64-1.txz: Upgraded. l/glibc-i18n-2.30-x86_64-1.txz: Upgraded. l/glibc-profile-2.30-x86_64-1.txz: Upgraded. n/libmilter-8.15.2-x86_64-3.txz: Rebuilt. Use gethostbyname2() since RES_USE_INET6 is removed in glibc-2.30. n/libqmi-1.22.6-x86_64-1.txz: Upgraded. n/postfix-3.4.6-x86_64-2.txz: Rebuilt. Patched to fix removed macros in glibc-2.30. n/yptools-2.14-x86_64-12.txz: Rebuilt. Patched ypbind-mt for gettid() included in glibc-2.30. xap/blackbox-0.75-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/gst-plugins-good')
-rw-r--r--source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch61
-rwxr-xr-xsource/l/gst-plugins-good/gst-plugins-good.SlackBuild2
2 files changed, 63 insertions, 0 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
new file mode 100644
index 00000000..84dd8b22
--- /dev/null
+++ b/source/l/gst-plugins-good/gst-plugins-good-1.16.0-v4l2_fix-1.patch
@@ -0,0 +1,61 @@
+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 2444a964..da0de0d0 100755
--- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
+++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild
@@ -88,6 +88,8 @@ 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 \