diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-12-15 18:09:03 +0000 |
| commit | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch) | |
| tree | 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /media-plugins/gst-plugins-v4l2 | |
| parent | b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff) | |
gentoo resync : 15.12.2019
Diffstat (limited to 'media-plugins/gst-plugins-v4l2')
3 files changed, 61 insertions, 2 deletions
diff --git a/media-plugins/gst-plugins-v4l2/Manifest b/media-plugins/gst-plugins-v4l2/Manifest index fc33353f0ea0..c74b8d099f76 100644 --- a/media-plugins/gst-plugins-v4l2/Manifest +++ b/media-plugins/gst-plugins-v4l2/Manifest @@ -1,5 +1,6 @@ +AUX 1.14.5-glibc-2.30-compat.patch 1315 BLAKE2B e02cdb5b6ae1b2a8c94d577a0378a3c74394afbc62be71448715c2e5096d5156f4cbe625ad26c2950e14d691bb314b6ef53f9a997b3cd61851c4b20da3453066 SHA512 dfb48424e9ec6219962ff15a0939d1450474fc2a6fa42aa8dec77581f60cbb14ed5cde504dbe08f10d0b5a04b2010c205e3c5d33cf0fa5d94e7cb1e177493ffb DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504 DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236 EBUILD gst-plugins-v4l2-1.14.4.ebuild 661 BLAKE2B 52bfecb172aea757f6638f7c09864c42cefce4916a6807cdde9ecb00c42e141d74638b709084008d7bba7684eb3f613bf92d82e2cda7b76bc840b2b19984cc16 SHA512 2cb3afd9c5365c9c6c53aca3f986d48d9e9921ea6e5394ea32e7b141695a940c2287b63b58f4937e7e0a0c38a68e376d9bd295bbdac3c38d51422025b6f21124 -EBUILD gst-plugins-v4l2-1.14.5.ebuild 669 BLAKE2B 31bd7c47fa82ef47472cdd56bd5e98022c785e40404efd1d4e722cb45a777c4f63c2bf4a42880471dbeb8d32a9ef032188a6cd1eaea834c8c1389546fe588ce2 SHA512 a964b5f8b59a8c89c99362d13c6e95c092e14f3a49ac8ab81f8f4f741cc95816f04e60c963282b512dffcca66eeeb10fbf54432f0739aee6e8471d54dff1730b +EBUILD gst-plugins-v4l2-1.14.5.ebuild 729 BLAKE2B 100337dcf2bc11bb09fd13ef48fd55dfa1936310c29113c6828c8bf8286d9171cef32cafb070478dbda82a68dde24eef7d64483a3087d5884bd6725689af5ede SHA512 8988a7017e359b258ae9653bc61a08b6f0ef196d009e92d905163566b768d9536b43232fce62d64f9a040f70879cc86f0b822e5f806c053c901150a6b4cf981c MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0 diff --git a/media-plugins/gst-plugins-v4l2/files/1.14.5-glibc-2.30-compat.patch b/media-plugins/gst-plugins-v4l2/files/1.14.5-glibc-2.30-compat.patch new file mode 100644 index 000000000000..e429fadf1744 --- /dev/null +++ b/media-plugins/gst-plugins-v4l2/files/1.14.5-glibc-2.30-compat.patch @@ -0,0 +1,54 @@ +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.22.0 + diff --git a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild index 4bb6eaecf925..a99af10fc92e 100644 --- a/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild +++ b/media-plugins/gst-plugins-v4l2/gst-plugins-v4l2-1.14.5.ebuild @@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-good inherit gstreamer DESCRIPION="V4L2 source/sink plugin for GStreamer" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86" IUSE="udev" RDEPEND=" @@ -21,6 +21,10 @@ DEPEND="${RDEPEND} GST_PLUGINS_BUILD="gst_v4l2" +PATCHES=( + "${FILESDIR}"/${PV}-glibc-2.30-compat.patch #691882 +) + multilib_src_configure() { gstreamer_multilib_src_configure \ --with-libv4l2 \ |