diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-11-03 23:08:20 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-08 14:03:20 +0000 |
commit | c278a8171b9cbf7e62518248289605ec88ecc905 (patch) | |
tree | fc03a6710a6d6f24541d51a0e4382fb6a8f4cc38 /meta/recipes-multimedia | |
parent | af1ed1aaf4947dc8ee172766913ccef9557a429a (diff) | |
download | poky-c278a8171b9cbf7e62518248289605ec88ecc905.tar.gz |
gstreamer: Fix build on 32bit arches with 64bit time_t
Fixes
| ../gstreamer-1.18.1/gst/gstsystemclock.c:330:1: error: static_assert failed due to requirement 'size
of(struct _GstClockEntryPThread) <= sizeof(struct _GstClockEntryImpl)' "Expression evaluates to false"
| G_STATIC_ASSERT (sizeof (GstClockEntryImpl) <= | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
(From OE-Core rev: bafbe8bc0976d4c3ccf7e97979cd956f6374f53d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch | 34 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch new file mode 100644 index 0000000000..a2d215d72d --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From 4449246a8d788e71dfe4679fba95955cec5894c1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 3 Nov 2020 22:58:26 -0800 | ||
4 | Subject: [PATCH] gst_private.h: increse padding in struct _GstClockEntryImpl | ||
5 | |||
6 | When compiling for 32bit architectures with 64bit time_t e.g. riscv32, | ||
7 | the static assert that the GstClockEntryImpl smaller or | ||
8 | equal to the struct _GstClockEntryImpl triggered. | ||
9 | (they were 12bytes off). | ||
10 | |||
11 | To fix this, the padding is increased by 8 bytes (on 32bit). | ||
12 | |||
13 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/694] | ||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | gst/gst_private.h | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/gst/gst_private.h b/gst/gst_private.h | ||
20 | index a8897e1..8252ede 100644 | ||
21 | --- a/gst/gst_private.h | ||
22 | +++ b/gst/gst_private.h | ||
23 | @@ -522,7 +522,7 @@ struct _GstClockEntryImpl | ||
24 | GstClockEntry entry; | ||
25 | GWeakRef clock; | ||
26 | GDestroyNotify destroy_entry; | ||
27 | - gpointer padding[19]; /* padding for allowing e.g. systemclock | ||
28 | + gpointer padding[21]; /* padding for allowing e.g. systemclock | ||
29 | * to add data in lieu of overridable | ||
30 | * virtual functions on the clock */ | ||
31 | }; | ||
32 | -- | ||
33 | 2.29.2 | ||
34 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb index d989eefd97..d55b2871e7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.18.1.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x | |||
19 | file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ | 19 | file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ |
20 | file://0002-Remove-unused-valgrind-detection.patch \ | 20 | file://0002-Remove-unused-valgrind-detection.patch \ |
21 | file://0003-meson-Add-option-for-installed-tests.patch \ | 21 | file://0003-meson-Add-option-for-installed-tests.patch \ |
22 | file://0001-gst_private.h-increse-padding-in-struct-_GstClockEnt.patch \ | ||
22 | " | 23 | " |
23 | SRC_URI[sha256sum] = "79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba" | 24 | SRC_URI[sha256sum] = "79df8de21f284a105a5c1568527f8c559c583c85c0f2bd7bdb5b0372b8beecba" |
24 | 25 | ||