diff options
author | Tom Hochstein <tom.hochstein@nxp.com> | 2022-03-29 13:11:32 -0500 |
---|---|---|
committer | Tom Hochstein <tom.hochstein@nxp.com> | 2022-04-04 16:57:41 -0500 |
commit | 200e8ad05248ef0bdc64a6eb869817a39aac21e9 (patch) | |
tree | 4c313007dcb98d9ff3cdca8c486873f9b55f9da8 /recipes-multimedia | |
parent | 36589d57ee3fa9d3aac891f42c16d45622b00750 (diff) | |
download | meta-freescale-200e8ad05248ef0bdc64a6eb869817a39aac21e9.tar.gz |
gstreamer1.0: Upgrade 1.18.0.imx -> 1.18.5.imx
Also separate the base recipe copy from the overrides for ease of
maintenance.
Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
Diffstat (limited to 'recipes-multimedia')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch | 18 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb) | 35 |
2 files changed, 35 insertions, 18 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch index 96abef17..5805e8b6 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0002-Remove-unused-valgrind-detection.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 598d108e2c438d8f2ecd3bf948fa3ebbd3681490 Mon Sep 17 00:00:00 2001 | 1 | From d7f05d09c55d35bbe4e0f856759519ef183d9a56 Mon Sep 17 00:00:00 2001 |
2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> | 2 | From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> |
3 | Date: Fri, 14 Aug 2020 16:38:26 +0100 | 3 | Date: Fri, 14 Aug 2020 16:38:26 +0100 |
4 | Subject: [PATCH 2/3] Remove unused valgrind detection | 4 | Subject: [PATCH] Remove unused valgrind detection |
5 | 5 | ||
6 | Having this just to log a debug message in case we're | 6 | Having this just to log a debug message in case we're |
7 | running inside valgrind doesn't seem very useful, and | 7 | running inside valgrind doesn't seem very useful, and |
@@ -12,6 +12,7 @@ Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/59 | |||
12 | Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245] | 12 | Upstream-Status: Backport [a2cbf75523cdf8a4df1baa7007d86ef455972245] |
13 | 13 | ||
14 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 14 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
15 | |||
15 | --- | 16 | --- |
16 | gst/gst_private.h | 2 -- | 17 | gst/gst_private.h | 2 -- |
17 | gst/gstinfo.c | 39 --------------------------------------- | 18 | gst/gstinfo.c | 39 --------------------------------------- |
@@ -32,12 +33,12 @@ index eefd044d9..8252ede51 100644 | |||
32 | G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); | 33 | G_GNUC_INTERNAL void _priv_gst_quarks_initialize (void); |
33 | G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); | 34 | G_GNUC_INTERNAL void _priv_gst_mini_object_initialize (void); |
34 | diff --git a/gst/gstinfo.c b/gst/gstinfo.c | 35 | diff --git a/gst/gstinfo.c b/gst/gstinfo.c |
35 | index 5d317877b..097f8b20d 100644 | 36 | index eea1a219d..d3035d6db 100644 |
36 | --- a/gst/gstinfo.c | 37 | --- a/gst/gstinfo.c |
37 | +++ b/gst/gstinfo.c | 38 | +++ b/gst/gstinfo.c |
38 | @@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; | 39 | @@ -305,36 +305,6 @@ static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; |
39 | static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; | 40 | static gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; |
40 | static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; | 41 | static gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; |
41 | 42 | ||
42 | -/* FIXME: export this? */ | 43 | -/* FIXME: export this? */ |
43 | -gboolean | 44 | -gboolean |
@@ -82,7 +83,7 @@ index 5d317877b..097f8b20d 100644 | |||
82 | env = g_getenv ("GST_DEBUG_OPTIONS"); | 83 | env = g_getenv ("GST_DEBUG_OPTIONS"); |
83 | if (env != NULL) { | 84 | if (env != NULL) { |
84 | if (strstr (env, "full_tags") || strstr (env, "full-tags")) | 85 | if (strstr (env, "full_tags") || strstr (env, "full-tags")) |
85 | @@ -2503,12 +2470,6 @@ gst_debug_construct_win_color (guint colorinfo) | 86 | @@ -2505,12 +2472,6 @@ gst_debug_construct_win_color (guint colorinfo) |
86 | return 0; | 87 | return 0; |
87 | } | 88 | } |
88 | 89 | ||
@@ -96,7 +97,7 @@ index 5d317877b..097f8b20d 100644 | |||
96 | _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, | 97 | _gst_debug_dump_mem (GstDebugCategory * cat, const gchar * file, |
97 | const gchar * func, gint line, GObject * obj, const gchar * msg, | 98 | const gchar * func, gint line, GObject * obj, const gchar * msg, |
98 | diff --git a/meson.build b/meson.build | 99 | diff --git a/meson.build b/meson.build |
99 | index ce1921aa4..7a84d0981 100644 | 100 | index 82a17282b..42ae61790 100644 |
100 | --- a/meson.build | 101 | --- a/meson.build |
101 | +++ b/meson.build | 102 | +++ b/meson.build |
102 | @@ -200,7 +200,6 @@ check_headers = [ | 103 | @@ -200,7 +200,6 @@ check_headers = [ |
@@ -107,6 +108,3 @@ index ce1921aa4..7a84d0981 100644 | |||
107 | 'sys/resource.h', | 108 | 'sys/resource.h', |
108 | 'sys/uio.h', | 109 | 'sys/uio.h', |
109 | ] | 110 | ] |
110 | -- | ||
111 | 2.29.2 | ||
112 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.imx.bb index 82c36703..3aabcf2d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.18.0.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.18.5.imx.bb | |||
@@ -1,3 +1,10 @@ | |||
1 | # This recipe is for the i.MX fork of gstreamer1.0. For ease of | ||
2 | # maintenance, the top section is a verbatim copy of an OE-core | ||
3 | # recipe. The second section customizes the recipe for i.MX. | ||
4 | |||
5 | ########### OE-core copy ################## | ||
6 | # Upstream hash: bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 | ||
7 | |||
1 | SUMMARY = "GStreamer 1.0 multimedia framework" | 8 | SUMMARY = "GStreamer 1.0 multimedia framework" |
2 | DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ | 9 | DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ |
3 | It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." | 10 | It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." |
@@ -13,12 +20,9 @@ inherit meson pkgconfig gettext upstream-version-is-even gobject-introspection p | |||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ | 20 | LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ |
14 | file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" | 21 | file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" |
15 | 22 | ||
16 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/gstreamer-${PV}" |
17 | 24 | ||
18 | # Use i.MX fork of GST for customizations | 25 | SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \ |
19 | GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https;branch=master" | ||
20 | SRCBRANCH = "MM_04.06.01_2105_L5.10.y" | ||
21 | SRC_URI = "${GST1.0_SRC};branch=${SRCBRANCH} \ | ||
22 | file://run-ptest \ | 26 | file://run-ptest \ |
23 | file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ | 27 | file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ |
24 | file://0002-Remove-unused-valgrind-detection.patch \ | 28 | file://0002-Remove-unused-valgrind-detection.patch \ |
@@ -28,9 +32,7 @@ SRC_URI = "${GST1.0_SRC};branch=${SRCBRANCH} \ | |||
28 | file://0006-tests-use-a-dictionaries-for-environment.patch \ | 32 | file://0006-tests-use-a-dictionaries-for-environment.patch \ |
29 | file://0007-tests-install-the-environment-for-installed_tests.patch \ | 33 | file://0007-tests-install-the-environment-for-installed_tests.patch \ |
30 | " | 34 | " |
31 | SRCREV = "2f20fd10eaf8629b3e8c134424c38412c4d3bd86" | 35 | SRC_URI[sha256sum] = "9aeec99b38e310817012aa2d1d76573b787af47f8a725a65b833880a094dfbc5" |
32 | |||
33 | DEFAULT_PREFERENCE = "-1" | ||
34 | 36 | ||
35 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ | 37 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ |
36 | check \ | 38 | check \ |
@@ -79,4 +81,21 @@ CVE_PRODUCT = "gstreamer" | |||
79 | 81 | ||
80 | PTEST_BUILD_HOST_FILES = "" | 82 | PTEST_BUILD_HOST_FILES = "" |
81 | 83 | ||
84 | ########### End of OE-core copy ########### | ||
85 | |||
86 | ########### i.MX overrides ################ | ||
87 | |||
88 | DEFAULT_PREFERENCE = "-1" | ||
89 | |||
90 | # Use i.MX fork of GST for customizations | ||
91 | SRC_URI:remove = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz" | ||
92 | GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" | ||
93 | SRCBRANCH = "MM_04.06.04_2112_L5.15.y" | ||
94 | SRC_URI:prepend = "${GST1.0_SRC};branch=${SRCBRANCH} " | ||
95 | SRCREV = "a55998c70940bd183d25d29e1b82fd3bc9f43df3" | ||
96 | |||
97 | S = "${WORKDIR}/git" | ||
98 | |||
82 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" | 99 | COMPATIBLE_MACHINE = "(imx-nxp-bsp)" |
100 | |||
101 | ########### End of i.MX overrides ######### | ||