From d2f3022132187c7ac4dcd47a96f2f11b336b5d71 Mon Sep 17 00:00:00 2001 From: Cristinel Panfir Date: Fri, 20 Dec 2019 13:17:37 +0200 Subject: 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 --- ...Add-a-new-definition-for-unspecified-syst.patch | 68 ------------------- ...Fix-the-string-to-define-unspecified-syst.patch | 28 -------- .../gstreamer/gstreamer1.0_1.14.imx.bb | 78 ---------------------- .../gstreamer/gstreamer1.0_1.16.imx.bb | 76 +++++++++++++++++++++ 4 files changed, 76 insertions(+), 174 deletions(-) delete mode 100644 recipes-multimedia/gstreamer/files/0001-protection-Add-a-new-definition-for-unspecified-syst.patch delete mode 100644 recipes-multimedia/gstreamer/files/0001-protection-Fix-the-string-to-define-unspecified-syst.patch delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb create mode 100644 recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb 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 5b3faf602..000000000 --- a/recipes-multimedia/gstreamer/files/0001-protection-Add-a-new-definition-for-unspecified-syst.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 05a3da347b3b8dbaf470793dc3f9ebb23e6fc67f Mon Sep 17 00:00:00 2001 -From: Yacine Bandou -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 - - 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 index 04d0a0673..000000000 --- a/recipes-multimedia/gstreamer/files/0001-protection-Fix-the-string-to-define-unspecified-syst.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b89b1802df44829a0c034db5807bc893ad3c7774 Mon Sep 17 00:00:00 2001 -From: Thibault Saunier -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 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb deleted file mode 100644 index 1f5a1865c..000000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0_1.14.imx.bb +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY = "GStreamer 1.0 multimedia framework" -DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ -It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." -HOMEPAGE = "http://gstreamer.freedesktop.org/" -BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" -SECTION = "multimedia" -LICENSE = "LGPLv2+" - -DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native elfutils" - -inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc - -# This way common/m4/introspection.m4 will come first -# (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file) -acpaths = "-I ${S}/common/m4 -I ${S}/m4" - -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ - file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" - -# 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" - -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" - -DEFAULT_PREFERENCE = "-1" - -EXTRA_AUTORECONF = "" - -PACKAGECONFIG ??= "" - -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" -PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," -PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks," - -EXTRA_OECONF = " \ - --disable-dependency-tracking \ - --disable-examples \ -" - -CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" - -# musl libc generates warnings if is included directly -CACHED_CONFIGUREVARS += "ac_cv_header_sys_poll_h=no" - -PACKAGES += "${PN}-bash-completion" - -FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" -FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" -FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" - -RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" -RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" - -delete_pkg_m4_file() { - # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection - rm "${S}/common/m4/pkg.m4" || true - rm -f "${S}/common/m4/gtk-doc.m4" -} - -do_configure[prefuncs] += "delete_pkg_m4_file" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" -} - -S = "${WORKDIR}/git" - -COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" diff --git a/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb new file mode 100644 index 000000000..8924033eb --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb @@ -0,0 +1,76 @@ +SUMMARY = "GStreamer 1.0 multimedia framework" +DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \ +It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime." +HOMEPAGE = "http://gstreamer.freedesktop.org/" +BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer" +SECTION = "multimedia" +LICENSE = "LGPLv2+" + +DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native elfutils" + +inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc + +# This way common/m4/introspection.m4 will come first +# (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file) +acpaths = "-I ${S}/common/m4 -I ${S}/m4" + +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ + file://gst/gst.h;beginline=1;endline=21;md5=e059138481205ee2c6fc1c079c016d0d" + +# Use i.MX fork of GST for customizations +GST1.0_SRC ?= "gitsm://source.codeaurora.org/external/imx/gstreamer.git;protocol=https" +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 \ +" +SRCREV = "a4c220605ac0923596b89f4f07c05d235bc09259" + +DEFAULT_PREFERENCE = "-1" + +EXTRA_AUTORECONF = "" + +PACKAGECONFIG ??= "" + +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests" +PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind," +PACKAGECONFIG[gst-tracer-hooks] = "--enable-gst-tracer-hooks,--disable-gst-tracer-hooks," + +EXTRA_OECONF = " \ + --disable-dependency-tracking \ + --disable-examples \ +" + +CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no" + +# musl libc generates warnings if is included directly +CACHED_CONFIGUREVARS += "ac_cv_header_sys_poll_h=no" + +PACKAGES += "${PN}-bash-completion" + +FILES_${PN} += "${libdir}/gstreamer-1.0/*.so" +FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" +FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" + +RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" + +delete_pkg_m4_file() { + # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection + rm "${S}/common/m4/pkg.m4" || true + rm -f "${S}/common/m4/gtk-doc.m4" +} + +do_configure[prefuncs] += "delete_pkg_m4_file" + +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs" +} + +S = "${WORKDIR}/git" + +COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" -- cgit v1.2.3-54-g00ecf