diff options
24 files changed, 76 insertions, 89 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch index c0e4581358..21e30d6d46 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch +++ b/meta/recipes-multimedia/gstreamer/gst-devtools/0001-connect-has-a-different-signature-on-musl.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 73b1002eda17451db1f58431b42c25203f1d3097 Mon Sep 17 00:00:00 2001 | 1 | From 0c73b8131efba63c5cd37ea8c7551434c3b57304 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sun, 9 Sep 2018 17:38:10 -0700 | 3 | Date: Sun, 9 Sep 2018 17:38:10 -0700 |
4 | Subject: [PATCH] connect has a different signature on musl | 4 | Subject: [PATCH] connect has a different signature on musl |
@@ -11,6 +11,7 @@ typcasted to struct sockaddr_in* type inside the function before use | |||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | 12 | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | |||
14 | --- | 15 | --- |
15 | validate/plugins/fault_injection/socket_interposer.c | 7 ++++++- | 16 | validate/plugins/fault_injection/socket_interposer.c | 7 ++++++- |
16 | 1 file changed, 6 insertions(+), 1 deletion(-) | 17 | 1 file changed, 6 insertions(+), 1 deletion(-) |
diff --git a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.10.bb index f60234b528..363d12612f 100644 --- a/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gst-devtools_1.22.10.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${PV} | |||
12 | file://0001-connect-has-a-different-signature-on-musl.patch \ | 12 | file://0001-connect-has-a-different-signature-on-musl.patch \ |
13 | " | 13 | " |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "02e29400b44e9cc603aa6444dee5726b57edabef6455e6d0921ffed6f13840ee" | 15 | SRC_URI[sha256sum] = "0e1ec0d0b8f2d3d314a397399cd01dfc50c02ac088176996f934758119075ea9" |
16 | 16 | ||
17 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" | 17 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" |
18 | RRECOMMENDS:${PN} = "git" | 18 | RRECOMMENDS:${PN} = "git" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.10.bb index 10536acc87..818dbf4e5e 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.10.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=69333daa044cb77e486cc36129f7a770 \ | |||
12 | " | 12 | " |
13 | 13 | ||
14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" | 14 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz" |
15 | SRC_URI[sha256sum] = "192f7d27d21c1e7c72c339a2647a9b0c247fedc62ea5029115f8c3e22ebb87d8" | 15 | SRC_URI[sha256sum] = "d6dda7aa38a44173278de675ccd92acff0abf473f7bc02e7d1cdd4ce0f3b7642" |
16 | 16 | ||
17 | S = "${WORKDIR}/gst-libav-${PV}" | 17 | S = "${WORKDIR}/gst-libav-${PV}" |
18 | 18 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.10.bb index 05d64748bb..4cb83937dc 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.10.bb | |||
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ | |||
10 | 10 | ||
11 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" | 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "9362d6117985d09dcf6e27bdaef377dc08efb7df01d00101d04fb644addac61e" | 13 | SRC_URI[sha256sum] = "ce0126f6de908df4fa7b12136d47d6840dd9f7131ae997e55a817d96a2728a41" |
14 | 14 | ||
15 | S = "${WORKDIR}/gst-omx-${PV}" | 15 | S = "${WORKDIR}/gst-omx-${PV}" |
16 | 16 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch index 4b3451d321..a57fcd7d21 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-fix-maybe-uninitialized-warnings-when-compiling-with.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 6c3eeaf6435608f744303c17d52245f926cd28ac Mon Sep 17 00:00:00 2001 | 1 | From 8be0c6ac60c96e87d8aa443be9c431844dc3d92a Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 26 Jan 2016 15:16:01 -0800 | 3 | Date: Tue, 26 Jan 2016 15:16:01 -0800 |
4 | Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os | 4 | Subject: [PATCH] fix maybe-uninitialized warnings when compiling with -Os |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch index e3e5d9fb60..6509a293b7 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-avoid-including-sys-poll.h-directly.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 701255c5797f222f0c47ace6437d213607b98d1e Mon Sep 17 00:00:00 2001 | 1 | From 426ee79adeecc24605426030a486d7c5a755048c Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Wed, 3 Feb 2016 18:05:41 -0800 | 3 | Date: Wed, 3 Feb 2016 18:05:41 -0800 |
4 | Subject: [PATCH] avoid including <sys/poll.h> directly | 4 | Subject: [PATCH] avoid including <sys/poll.h> directly |
@@ -14,7 +14,7 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 15 | ||
16 | diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c | 16 | diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c |
17 | index 92c918c..5e27871 100644 | 17 | index b8e5b1a..5bca6e5 100644 |
18 | --- a/sys/dvb/gstdvbsrc.c | 18 | --- a/sys/dvb/gstdvbsrc.c |
19 | +++ b/sys/dvb/gstdvbsrc.c | 19 | +++ b/sys/dvb/gstdvbsrc.c |
20 | @@ -98,7 +98,7 @@ | 20 | @@ -98,7 +98,7 @@ |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch index 029b80e174..50a3143eca 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3bc5d48257032b6bbee532aad15062fbbcc43bfe Mon Sep 17 00:00:00 2001 | 1 | From e6eb7536fcfc2c75f7831f67b1f16f3f36ef2545 Mon Sep 17 00:00:00 2001 |
2 | From: Andrey Zhizhikin <andrey.z@gmail.com> | 2 | From: Andrey Zhizhikin <andrey.z@gmail.com> |
3 | Date: Mon, 27 Jan 2020 10:22:35 +0000 | 3 | Date: Mon, 27 Jan 2020 10:22:35 +0000 |
4 | Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build | 4 | Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build |
@@ -18,7 +18,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
18 | 1 file changed, 3 insertions(+) | 18 | 1 file changed, 3 insertions(+) |
19 | 19 | ||
20 | diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build | 20 | diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build |
21 | index 1d86b90..b5c8b95 100644 | 21 | index 37e2015..326f737 100644 |
22 | --- a/ext/opencv/meson.build | 22 | --- a/ext/opencv/meson.build |
23 | +++ b/ext/opencv/meson.build | 23 | +++ b/ext/opencv/meson.build |
24 | @@ -87,6 +87,9 @@ if opencv_found | 24 | @@ -87,6 +87,9 @@ if opencv_found |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.10.bb index 6e5aa2f206..70b9850a49 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.10.bb | |||
@@ -10,7 +10,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad | |||
10 | file://0002-avoid-including-sys-poll.h-directly.patch \ | 10 | file://0002-avoid-including-sys-poll.h-directly.patch \ |
11 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ | 11 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ |
12 | " | 12 | " |
13 | SRC_URI[sha256sum] = "1bc65d0fd5f53a3636564efd3fcf318c3edcdec39c4109a503c1fc8203840a1d" | 13 | SRC_URI[sha256sum] = "dabcd60c762165bb043eba753d599212514c94684e4db9a2e25484cb6508ebbf" |
14 | 14 | ||
15 | S = "${WORKDIR}/gst-plugins-bad-${PV}" | 15 | S = "${WORKDIR}/gst-plugins-bad-${PV}" |
16 | 16 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch index d5d9838372..34c99ded42 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-ENGR00312515-get-caps-from-src-pad-when-query-caps.patch | |||
@@ -1,13 +1,14 @@ | |||
1 | From f9d48cd85ee68207733b1b91a00453462c33524a Mon Sep 17 00:00:00 2001 | 1 | From 63fe5a7b4ef70e2c490bad3b0838329935a8d77c Mon Sep 17 00:00:00 2001 |
2 | From: zhouming <b42586@freescale.com> | 2 | From: zhouming <b42586@freescale.com> |
3 | Date: Wed, 14 May 2014 10:16:20 +0800 | 3 | Date: Wed, 14 May 2014 10:16:20 +0800 |
4 | Subject: [PATCH 1/4] ENGR00312515: get caps from src pad when query caps | 4 | Subject: [PATCH] ENGR00312515: get caps from src pad when query caps |
5 | 5 | ||
6 | https://bugzilla.gnome.org/show_bug.cgi?id=728312 | 6 | https://bugzilla.gnome.org/show_bug.cgi?id=728312 |
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | 9 | ||
10 | Signed-off-by: zhouming <b42586@freescale.com> | 10 | Signed-off-by: zhouming <b42586@freescale.com> |
11 | |||
11 | --- | 12 | --- |
12 | gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ | 13 | gst-libs/gst/tag/gsttagdemux.c | 13 +++++++++++++ |
13 | 1 file changed, 13 insertions(+) | 14 | 1 file changed, 13 insertions(+) |
@@ -16,10 +17,10 @@ Signed-off-by: zhouming <b42586@freescale.com> | |||
16 | diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c | 17 | diff --git a/gst-libs/gst/tag/gsttagdemux.c b/gst-libs/gst/tag/gsttagdemux.c |
17 | old mode 100644 | 18 | old mode 100644 |
18 | new mode 100755 | 19 | new mode 100755 |
19 | index f545857..62d10ef | 20 | index 173da37..2b7f34c |
20 | --- a/gst-libs/gst/tag/gsttagdemux.c | 21 | --- a/gst-libs/gst/tag/gsttagdemux.c |
21 | +++ b/gst-libs/gst/tag/gsttagdemux.c | 22 | +++ b/gst-libs/gst/tag/gsttagdemux.c |
22 | @@ -1777,6 +1777,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) | 23 | @@ -1796,6 +1796,19 @@ gst_tag_demux_pad_query (GstPad * pad, GstObject * parent, GstQuery * query) |
23 | } | 24 | } |
24 | break; | 25 | break; |
25 | } | 26 | } |
@@ -39,6 +40,3 @@ index f545857..62d10ef | |||
39 | default: | 40 | default: |
40 | res = gst_pad_query_default (pad, parent, query); | 41 | res = gst_pad_query_default (pad, parent, query); |
41 | break; | 42 | break; |
42 | -- | ||
43 | 2.28.0 | ||
44 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch index e453a500c9..c922aadede 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-ssaparse-enhance-SSA-text-lines-parsing.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From f587861bbe12ad0b10370f835592746aafedbf56 Mon Sep 17 00:00:00 2001 | 1 | From 7bf9525528c8f4a47413d7f82214d76f95f0c5f6 Mon Sep 17 00:00:00 2001 |
2 | From: Mingke Wang <mingke.wang@freescale.com> | 2 | From: Mingke Wang <mingke.wang@freescale.com> |
3 | Date: Thu, 19 Mar 2015 14:17:10 +0800 | 3 | Date: Thu, 19 Mar 2015 14:17:10 +0800 |
4 | Subject: [PATCH 2/4] ssaparse: enhance SSA text lines parsing. | 4 | Subject: [PATCH] ssaparse: enhance SSA text lines parsing. |
5 | 5 | ||
6 | some parser will pass in the original ssa text line which starts with "Dialog:" | 6 | some parser will pass in the original ssa text line which starts with "Dialog:" |
7 | and there's are maybe multiple Dialog lines in one input buffer. | 7 | and there's are maybe multiple Dialog lines in one input buffer. |
@@ -9,6 +9,7 @@ and there's are maybe multiple Dialog lines in one input buffer. | |||
9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] | 9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=747496] |
10 | 10 | ||
11 | Signed-off-by: Mingke Wang <mingke.wang@freescale.com> | 11 | Signed-off-by: Mingke Wang <mingke.wang@freescale.com> |
12 | |||
12 | --- | 13 | --- |
13 | gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++---- | 14 | gst/subparse/gstssaparse.c | 150 +++++++++++++++++++++++++++++++++---- |
14 | 1 file changed, 134 insertions(+), 16 deletions(-) | 15 | 1 file changed, 134 insertions(+), 16 deletions(-) |
@@ -17,10 +18,10 @@ Signed-off-by: Mingke Wang <mingke.wang@freescale.com> | |||
17 | diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c | 18 | diff --git a/gst/subparse/gstssaparse.c b/gst/subparse/gstssaparse.c |
18 | old mode 100644 | 19 | old mode 100644 |
19 | new mode 100755 | 20 | new mode 100755 |
20 | index c849c08..4b9636c | 21 | index d6fdb9c..5ebe678 |
21 | --- a/gst/subparse/gstssaparse.c | 22 | --- a/gst/subparse/gstssaparse.c |
22 | +++ b/gst/subparse/gstssaparse.c | 23 | +++ b/gst/subparse/gstssaparse.c |
23 | @@ -262,6 +262,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) | 24 | @@ -270,6 +270,7 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) |
24 | * gst_ssa_parse_push_line: | 25 | * gst_ssa_parse_push_line: |
25 | * @parse: caller element | 26 | * @parse: caller element |
26 | * @txt: text to push | 27 | * @txt: text to push |
@@ -28,7 +29,7 @@ index c849c08..4b9636c | |||
28 | * @start: timestamp for the buffer | 29 | * @start: timestamp for the buffer |
29 | * @duration: duration for the buffer | 30 | * @duration: duration for the buffer |
30 | * | 31 | * |
31 | @@ -271,27 +272,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) | 32 | @@ -279,27 +280,133 @@ gst_ssa_parse_remove_override_codes (GstSsaParse * parse, gchar * txt) |
32 | * Returns: result of the push of the created buffer | 33 | * Returns: result of the push of the created buffer |
33 | */ | 34 | */ |
34 | static GstFlowReturn | 35 | static GstFlowReturn |
@@ -173,7 +174,7 @@ index c849c08..4b9636c | |||
173 | GST_LOG_OBJECT (parse, "Text : %s", t); | 174 | GST_LOG_OBJECT (parse, "Text : %s", t); |
174 | 175 | ||
175 | if (gst_ssa_parse_remove_override_codes (parse, t)) { | 176 | if (gst_ssa_parse_remove_override_codes (parse, t)) { |
176 | @@ -309,13 +416,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, | 177 | @@ -317,13 +424,22 @@ gst_ssa_parse_push_line (GstSsaParse * parse, gchar * txt, |
177 | gst_buffer_fill (buf, 0, escaped, len + 1); | 178 | gst_buffer_fill (buf, 0, escaped, len + 1); |
178 | gst_buffer_set_size (buf, len); | 179 | gst_buffer_set_size (buf, len); |
179 | g_free (escaped); | 180 | g_free (escaped); |
@@ -200,7 +201,7 @@ index c849c08..4b9636c | |||
200 | 201 | ||
201 | ret = gst_pad_push (parse->srcpad, buf); | 202 | ret = gst_pad_push (parse->srcpad, buf); |
202 | 203 | ||
203 | @@ -335,6 +451,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) | 204 | @@ -343,6 +459,7 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) |
204 | GstClockTime ts; | 205 | GstClockTime ts; |
205 | gchar *txt; | 206 | gchar *txt; |
206 | GstMapInfo map; | 207 | GstMapInfo map; |
@@ -208,7 +209,7 @@ index c849c08..4b9636c | |||
208 | 209 | ||
209 | if (G_UNLIKELY (!parse->framed)) | 210 | if (G_UNLIKELY (!parse->framed)) |
210 | goto not_framed; | 211 | goto not_framed; |
211 | @@ -352,13 +469,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) | 212 | @@ -360,13 +477,14 @@ gst_ssa_parse_chain (GstPad * sinkpad, GstObject * parent, GstBuffer * buf) |
212 | /* make double-sure it's 0-terminated and all */ | 213 | /* make double-sure it's 0-terminated and all */ |
213 | gst_buffer_map (buf, &map, GST_MAP_READ); | 214 | gst_buffer_map (buf, &map, GST_MAP_READ); |
214 | txt = g_strndup ((gchar *) map.data, map.size); | 215 | txt = g_strndup ((gchar *) map.data, map.size); |
@@ -224,6 +225,3 @@ index c849c08..4b9636c | |||
224 | 225 | ||
225 | if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { | 226 | if (ret != GST_FLOW_OK && GST_CLOCK_TIME_IS_VALID (ts)) { |
226 | GstSegment segment; | 227 | GstSegment segment; |
227 | -- | ||
228 | 2.28.0 | ||
229 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch index 2af83ff8b9..a605533be8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-viv-fb-Make-sure-config.h-is-included.patch | |||
@@ -1,19 +1,20 @@ | |||
1 | From 153f3b83a3fed77785bd1420bed8bbafa2d791b3 Mon Sep 17 00:00:00 2001 | 1 | From 2b07840122bc2e83bd23dad59aa80d9479f2e1e4 Mon Sep 17 00:00:00 2001 |
2 | From: Carlos Rafael Giani <crg7475@mailbox.org> | 2 | From: Carlos Rafael Giani <crg7475@mailbox.org> |
3 | Date: Tue, 21 May 2019 14:01:11 +0200 | 3 | Date: Tue, 21 May 2019 14:01:11 +0200 |
4 | Subject: [PATCH 3/4] viv-fb: Make sure config.h is included | 4 | Subject: [PATCH] viv-fb: Make sure config.h is included |
5 | 5 | ||
6 | This prevents build errors due to missing GST_API_* symbols | 6 | This prevents build errors due to missing GST_API_* symbols |
7 | 7 | ||
8 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
9 | 9 | ||
10 | Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> | 10 | Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> |
11 | |||
11 | --- | 12 | --- |
12 | gst-libs/gst/gl/gl-prelude.h | 4 ++++ | 13 | gst-libs/gst/gl/gl-prelude.h | 4 ++++ |
13 | 1 file changed, 4 insertions(+) | 14 | 1 file changed, 4 insertions(+) |
14 | 15 | ||
15 | diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h | 16 | diff --git a/gst-libs/gst/gl/gl-prelude.h b/gst-libs/gst/gl/gl-prelude.h |
16 | index 05e1f62..96ce5e6 100644 | 17 | index 85fca5a..946c729 100644 |
17 | --- a/gst-libs/gst/gl/gl-prelude.h | 18 | --- a/gst-libs/gst/gl/gl-prelude.h |
18 | +++ b/gst-libs/gst/gl/gl-prelude.h | 19 | +++ b/gst-libs/gst/gl/gl-prelude.h |
19 | @@ -22,6 +22,10 @@ | 20 | @@ -22,6 +22,10 @@ |
@@ -27,6 +28,3 @@ index 05e1f62..96ce5e6 100644 | |||
27 | #include <gst/gst.h> | 28 | #include <gst/gst.h> |
28 | 29 | ||
29 | #ifdef BUILDING_GST_GL | 30 | #ifdef BUILDING_GST_GL |
30 | -- | ||
31 | 2.28.0 | ||
32 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.10.bb index 980766c74b..d4b69b103f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.10.bb | |||
@@ -11,7 +11,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-ba | |||
11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ | 11 | file://0003-viv-fb-Make-sure-config.h-is-included.patch \ |
12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ | 12 | file://0002-ssaparse-enhance-SSA-text-lines-parsing.patch \ |
13 | " | 13 | " |
14 | SRC_URI[sha256sum] = "fac3e0dd2d8e9370388b34bf8c21b89d5f63bc3cfc12cd7fdc8fc6c1cba03334" | 14 | SRC_URI[sha256sum] = "843a3a2da28e1ee6aeea56dd2be9bffcc3b4bbcd0f974eba4abfc3aa31f0399c" |
15 | 15 | ||
16 | S = "${WORKDIR}/gst-plugins-base-${PV}" | 16 | S = "${WORKDIR}/gst-plugins-base-${PV}" |
17 | 17 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch index 788d752058..9703a3a889 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf8b2fa0f6870589d036f0f33c140a3f85b530a0 Mon Sep 17 00:00:00 2001 | 1 | From 99f48716051ce5ddb8c1b77292213af1e462549e Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 31 Mar 2020 21:23:28 -0700 | 3 | Date: Tue, 31 Mar 2020 21:23:28 -0700 |
4 | Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h | 4 | Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfuncs.h |
@@ -20,13 +20,14 @@ In file included from /mnt/b/yoe/build/tmp/work/cortexa7t2hf-neon-vfpv4-yoe-linu | |||
20 | 20 | ||
21 | Upstream-Status: Pending | 21 | Upstream-Status: Pending |
22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 22 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
23 | |||
23 | --- | 24 | --- |
24 | ext/qt/gstqsgtexture.cc | 2 +- | 25 | ext/qt/gstqsgtexture.cc | 2 +- |
25 | ext/qt/qtwindow.cc | 2 +- | 26 | ext/qt/qtwindow.cc | 2 +- |
26 | 2 files changed, 2 insertions(+), 2 deletions(-) | 27 | 2 files changed, 2 insertions(+), 2 deletions(-) |
27 | 28 | ||
28 | diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc | 29 | diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc |
29 | index a05d26e..4cc9fc6 100644 | 30 | index 663696b..36b17d4 100644 |
30 | --- a/ext/qt/gstqsgtexture.cc | 31 | --- a/ext/qt/gstqsgtexture.cc |
31 | +++ b/ext/qt/gstqsgtexture.cc | 32 | +++ b/ext/qt/gstqsgtexture.cc |
32 | @@ -27,7 +27,7 @@ | 33 | @@ -27,7 +27,7 @@ |
@@ -39,7 +40,7 @@ index a05d26e..4cc9fc6 100644 | |||
39 | 40 | ||
40 | #define GST_CAT_DEFAULT gst_qsg_texture_debug | 41 | #define GST_CAT_DEFAULT gst_qsg_texture_debug |
41 | diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc | 42 | diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc |
42 | index 9360c33..0dfd3f1 100644 | 43 | index 2872cb5..5a36be9 100644 |
43 | --- a/ext/qt/qtwindow.cc | 44 | --- a/ext/qt/qtwindow.cc |
44 | +++ b/ext/qt/qtwindow.cc | 45 | +++ b/ext/qt/qtwindow.cc |
45 | @@ -25,7 +25,7 @@ | 46 | @@ -25,7 +25,7 @@ |
@@ -51,6 +52,3 @@ index 9360c33..0dfd3f1 100644 | |||
51 | #include "qtwindow.h" | 52 | #include "qtwindow.h" |
52 | #include "gstqsgtexture.h" | 53 | #include "gstqsgtexture.h" |
53 | #include "gstqtglutility.h" | 54 | #include "gstqtglutility.h" |
54 | -- | ||
55 | 2.28.0 | ||
56 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch index fbbf029a2c..33bd4200f6 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5ce1e410965ed047a03c09b17796162f0363e396 Mon Sep 17 00:00:00 2001 | 1 | From b77d4806fd5de50d0b017a3e6a19c5bfdef7b3e4 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 13 Feb 2023 12:47:31 -0800 | 3 | Date: Mon, 13 Feb 2023 12:47:31 -0800 |
4 | Subject: [PATCH] v4l2: Define ioctl_req_t for posix/linux case | 4 | Subject: [PATCH] v4l2: Define ioctl_req_t for posix/linux case |
@@ -18,12 +18,13 @@ gstv4l2object.c:544:23: error: incompatible function pointer types assigning to | |||
18 | 18 | ||
19 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3950] | 19 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3950] |
20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 20 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
21 | |||
21 | --- | 22 | --- |
22 | sys/v4l2/gstv4l2object.h | 2 ++ | 23 | sys/v4l2/gstv4l2object.h | 2 ++ |
23 | 1 file changed, 2 insertions(+) | 24 | 1 file changed, 2 insertions(+) |
24 | 25 | ||
25 | diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h | 26 | diff --git a/sys/v4l2/gstv4l2object.h b/sys/v4l2/gstv4l2object.h |
26 | index 3a5c961..4f43008 100644 | 27 | index d95b375..5223cbb 100644 |
27 | --- a/sys/v4l2/gstv4l2object.h | 28 | --- a/sys/v4l2/gstv4l2object.h |
28 | +++ b/sys/v4l2/gstv4l2object.h | 29 | +++ b/sys/v4l2/gstv4l2object.h |
29 | @@ -76,6 +76,8 @@ typedef gboolean (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object); | 30 | @@ -76,6 +76,8 @@ typedef gboolean (*GstV4l2UpdateFpsFunction) (GstV4l2Object * v4l2object); |
@@ -35,6 +36,3 @@ index 3a5c961..4f43008 100644 | |||
35 | #else | 36 | #else |
36 | typedef gulong ioctl_req_t; | 37 | typedef gulong ioctl_req_t; |
37 | #endif | 38 | #endif |
38 | -- | ||
39 | 2.39.1 | ||
40 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.10.bb index 052ba1801b..9a76aaf247 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.10.bb | |||
@@ -8,7 +8,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-go | |||
8 | file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ | 8 | file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \ |
9 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" | 9 | file://0001-v4l2-Define-ioctl_req_t-for-posix-linux-case.patch" |
10 | 10 | ||
11 | SRC_URI[sha256sum] = "26959fcfebfff637d4ea08ef40316baf31b61bb7729820b0684e800c3a1478b6" | 11 | SRC_URI[sha256sum] = "f748feae922cad62f20102a84ade8f42b78e1e44a34866aa3ea766f9172e1c7f" |
12 | 12 | ||
13 | S = "${WORKDIR}/gst-plugins-good-${PV}" | 13 | S = "${WORKDIR}/gst-plugins-good-${PV}" |
14 | 14 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.10.bb index 722f8e9fe3..7cbbf9fda0 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.10.bb | |||
@@ -15,7 +15,7 @@ SRC_URI = " \ | |||
15 | https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ | 15 | https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \ |
16 | " | 16 | " |
17 | 17 | ||
18 | SRC_URI[sha256sum] = "0bf685d66015a01dd3fc1671b64a1c8acb321dd9d4ab9e05a29ab19782aa6236" | 18 | SRC_URI[sha256sum] = "cc80a81a22c0b3b31ab7f1b8bf18dda23c72d2791b86cc6264923a68336329ea" |
19 | 19 | ||
20 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" | 20 | S = "${WORKDIR}/gst-plugins-ugly-${PV}" |
21 | 21 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.10.bb index e086fa6866..b829a0fc62 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.10.bb | |||
@@ -8,7 +8,7 @@ LICENSE = "LGPL-2.1-or-later" | |||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" | 8 | LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740" |
9 | 9 | ||
10 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" | 10 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" |
11 | SRC_URI[sha256sum] = "3f9d5c6ffefda268703744b592a6b3983aa6723273b1220ecbcb62c2a5800009" | 11 | SRC_URI[sha256sum] = "99e37ea9f7163099734f9b0fce361bc67a0e7a65ffba9bc497127506a3fdedb3" |
12 | 12 | ||
13 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" | 13 | DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" |
14 | RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" | 14 | RDEPENDS:${PN} += "gstreamer1.0 gstreamer1.0-plugins-base python3-pygobject" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.10.bb index e232263a46..0e910e3dc4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.10.bb | |||
@@ -10,7 +10,7 @@ PNREAL = "gst-rtsp-server" | |||
10 | 10 | ||
11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" | 11 | SRC_URI = "https://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz" |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "808af148f89404ff74850f8ca5272bed4bfe67f9620231dc4514fd07eb26d0a4" | 13 | SRC_URI[sha256sum] = "60eb4f80b5a7ca929c21a61d50be9813a3413787959a5875de56a8ad5ca25f35" |
14 | 14 | ||
15 | S = "${WORKDIR}/${PNREAL}-${PV}" | 15 | S = "${WORKDIR}/${PNREAL}-${PV}" |
16 | 16 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.10.bb index c53ee29051..b52b7aa4c4 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.10.bb | |||
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" | |||
11 | 11 | ||
12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" | 12 | SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz" |
13 | 13 | ||
14 | SRC_URI[sha256sum] = "8ba20da8c4cbf5b2953dba904672c4275d0053e1528f97fdf8e59942c7883ca8" | 14 | SRC_URI[sha256sum] = "094ca144aca8f2c554a2517dfdc421fa37c80294c6f12b992c20cbc73aa2c0bd" |
15 | 15 | ||
16 | S = "${WORKDIR}/${REALPN}-${PV}" | 16 | S = "${WORKDIR}/${REALPN}-${PV}" |
17 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" | 17 | DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch index 1b9278db04..0d839bd6c8 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0001-tests-respect-the-idententaion-used-in-meson.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 559e1dd850b2b9eb3a415aa43e932e5e48f605cd Mon Sep 17 00:00:00 2001 | 1 | From 5372cd5bf2a9dd247b9c5fc6e4fe248046dbb085 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 | 3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 |
4 | Subject: [PATCH] tests: respect the idententaion used in meson | 4 | Subject: [PATCH] tests: respect the idententaion used in meson |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch index 568e38cbf1..64717e66c3 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0002-tests-add-support-for-install-the-tests.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 08b1aaff972a7f6349373fc1ad4cc23081adb52c Mon Sep 17 00:00:00 2001 | 1 | From 27e977d03b0f7c1d0bf19621ef0cec0585410e7b Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 | 3 | Date: Sun, 11 Apr 2021 19:48:13 +0100 |
4 | Subject: [PATCH] tests: add support for install the tests | 4 | Subject: [PATCH] tests: add support for install the tests |
@@ -20,7 +20,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
20 | create mode 100644 tests/check/template.test.in | 20 | create mode 100644 tests/check/template.test.in |
21 | 21 | ||
22 | diff --git a/meson.build b/meson.build | 22 | diff --git a/meson.build b/meson.build |
23 | index f9f591d..3906fb3 100644 | 23 | index 60c7bec..f7650b1 100644 |
24 | --- a/meson.build | 24 | --- a/meson.build |
25 | +++ b/meson.build | 25 | +++ b/meson.build |
26 | @@ -606,6 +606,10 @@ if bashcomp_dep.found() | 26 | @@ -606,6 +606,10 @@ if bashcomp_dep.found() |
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch index 10a6dcc619..0fd830f150 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0003-tests-use-a-dictionaries-for-environment.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From fe830f0f75f3b4b41e3dbef8d4cf6ee4103c9e06 Mon Sep 17 00:00:00 2001 | 1 | From 7041bc5adf9501beb1428d8bbae6b351a6bf07f9 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sat, 24 Apr 2021 10:34:47 +0100 | 3 | Date: Sat, 24 Apr 2021 10:34:47 +0100 |
4 | Subject: [PATCH 3/4] tests: use a dictionaries for environment | 4 | Subject: [PATCH] tests: use a dictionaries for environment |
5 | 5 | ||
6 | meson environment() can't be passed to configure_file and it is needed for installed_tests, | 6 | meson environment() can't be passed to configure_file and it is needed for installed_tests, |
7 | use a dictionary as this is simplest solution to install the environment. | 7 | use a dictionary as this is simplest solution to install the environment. |
@@ -9,15 +9,16 @@ use a dictionary as this is simplest solution to install the environment. | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | 9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] |
10 | 10 | ||
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | subprojects/gstreamer/tests/check/meson.build | 21 ++++++++++++------- | 14 | tests/check/meson.build | 21 +++++++++++++-------- |
14 | 1 file changed, 13 insertions(+), 8 deletions(-) | 15 | 1 file changed, 13 insertions(+), 8 deletions(-) |
15 | 16 | ||
16 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 17 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
17 | index 00a138a568..48ec2532f8 100644 | 18 | index f2d400f..50dff7f 100644 |
18 | --- a/subprojects/gstreamer/tests/check/meson.build | 19 | --- a/tests/check/meson.build |
19 | +++ b/subprojects/gstreamer/tests/check/meson.build | 20 | +++ b/tests/check/meson.build |
20 | @@ -161,14 +161,19 @@ foreach t : core_tests | 21 | @@ -160,14 +160,19 @@ foreach t : core_tests |
21 | install: installed_tests_enabled, | 22 | install: installed_tests_enabled, |
22 | ) | 23 | ) |
23 | 24 | ||
@@ -45,6 +46,3 @@ index 00a138a568..48ec2532f8 100644 | |||
45 | 46 | ||
46 | if installed_tests_enabled | 47 | if installed_tests_enabled |
47 | test_conf = configuration_data() | 48 | test_conf = configuration_data() |
48 | -- | ||
49 | 2.33.1 | ||
50 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch index efa004f8ce..5689dc9fbb 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0/0004-tests-add-helper-script-to-run-the-installed_tests.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 4dcbabebca2ad6f1fdd59ee35a858082e87db7b6 Mon Sep 17 00:00:00 2001 | 1 | From 1b1d1ce4227b6bea7c7def5dac4a663486e070c2 Mon Sep 17 00:00:00 2001 |
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | 2 | From: Jose Quaresma <quaresma.jose@gmail.com> |
3 | Date: Sun, 2 May 2021 01:58:01 +0100 | 3 | Date: Sun, 2 May 2021 01:58:01 +0100 |
4 | Subject: [PATCH 4/4] tests: add helper script to run the installed_tests | 4 | Subject: [PATCH] tests: add helper script to run the installed_tests |
5 | 5 | ||
6 | - this is a bash script that will run the installed_tests | 6 | - this is a bash script that will run the installed_tests |
7 | with some of the environment variables used in the meson | 7 | with some of the environment variables used in the meson |
@@ -10,18 +10,19 @@ testing framework. | |||
10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | 10 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] |
11 | 11 | ||
12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 12 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | subprojects/gstreamer/tests/check/meson.build | 17 +++++++++++++++++ | 15 | tests/check/meson.build | 17 +++++++++++++++++ |
15 | .../gstreamer/tests/check/template.sh.in | 9 +++++++++ | 16 | tests/check/template.sh.in | 9 +++++++++ |
16 | .../gstreamer/tests/check/template.test.in | 2 +- | 17 | tests/check/template.test.in | 2 +- |
17 | 3 files changed, 27 insertions(+), 1 deletion(-) | 18 | 3 files changed, 27 insertions(+), 1 deletion(-) |
18 | create mode 100755 subprojects/gstreamer/tests/check/template.sh.in | 19 | create mode 100755 tests/check/template.sh.in |
19 | 20 | ||
20 | diff --git a/subprojects/gstreamer/tests/check/meson.build b/subprojects/gstreamer/tests/check/meson.build | 21 | diff --git a/tests/check/meson.build b/tests/check/meson.build |
21 | index 48ec2532f8..7dc4990d4e 100644 | 22 | index 50dff7f..2b9e979 100644 |
22 | --- a/subprojects/gstreamer/tests/check/meson.build | 23 | --- a/tests/check/meson.build |
23 | +++ b/subprojects/gstreamer/tests/check/meson.build | 24 | +++ b/tests/check/meson.build |
24 | @@ -185,6 +185,23 @@ foreach t : core_tests | 25 | @@ -184,6 +184,23 @@ foreach t : core_tests |
25 | install_dir: installed_tests_metadir, | 26 | install_dir: installed_tests_metadir, |
26 | configuration: test_conf | 27 | configuration: test_conf |
27 | ) | 28 | ) |
@@ -45,11 +46,11 @@ index 48ec2532f8..7dc4990d4e 100644 | |||
45 | endif | 46 | endif |
46 | 47 | ||
47 | test(test_name, exe, env: env, timeout : 3 * 60) | 48 | test(test_name, exe, env: env, timeout : 3 * 60) |
48 | diff --git a/subprojects/gstreamer/tests/check/template.sh.in b/subprojects/gstreamer/tests/check/template.sh.in | 49 | diff --git a/tests/check/template.sh.in b/tests/check/template.sh.in |
49 | new file mode 100755 | 50 | new file mode 100755 |
50 | index 0000000000..cf7d31b0ea | 51 | index 0000000..cf7d31b |
51 | --- /dev/null | 52 | --- /dev/null |
52 | +++ b/subprojects/gstreamer/tests/check/template.sh.in | 53 | +++ b/tests/check/template.sh.in |
53 | @@ -0,0 +1,9 @@ | 54 | @@ -0,0 +1,9 @@ |
54 | +#!/bin/sh | 55 | +#!/bin/sh |
55 | + | 56 | + |
@@ -60,15 +61,12 @@ index 0000000000..cf7d31b0ea | |||
60 | +GST_REGISTRY=@GST_REGISTRY@ | 61 | +GST_REGISTRY=@GST_REGISTRY@ |
61 | +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" | 62 | +GST_STATE_IGNORE_ELEMENTS="@GST_STATE_IGNORE_ELEMENTS@" |
62 | +exec @TEST@ | 63 | +exec @TEST@ |
63 | diff --git a/subprojects/gstreamer/tests/check/template.test.in b/subprojects/gstreamer/tests/check/template.test.in | 64 | diff --git a/tests/check/template.test.in b/tests/check/template.test.in |
64 | index f701627f87..b74ef6ad73 100644 | 65 | index f701627..b74ef6a 100644 |
65 | --- a/subprojects/gstreamer/tests/check/template.test.in | 66 | --- a/tests/check/template.test.in |
66 | +++ b/subprojects/gstreamer/tests/check/template.test.in | 67 | +++ b/tests/check/template.test.in |
67 | @@ -1,3 +1,3 @@ | 68 | @@ -1,3 +1,3 @@ |
68 | [Test] | 69 | [Test] |
69 | Type=session | 70 | Type=session |
70 | -Exec=@installed_tests_dir@/@program@ | 71 | -Exec=@installed_tests_dir@/@program@ |
71 | +Exec=@installed_tests_dir@/@program@.sh | 72 | +Exec=@installed_tests_dir@/@program@.sh |
72 | -- | ||
73 | 2.33.1 | ||
74 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.9.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.10.bb index b4ab6ad10c..0c944e9e11 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.9.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.10.bb | |||
@@ -19,10 +19,10 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.x | |||
19 | file://run-ptest \ | 19 | file://run-ptest \ |
20 | file://0001-tests-respect-the-idententaion-used-in-meson.patch \ | 20 | file://0001-tests-respect-the-idententaion-used-in-meson.patch \ |
21 | file://0002-tests-add-support-for-install-the-tests.patch \ | 21 | file://0002-tests-add-support-for-install-the-tests.patch \ |
22 | file://0003-tests-use-a-dictionaries-for-environment.patch;striplevel=3 \ | 22 | file://0003-tests-use-a-dictionaries-for-environment.patch \ |
23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch;striplevel=3 \ | 23 | file://0004-tests-add-helper-script-to-run-the-installed_tests.patch \ |
24 | " | 24 | " |
25 | SRC_URI[sha256sum] = "1e7124d347e8cdc80f08ec1d370c201be513002af1102bb20e83c5279cb48ebd" | 25 | SRC_URI[sha256sum] = "969aaef396f252ce925132a4be2aa004e0320f5c1baf0acaaae09c544a6759f4" |
26 | 26 | ||
27 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ | 27 | PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \ |
28 | check \ | 28 | check \ |