]> code.ossystems Code Review - meta-freescale.git/commitdiff
gstreamer1.0: Upgrade to 1.16.0
authorCristinel Panfir <cristinel.panfir@nxp.com>
Fri, 20 Dec 2019 11:17:37 +0000 (13:17 +0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Fri, 20 Dec 2019 19:54:20 +0000 (16:54 -0300)
- 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>
recipes-multimedia/gstreamer/files/0001-protection-Add-a-new-definition-for-unspecified-syst.patch [deleted file]
recipes-multimedia/gstreamer/files/0001-protection-Fix-the-string-to-define-unspecified-syst.patch [deleted file]
recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb [moved from recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb with 91% similarity]

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 (file)
index 5b3faf6..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-From 05a3da347b3b8dbaf470793dc3f9ebb23e6fc67f Mon Sep 17 00:00:00 2001
-From: Yacine Bandou <yacine.bandou@softathome.com>
-Date: Mon, 1 Oct 2018 12:11:47 +0200
-Subject: [PATCH] protection: Add a new definition for unspecified system
- protection
-
-In some cases the system protection ID is not present in the contents
-or in their metadata.
-This define is used to set the value of the "system_id" field in GstProtectionEvent,
-with this value, the application will use an external information to choose which
-protection system to use.
-
-Example: The matroskademux uses this value in the case of encrypted WebM,
-the application will choose the appropriate protection system based on the information
-received through EME API.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=797231
-Upstream-Status: Backport [1.15.1]
-
----
- docs/gst/gstreamer-sections.txt |  1 +
- gst/gstprotection.h             | 18 ++++++++++++++++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt
-index 492c4d5..ecc6b04 100644
---- a/docs/gst/gstreamer-sections.txt
-+++ b/docs/gst/gstreamer-sections.txt
-@@ -2506,6 +2506,7 @@ gst_buffer_get_protection_meta
- gst_protection_select_system
- gst_protection_filter_systems_by_available_decryptors
- GST_PROTECTION_SYSTEM_ID_CAPS_FIELD
-+GST_PROTECTION_UNSPECIFIED_SYSTEM_ID
- <SUBSECTION Standard>
- GST_PROTECTION_META_API_TYPE
- GST_PROTECTION_META_INFO
-diff --git a/gst/gstprotection.h b/gst/gstprotection.h
-index a7669ea..0ed87e4 100644
---- a/gst/gstprotection.h
-+++ b/gst/gstprotection.h
-@@ -34,6 +34,24 @@ G_BEGIN_DECLS
-  */
- #define GST_PROTECTION_SYSTEM_ID_CAPS_FIELD "protection-system"
-+/**
-+ * GST_PROTECTION_UNSPECIFIED_SYSTEM_ID:
-+ *
-+ * The protection system value of the unspecified UUID.
-+ * In some cases the system protection ID is not present in the contents or in their
-+ * metadata, as encrypted WebM.
-+ * This define is used to set the value of the "system_id" field in GstProtectionEvent,
-+ * with this value, the application will use an external information to choose which
-+ * protection system to use.
-+ *
-+ * Example: The matroskademux uses this value in the case of encrypted WebM,
-+ * the application will choose the appropriate protection system based on the information
-+ * received through EME API.
-+ *
-+ * Since: 1.16
-+ */
-+#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified.gstreamer.org"
-+
- typedef struct _GstProtectionMeta GstProtectionMeta;
- /**
-  * GstProtectionMeta:
--- 
-2.7.4
-
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 (file)
index 04d0a06..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From b89b1802df44829a0c034db5807bc893ad3c7774 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <tsaunier@igalia.com>
-Date: Wed, 3 Oct 2018 18:23:01 +0200
-Subject: [PATCH] protection: Fix the string to define unspecified system id
-
-Setting it to "unspecified-system-id".
-
-Upstream-Status: Backport [1.15.1]
----
- gst/gstprotection.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gst/gstprotection.h b/gst/gstprotection.h
-index 0ed87e4..f77a7bf 100644
---- a/gst/gstprotection.h
-+++ b/gst/gstprotection.h
-@@ -50,7 +50,7 @@ G_BEGIN_DECLS
-  *
-  * Since: 1.16
-  */
--#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified.gstreamer.org"
-+#define GST_PROTECTION_UNSPECIFIED_SYSTEM_ID "unspecified-system-id"
- typedef struct _GstProtectionMeta GstProtectionMeta;
- /**
--- 
-2.7.4
-
similarity index 91%
rename from recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb
rename to recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb
index 1f5a1865ce61a5db53aa4b1a3bb3cd5561e492f8..8924033eb5a765abc972e43b35f3dea88832e7d0 100644 (file)
@@ -19,17 +19,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
 
 # Use i.MX fork of GST for customizations
 GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https"
-SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA"
+SRCBRANCH = "MM_04.05.01_1909_L4.19.35"
 
 SRC_URI = " \
     ${GST1.0_SRC};branch=${SRCBRANCH} \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://gtk-doc-tweaks.patch \
     file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
-    file://0001-protection-Add-a-new-definition-for-unspecified-syst.patch \
-    file://0001-protection-Fix-the-string-to-define-unspecified-syst.patch \
 "
-SRCREV = "d42548da09724ad8cc1aa4f1944607920be2f4c0"
+SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259"
 
 DEFAULT_PREFERENCE = "-1"