From 72e75774f10f1447ba2fbfc85dde28e792f8dbf4 Mon Sep 17 00:00:00 2001 From: Cristinel Panfir Date: Fri, 20 Dec 2019 17:52:50 +0200 Subject: [PATCH] gstreamer1.0-plugins-bad: Upgrade to 1.16 Add FILESEXTRAPATHS to use patches from poky Signed-off-by: Cristinel Panfir --- ...t-hardcode-libtool-name-when-running.patch | 45 -------------- .../configure-allow-to-disable-libssh2.patch | 61 ------------------- ...b => gstreamer1.0-plugins-bad_1.16.imx.bb} | 33 +++++----- 3 files changed, 17 insertions(+), 122 deletions(-) delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch delete mode 100644 recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch rename recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.14.imx.bb => gstreamer1.0-plugins-bad_1.16.imx.bb} (87%) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch deleted file mode 100644 index 355341e4..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c890afb8a542a272acb398e8fc289b790afa08e4 Mon Sep 17 00:00:00 2001 -From: Yuqing Zhu -Date: Sat, 21 Apr 2018 00:51:12 +0800 -Subject: [PATCH] Makefile.am: don't hardcode libtool name when running - introspection tools - -Do refine base on commit: 7592e793b3906355d76ca9a59f8fea2749ea2a4e - -Upstream-Status: Pending [review on oe-core list] - -Signed-off-by: Yuqing Zhu ---- - gst-libs/gst/insertbin/Makefile.am | 2 +- - gst-libs/gst/mpegts/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst-libs/gst/insertbin/Makefile.am b/gst-libs/gst/insertbin/Makefile.am -index 1f8ea30..4b98ef6 100644 ---- a/gst-libs/gst/insertbin/Makefile.am -+++ b/gst-libs/gst/insertbin/Makefile.am -@@ -45,7 +45,7 @@ GstInsertBin-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstinsertbin-@GS - --library=libgstinsertbin-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ - --include=GstBase-@GST_API_VERSION@ \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gstreamer-@GST_API_VERSION@ \ - --pkg gstreamer-base-@GST_API_VERSION@ \ - --pkg-export gstreamer-insertbin-@GST_API_VERSION@ \ -diff --git a/gst-libs/gst/mpegts/Makefile.am b/gst-libs/gst/mpegts/Makefile.am -index f264e33..9934a4d 100644 ---- a/gst-libs/gst/mpegts/Makefile.am -+++ b/gst-libs/gst/mpegts/Makefile.am -@@ -82,7 +82,7 @@ GstMpegts-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstmpegts-@GST_API_ - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ - --library=libgstmpegts-@GST_API_VERSION@.la \ - --include=Gst-@GST_API_VERSION@ \ -- --libtool="$(top_builddir)/libtool" \ -+ --libtool="$(LIBTOOL)" \ - --pkg gstreamer-@GST_API_VERSION@ \ - --pkg gstreamer-video-@GST_API_VERSION@ \ - --pkg-export gstreamer-mpegts-@GST_API_VERSION@ \ --- -2.7.4 - diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch deleted file mode 100644 index ad863298..00000000 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad-1.14.imx/configure-allow-to-disable-libssh2.patch +++ /dev/null @@ -1,61 +0,0 @@ -From f59c5269f92d59a5296cbfeeb682d42095cd88ad Mon Sep 17 00:00:00 2001 -From: Wenzong Fan -Date: Thu, 18 Sep 2014 02:24:07 -0400 -Subject: [PATCH] gstreamer1.0-plugins-bad: allow to disable libssh2 - -libssh2 is automatically linked to if present, this undetermined -dependency may cause build errors like: - - .../x86_64-poky-linux/4.9.0/ld: cannot find -lssh2 - -libssh2 isn't an oe-core recipe, so allow to disable it from -configure. - -Upstream-Status: Pending - -Signed-off-by: Wenzong Fan ---- - configure.ac | 23 +++++++++++++++++------ - 1 file changed, 17 insertions(+), 6 deletions(-) - -Index: gst-plugins-bad-1.12.3/configure.ac -=================================================================== ---- gst-plugins-bad-1.12.3.orig/configure.ac -+++ gst-plugins-bad-1.12.3/configure.ac -@@ -2139,6 +2139,15 @@ AG_GST_CHECK_FEATURE(CHROMAPRINT, [chrom - ]) - - dnl *** Curl *** -+AC_ARG_ENABLE([libssh2], -+ [ --enable-libssh2 enable LIBSSH2 support @<:@default=auto@:>@], -+ [case "${enableval}" in -+ yes) NEED_SSH2=yes ;; -+ no) NEED_SSH2=no ;; -+ auto) NEED_SSH2=auto ;; -+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-libssh2]) ;; -+ esac],[NEED_SSH2=auto]) -+ - translit(dnm, m, l) AM_CONDITIONAL(USE_CURL, true) - AG_GST_CHECK_FEATURE(CURL, [Curl plugin], curl, [ - PKG_CHECK_MODULES(CURL, libcurl >= 7.35.0, [ -@@ -2161,12 +2170,14 @@ AG_GST_CHECK_FEATURE(CURL, [Curl plugin] - ]) - AC_SUBST(CURL_CFLAGS) - AC_SUBST(CURL_LIBS) -- PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [ -- HAVE_SSH2="yes" -- AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available]) -- ], [ -- HAVE_SSH2="no" -- ]) -+ if test "x$NEED_SSH2" != "xno"; then -+ PKG_CHECK_MODULES(SSH2, libssh2 >= 1.4.3, [ -+ HAVE_SSH2="yes" -+ AC_DEFINE(HAVE_SSH2, 1, [Define if libssh2 is available]) -+ ], [ -+ HAVE_SSH2="no" -+ ]) -+ fi - AM_CONDITIONAL(USE_SSH2, test "x$HAVE_SSH2" = "xyes") - AC_SUBST(SSH2_CFLAGS) - AC_SUBST(SSH2_LIBS) diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb similarity index 87% rename from recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb rename to recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb index 9cf6bd98..3cf0c7af 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb @@ -10,22 +10,22 @@ PACKAGECONFIG_append_mx6q = " opencv" PACKAGECONFIG_append_mx6qp = " opencv" PACKAGECONFIG_append_mx8 = " opencv kms" -PACKAGECONFIG[wayland] = "--enable-wayland --disable-x11,--disable-wayland,wayland-native wayland wayland-protocols libdrm" - -# Disable introspection to fix [GstGL-1.0.gir] Error -EXTRA_OECONF_append = " --disable-introspection" - +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:" +FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:" GST1.0-PLUGINS-BAD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-bad.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-PLUGINS-BAD_SRC};branch=${SRCBRANCH} \ file://configure-allow-to-disable-libssh2.patch \ - file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ + file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \ + file://avoid-including-sys-poll.h-directly.patch \ + file://ensure-valid-sentinels-for-gst_structure_get-etc.patch \ + file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ " -SRCREV = "0191521ba226904e4b2f84c38e5f6ae75169a18a" +SRCREV = "eba3db4034fc17b712808d5e90ed5ff22ef490ca" DEFAULT_PREFERENCE = "-1" @@ -99,17 +99,19 @@ PACKAGECONFIG[ttml] = "--enable-ttml,--disable-ttml,libxml2 pango cai PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev" PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc" PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc" -PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,vulkan-loader" +PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,vulkan-headers" +PACKAGECONFIG[lcms2] = "--enable-lcms2,--disable-lcms2,lcms" +PACKAGECONFIG[openmpt] = "--enable-openmpt,--disable-openmpt,libopenmpt" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm" PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" PACKAGECONFIG[webrtc] = "--enable-webrtc,--disable-webrtc,libnice" PACKAGECONFIG[webrtcdsp] = "--enable-webrtcdsp,--disable-webrtcdsp,webrtc-audio-processing" # these plugins have no corresponding library in OE-core or meta-openembedded: -# openni2 winks direct3d directsound winscreencap acm apple_media iqa -# android_media avc bs2b chromaprint daala dts fdkaac gme gsm kate ladspa +# openni2 winks direct3d directsound winscreencap apple_media iqa +# android_media avc bs2b chromaprint dts fdkaac gme gsm kate ladspa # lv2 mpeg2enc mplex msdk musepack nvenc ofa openmpt opensles soundtouch -# spandsp spc teletextdec vdpau wasapi x265 zbar +# spandsp teletextdec vdpau wasapi x265 zbar EXTRA_OECONF += " \ --enable-decklink \ @@ -118,15 +120,12 @@ EXTRA_OECONF += " \ --enable-ipcpipeline \ --enable-netsim \ --enable-shm \ - --enable-vcd \ - --disable-acm \ --disable-android_media \ --disable-aom \ --disable-apple_media \ --disable-avc \ --disable-bs2b \ --disable-chromaprint \ - --disable-daala \ --disable-direct3d \ --disable-directsound \ --disable-dts \ @@ -149,7 +148,6 @@ EXTRA_OECONF += " \ --disable-opensles \ --disable-soundtouch \ --disable-spandsp \ - --disable-spc \ --disable-srt \ --disable-teletextdec \ --disable-vdpau \ @@ -160,6 +158,7 @@ EXTRA_OECONF += " \ --disable-x265 \ --disable-zbar \ ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \ + --disable-introspection \ " export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}" @@ -169,5 +168,7 @@ ARM_INSTRUCTION_SET_armv5 = "arm" FILES_${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs" FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*" FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs" +# include fragment shaders +FILES_${PN}-opengl += "/usr/share/*.fs" COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" -- 2.40.1