From 1eb3c0385a8a2c6815492395cea5b280d31c73bd Mon Sep 17 00:00:00 2001 From: Cristinel Panfir Date: Fri, 20 Dec 2019 13:54:35 +0200 Subject: [PATCH] gstreamer1.0-plugins-base: Upgrade to 1.16 Signed-off-by: Cristinel Panfir --- ...ix-calls-to-pkg-config-with-PKG_CONF.patch | 0 ...-include-directories-when-calling-in.patch | 0 ...ect-reference-to-gstreamer-sdp-in-Ma.patch | 0 ...gio_unix_2_0-dependency-configurable.patch | 0 ... => gstreamer1.0-plugins-base_1.16.imx.bb} | 52 ++++++++++++------- 5 files changed, 33 insertions(+), 19 deletions(-) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base-1.14.imx => gstreamer1.0-plugins-base-1.16.imx}/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base-1.14.imx => gstreamer1.0-plugins-base-1.16.imx}/0003-riff-add-missing-include-directories-when-calling-in.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base-1.14.imx => gstreamer1.0-plugins-base-1.16.imx}/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base-1.14.imx => gstreamer1.0-plugins-base-1.16.imx}/make-gio_unix_2_0-dependency-configurable.patch (100%) rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.14.imx.bb => gstreamer1.0-plugins-base_1.16.imx.bb} (64%) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0003-riff-add-missing-include-directories-when-calling-in.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0003-riff-add-missing-include-directories-when-calling-in.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/make-gio_unix_2_0-dependency-configurable.patch similarity index 100% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/make-gio_unix_2_0-dependency-configurable.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb similarity index 64% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb index d329dbac..416982cc 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb @@ -1,46 +1,51 @@ require recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc LICENSE = "GPLv2+ & LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ - file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \ +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" DEPENDS += "iso-codes util-linux" +DEPENDS_append_imxgpu2d = " virtual/libg2d" -GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.04.05_1902_L4.14.98_GA" +PV = "1.16.0.imx" + +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:" +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" +SRCBRANCH = "MM_04.05.01_1909_L4.19.35" +SRCREV = "df30480711d68a1c1d2152bf4d6a7b245a85f967" SRC_URI = " \ ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ file://make-gio_unix_2_0-dependency-configurable.patch \ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ file://0003-riff-add-missing-include-directories-when-calling-in.patch \ file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ " -SRCREV = "f62f8ab685e549eefaecdb1e700239a5a408fcad" - -DEFAULT_PREFERENCE = "-1" - -EXTRA_AUTORECONF = "" S = "${WORKDIR}/git" -# Enable pango lib -PACKAGECONFIG_append = " pango " +inherit gettext use-imx-headers -# Disable introspection to fix [GstGL-1.0.gir] Error -EXTRA_OECONF_append = " --disable-introspection --disable-opengl --enable-wayland" +DEFAULT_PREFERENCE = "-1" -inherit gettext use-imx-headers +EXTRA_AUTORECONF = "" +# opengl packageconfig factored out to make it easy for distros +# and BSP layers to pick either (desktop) opengl, gles2, or no GL PACKAGES_DYNAMIC =+ "^libgst.*" +PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}" + PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \ ogg pango theora vorbis \ + ${PACKAGECONFIG_GL} \ + gio-unix-2.0 zlib \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \ " X11DEPENDS = "virtual/libx11 libsm libxrender libxv" @@ -57,20 +62,29 @@ PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora" PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual" PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis" PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" +PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" +PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0" +PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2" +PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm" +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" +# Disable introspection to fix [GstGL-1.0.gir] Error EXTRA_OECONF += " \ --enable-zlib \ CPPFLAGS="-I${STAGING_INCDIR_IMX}" \ + --disable-introspection \ + --disable-opengl \ + --enable-wayland \ " -CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" - +FILES_${PN} += "${libdir}/gstreamer-1.0/include" FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict" +CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no" + do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" } -FILES_${PN} += "${libdir}/gstreamer-1.0/include" - COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" -- 2.40.1