diff options
author | Cristinel Panfir <cristinel.panfir@nxp.com> | 2019-12-20 13:17:37 +0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2019-12-20 16:54:20 -0300 |
commit | d2f3022132187c7ac4dcd47a96f2f11b336b5d71 (patch) | |
tree | 64120fe862844174621fe04e381053ac3ddc02c7 | |
parent | 08332c833b69a46e99621b68a67d04443c93e906 (diff) | |
download | meta-freescale-d2f3022132187c7ac4dcd47a96f2f11b336b5d71.tar.gz |
gstreamer1.0: Upgrade to 1.16.0
- Switch to MM_04.05.01_1909_L4.19.35 branch.
- Drop GST_PROTECTION_UNSPECIFIED_SYSTEM_ID patches,
those are included in 1.16 source code.
Signed-off-by: Cristinel Panfir <cristinel.panfir@nxp.com>
-rw-r--r-- | recipes-multimedia/gstreamer/files/0001-protection-Add-a-new-definition-for-unspecified-syst.patch | 68 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/files/0001-protection-Fix-the-string-to-define-unspecified-syst.patch | 28 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb) | 6 |
3 files changed, 2 insertions, 100 deletions
diff --git a/recipes-multimedia/gstreamer/files/0001-protection-Add-a-new-definition-for-unspecified-syst.patch b/recipes-multimedia/gstreamer/files/0001-protection-Add-a-new-definition-for-unspecified-syst.patch deleted file mode 100644 index 5b3faf60..00000000 --- a/recipes-multimedia/gstreamer/files/0001-protection-Add-a-new-definition-for-unspecified-syst.patch +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | From 05a3da347b3b8dbaf470793dc3f9ebb23e6fc67f Mon Sep 17 00:00:00 2001 | ||
2 | From: Yacine Bandou <yacine.bandou@softathome.com> | ||
3 | Date: Mon, 1 Oct 2018 12:11:47 +0200 | ||
4 | Subject: [PATCH] protection: Add a new definition for unspecified system | ||
5 | protection | ||
6 | |||
7 | In some cases the system protection ID is not present in the contents | ||
8 | or in their metadata. | ||
9 | This define is used to set the value of the "system_id" field in GstProtectionEvent, | ||
10 | with this value, the application will use an external information to choose which | ||
11 | protection system to use. | ||
12 | |||
13 | Example: The matroskademux uses this value in the case of encrypted WebM, | ||
14 | the application will choose the appropriate protection system based on the information | ||
15 | received through EME API. | ||
16 | |||
17 | https://bugzilla.gnome.org/show_bug.cgi?id=797231 | ||
18 | Upstream-Status: Backport [1.15.1] | ||
19 | |||
20 | --- | ||
21 | docs/gst/gstreamer-sections.txt | 1 + | ||
22 | gst/gstprotection.h | 18 ++++++++++++++++++ | ||
23 | 2 files changed, 19 insertions(+) | ||
24 | |||
25 | diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt | ||
26 | index 492c4d5..ecc6b04 100644 | ||
27 | --- a/docs/gst/gstreamer-sections.txt | ||
28 | +++ b/docs/gst/gstreamer-sections.txt | ||
29 | @@ -2506,6 +2506,7 @@ gst_buffer_get_protection_meta | ||
30 | gst_protection_select_system | ||
31 | gst_protection_filter_systems_by_available_decryptors | ||
32 | GST_PROTECTION_SYSTEM_ID_CAPS_FIELD | ||
33 | +GST_PROTECTION_UNSPECIFIED_SYSTEM_ID | ||
34 | <SUBSECTION Standard> | ||
35 | GST_PROTECTION_META_API_TYPE | ||
36 | GST_PROTECTION_META_INFO | ||
37 | diff --git a/gst/gstprotection.h b/gst/gstprotection.h | ||
38 | index a7669ea..0ed87e4 100644 | ||
39 | --- a/gst/gstprotection.h | ||
40 | +++ b/gst/gstprotection.h | ||
41 | @@ -34,6 +34,24 @@ G_BEGIN_DECLS | ||
42 | */ | ||
43 | #define GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system" | ||
44 | |||
45 | +/** | ||
46 | + * GST_PROTECTION_UNSPECIFIED_SYSTEM_ID: | ||
47 | + * | ||
48 | + * The protection system value of the unspecified UUID. | ||
49 | + * In some cases the system protection ID is not present in the contents or in their | ||
50 | + * metadata, as encrypted WebM. | ||
51 | + * This define is used to set the value of the "system_id" field in GstProtectionEvent, | ||
52 | + * with this value, the application will use an external information to choose which | ||
53 | + * protection system to use. | ||
54 | + * | ||
55 | + * Example: The matroskademux uses this value in the case of encrypted WebM, | ||
56 | + * the application will choose the appropriate protection system based on the information | ||
57 | + * received through EME API. | ||
58 | + * | ||
59 | + * Since: 1.16 | ||
60 | + */ | ||
61 | +#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified.gstreamer.org" | ||
62 | + | ||
63 | typedef struct _GstProtectionMeta GstProtectionMeta; | ||
64 | /** | ||
65 | * GstProtectionMeta: | ||
66 | -- | ||
67 | 2.7.4 | ||
68 | |||
diff --git a/recipes-multimedia/gstreamer/files/0001-protection-Fix-the-string-to-define-unspecified-syst.patch b/recipes-multimedia/gstreamer/files/0001-protection-Fix-the-string-to-define-unspecified-syst.patch deleted file mode 100644 index 04d0a067..00000000 --- a/recipes-multimedia/gstreamer/files/0001-protection-Fix-the-string-to-define-unspecified-syst.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From b89b1802df44829a0c034db5807bc893ad3c7774 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thibault Saunier <tsaunier@igalia.com> | ||
3 | Date: Wed, 3 Oct 2018 18:23:01 +0200 | ||
4 | Subject: [PATCH] protection: Fix the string to define unspecified system id | ||
5 | |||
6 | Setting it to "unspecified-system-id". | ||
7 | |||
8 | Upstream-Status: Backport [1.15.1] | ||
9 | --- | ||
10 | gst/gstprotection.h | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/gst/gstprotection.h b/gst/gstprotection.h | ||
14 | index 0ed87e4..f77a7bf 100644 | ||
15 | --- a/gst/gstprotection.h | ||
16 | +++ b/gst/gstprotection.h | ||
17 | @@ -50,7 +50,7 @@ G_BEGIN_DECLS | ||
18 | * | ||
19 | * Since: 1.16 | ||
20 | */ | ||
21 | -#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified.gstreamer.org" | ||
22 | +#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified-system-id" | ||
23 | |||
24 | typedef struct _GstProtectionMeta GstProtectionMeta; | ||
25 | /** | ||
26 | -- | ||
27 | 2.7.4 | ||
28 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb index 1f5a1865..8924033e 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb | |||
@@ -19,17 +19,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ | |||
19 | 19 | ||
20 | # Use i.MX fork of GST for customizations | 20 | # Use i.MX fork of GST for customizations |
21 | GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" | 21 | GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" |
22 | SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" | 22 | SRCBRANCH = "MM_04.05.01_1909_L4.19.35" |
23 | 23 | ||
24 | SRC_URI = " \ | 24 | SRC_URI = " \ |
25 | ${GST1.0_SRC};branch=${SRCBRANCH} \ | 25 | ${GST1.0_SRC};branch=${SRCBRANCH} \ |
26 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ | 26 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ |
27 | file://gtk-doc-tweaks.patch \ | 27 | file://gtk-doc-tweaks.patch \ |
28 | file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ | 28 | file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \ |
29 | file://0001-protection-Add-a-new-definition-for-unspecified-syst.patch \ | ||
30 | file://0001-protection-Fix-the-string-to-define-unspecified-syst.patch \ | ||
31 | " | 29 | " |
32 | SRCREV = "d42548da09724ad8cc1aa4f1944607920be2f4c0" | 30 | SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259" |
33 | 31 | ||
34 | DEFAULT_PREFERENCE = "-1" | 32 | DEFAULT_PREFERENCE = "-1" |
35 | 33 | ||