All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0
@ 2018-04-25  7:23 kai.kang
  2018-04-25  7:23 ` [PATCH v2 1/8] " kai.kang
                   ` (8 more replies)
  0 siblings, 9 replies; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

V2:
* Update patch format of out-of-tree-build.patch
* Do add and remove patches which are moved from -bad to -base in 2 seperate commits

The following changes since commit da3625c52e1ab8985fba4fc3d133edf92142f182:

  build-appliance-image: Update to sumo head revision (2018-04-23 17:54:32 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib kangkai/gstreamer1.14
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/gstreamer1.14

Kai Kang (8):
  gstreamer1.0: 1.12.4 -> 1.14.0
  gstreamer1.0-plugins-base: 1.12.4 -> 1.14.0
  gstreamer1.0-plugins-bad: 1.12.4 -> 1.14.0
  gstreamer1.0-plugins-ugly: 1.12.4 -> 1.14.0
  gstreamer1.0-plugins-good: 1.12.4 -> 1.14.0
  gstreamer1.0-libav: 1.12.4 -> 1.14.0
  gst-validate: 1.12.4 -> 1.14.0
  gstreamer1.0: upgrade other packages to 1.14.0

 .../gstreamer/gst-validate/out-of-tree-build.patch | 28 ++++++++++
 ...t-validate_1.12.4.bb => gst-validate_1.14.0.bb} |  8 ++-
 ...a.c-Fix-build-by-Including-libavcodec-hev.patch | 33 -----------
 .../remove-host-contamination.patch                | 22 ++++++++
 ...ibav_1.12.4.bb => gstreamer1.0-libav_1.14.0.bb} |  6 +-
 ....0-omx_1.12.4.bb => gstreamer1.0-omx_1.14.0.bb} |  4 +-
 .../gstreamer/gstreamer1.0-plugins-bad.inc         | 21 -------
 ...-don-t-hardcode-libtool-name-when-running.patch | 34 +-----------
 ...y-Use-ifdef-for-platform-specific-defines.patch | 37 -------------
 ...n-Use-the-generated-version-of-vkconfig.h.patch | 64 ----------------------
 ....12.4.bb => gstreamer1.0-plugins-bad_1.14.0.bb} |  9 +--
 .../gstreamer/gstreamer1.0-plugins-base.inc        | 13 ++++-
 ...-don-t-hardcode-libtool-name-when-running.patch | 32 ++++++-----
 ...-up-GstVideo-1.0.gir-from-local-build-dir.patch | 46 ++++++++++++++++
 ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch |  4 +-
 ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 54 ++++++++++--------
 ...t-need_segment-after-sink-pad-received-GS.patch |  8 ++-
 .../0009-glimagesink-Downrank-to-marginal.patch    |  0
 .../link-with-libvchostif.patch                    | 16 ++++--
 ...make-gio_unix_2_0-dependency-configurable.patch |  4 +-
 ...12.4.bb => gstreamer1.0-plugins-base_1.14.0.bb} | 10 +++-
 .../gstreamer/gstreamer1.0-plugins-good.inc        | 15 ++++-
 ...12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} |  4 +-
 .../gstreamer/gstreamer1.0-plugins-ugly.inc        |  5 +-
 ...12.4.bb => gstreamer1.0-plugins-ugly_1.14.0.bb} |  4 +-
 ...hon_1.12.4.bb => gstreamer1.0-python_1.14.0.bb} |  4 +-
 ....12.4.bb => gstreamer1.0-rtsp-server_1.14.0.bb} |  4 +-
 ...aapi_1.12.4.bb => gstreamer1.0-vaapi_1.14.0.bb} |  5 +-
 ...treamer1.0_1.12.4.bb => gstreamer1.0_1.14.0.bb} |  4 +-
 29 files changed, 227 insertions(+), 271 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-validate/out-of-tree-build.patch
 rename meta/recipes-multimedia/gstreamer/{gst-validate_1.12.4.bb => gst-validate_1.14.0.bb} (81%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/remove-host-contamination.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.12.4.bb => gstreamer1.0-libav_1.14.0.bb} (82%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.12.4.bb => gstreamer1.0-omx_1.14.0.bb} (69%)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.12.4.bb => gstreamer1.0-plugins-bad_1.14.0.bb} (59%)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad => gstreamer1.0-plugins-base}/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch (87%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad => gstreamer1.0-plugins-base}/0009-glimagesink-Downrank-to-marginal.patch (100%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad => gstreamer1.0-plugins-base}/link-with-libvchostif.patch (85%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.12.4.bb => gstreamer1.0-plugins-base_1.14.0.bb} (64%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} (85%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.12.4.bb => gstreamer1.0-plugins-ugly_1.14.0.bb} (76%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.12.4.bb => gstreamer1.0-python_1.14.0.bb} (57%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.12.4.bb => gstreamer1.0-rtsp-server_1.14.0.bb} (44%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.12.4.bb => gstreamer1.0-vaapi_1.14.0.bb} (43%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.12.4.bb => gstreamer1.0_1.14.0.bb} (71%)

-- 
2.14.1



^ permalink raw reply	[flat|nested] 15+ messages in thread

* [PATCH v2 1/8] gstreamer1.0: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-04-25  7:23 ` [PATCH v2 2/8] gstreamer1.0-plugins-base: " kai.kang
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade gstreamer1.0 from 1.12.4 to 1.14.0.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../gstreamer/{gstreamer1.0_1.12.4.bb => gstreamer1.0_1.14.0.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.12.4.bb => gstreamer1.0_1.14.0.bb} (71%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb
similarity index 71%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb
index 01b2396513..f6c22347fa 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \
 SRC_URI = " \
     http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.xz \
 "
-SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea"
-SRC_URI[sha256sum] = "5a8704aa4c2eeb04da192c4a9942f94f860ac1a585de90d9f914bac26a970674"
+SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96"
+SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e"
 
 S = "${WORKDIR}/gstreamer-${PV}"
 
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v2 2/8] gstreamer1.0-plugins-base: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
  2018-04-25  7:23 ` [PATCH v2 1/8] " kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-05-02  3:33   ` Anuj Mittal
  2018-05-02  3:40   ` Anuj Mittal
  2018-04-25  7:23 ` [PATCH v2 3/8] gstreamer1.0-plugins-bad: " kai.kang
                   ` (6 subsequent siblings)
  8 siblings, 2 replies; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade gstreamer1.0-plugins-base from 1.12.4 to 1.14.0.

* add packageconfigs 'wayland', 'opengl', 'egl' and 'wayland' and
  configure option '--disable-cocoa' from -bad that related plugins have
  been moved from -bad to -base
* backport patch to fix compile error: Couldn't find include 'GstVideo-1.0.gir'
* update and refresh patches

Add and refresh following patches from gstreamer1.0-plugins-bad too:

* 0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
* 0009-glimagesink-Downrank-to-marginal.patch
* link-with-libvchostif.patch

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../gstreamer/gstreamer1.0-plugins-base.inc        | 13 +++++-
 ...-don-t-hardcode-libtool-name-when-running.patch | 32 +++++++------
 ...-up-GstVideo-1.0.gir-from-local-build-dir.patch | 46 ++++++++++++++++++
 ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ++++++++++++
 ...-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 54 +++++++++++++---------
 ...t-need_segment-after-sink-pad-received-GS.patch |  8 ++--
 .../0009-glimagesink-Downrank-to-marginal.patch    | 32 +++++++++++++
 .../link-with-libvchostif.patch                    | 41 ++++++++++++++++
 ...make-gio_unix_2_0-dependency-configurable.patch |  4 +-
 ...12.4.bb => gstreamer1.0-plugins-base_1.14.0.bb} | 10 +++-
 10 files changed, 224 insertions(+), 45 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.12.4.bb => gstreamer1.0-plugins-base_1.14.0.bb} (64%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index 08130c1da4..9befa9568b 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -15,9 +15,15 @@ inherit gettext
 
 PACKAGES_DYNAMIC =+ "^libgst.*"
 
+# opengl packageconfig factored out to make it easy for distros
+# and BSP layers to pick either (desktop) opengl, gles2, or no GL
+PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"
+
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
+    ${PACKAGECONFIG_GL} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
     gio-unix-2.0 ogg pango theora vorbis \
 "
 
@@ -27,18 +33,23 @@ X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
 
 PACKAGECONFIG[alsa]         = "--enable-alsa,--disable-alsa,alsa-lib"
 PACKAGECONFIG[cdparanoia]   = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
+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[ivorbis]      = "--enable-ivorbis,--disable-ivorbis,tremor"
+PACKAGECONFIG[opengl]       = "--enable-opengl,--disable-opengl,virtual/libgl"
 PACKAGECONFIG[ogg]          = "--enable-ogg,--disable-ogg,libogg"
 PACKAGECONFIG[opus]         = "--enable-opus,--disable-opus,libopus"
 PACKAGECONFIG[pango]        = "--enable-pango,--disable-pango,pango"
 PACKAGECONFIG[theora]       = "--enable-theora,--disable-theora,libtheora"
 PACKAGECONFIG[visual]       = "--enable-libvisual,--disable-libvisual,libvisual"
 PACKAGECONFIG[vorbis]       = "--enable-vorbis,--disable-vorbis,libvorbis"
+PACKAGECONFIG[wayland]      = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"
 PACKAGECONFIG[x11]          = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
 
 EXTRA_OECONF += " \
     --enable-zlib \
+    --disable-cocoa \
 "
 
 CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
@@ -46,5 +57,5 @@ CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmm
 FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
 
 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"
+        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:${B}/gst-libs/gst/allocators/.libs/"
 }
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
index 094bdac846..815fd77156 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
@@ -6,11 +6,15 @@ Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running
 
 Upstream-Status: Pending [review on oe-core maillist]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+Update patch context. Remove patch of gst-libs/gst/fft/Makefile.am that the
+rule has been removed. Add patch for gst-libs/gst/gl/Makefile.am at same time.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
  gst-libs/gst/allocators/Makefile.am | 2 +-
  gst-libs/gst/app/Makefile.am        | 2 +-
  gst-libs/gst/audio/Makefile.am      | 2 +-
- gst-libs/gst/fft/Makefile.am        | 2 +-
  gst-libs/gst/pbutils/Makefile.am    | 2 +-
  gst-libs/gst/riff/Makefile.am       | 2 +-
  gst-libs/gst/rtp/Makefile.am        | 2 +-
@@ -59,19 +63,6 @@ index 275d222..2374196 100644
  		--pkg gstreamer-@GST_API_VERSION@ \
  		--pkg gstreamer-base-@GST_API_VERSION@ \
  		--pkg-export gstreamer-audio-@GST_API_VERSION@ \
-diff --git a/gst-libs/gst/fft/Makefile.am b/gst-libs/gst/fft/Makefile.am
-index 09b3d68..f545354 100644
---- a/gst-libs/gst/fft/Makefile.am
-+++ b/gst-libs/gst/fft/Makefile.am
-@@ -65,7 +65,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstfft-@GST_API_VERSIO
- 		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
- 		--library=libgstfft-@GST_API_VERSION@.la \
- 		--include=Gst-@GST_API_VERSION@ \
--		--libtool="$(top_builddir)/libtool" \
-+		--libtool="$(LIBTOOL)" \
- 		--pkg gstreamer-@GST_API_VERSION@ \
- 		--pkg-export gstreamer-fft-@GST_API_VERSION@ \
- 		--output $@ \
 diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am
 index 64d5eb0..91dc214 100644
 --- a/gst-libs/gst/pbutils/Makefile.am
@@ -163,6 +154,19 @@ index 5d31fa1..ac64eb3 100644
  		--pkg gstreamer-@GST_API_VERSION@ \
  		--pkg gstreamer-base-@GST_API_VERSION@ \
  		--pkg-export gstreamer-video-@GST_API_VERSION@ \
+diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
+index 7f2b8ae..ab6cc55 100644
+--- a/gst-libs/gst/gl/Makefile.am
++++ b/gst-libs/gst/gl/Makefile.am
+@@ -193,7 +193,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
+ 		--include=Gst-@GST_API_VERSION@ \
+ 		--include=GstBase-@GST_API_VERSION@ \
+ 		--include=GstVideo-@GST_API_VERSION@ \
+-		--libtool="$(top_builddir)/libtool" \
++		--libtool="$(LIBTOOL)" \
+ 		--pkg gstreamer-@GST_API_VERSION@ \
+ 		--pkg gstreamer-base-@GST_API_VERSION@ \
+ 		--pkg gstreamer-video-@GST_API_VERSION@ \
 -- 
 2.6.2
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch
new file mode 100644
index 0000000000..c13115efb3
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch
@@ -0,0 +1,46 @@
+Upstream-Status: Backport
+
+Backport from gstreamer upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
+From df66d00876d035ab64c1e3b6a17e16b920fae2b9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
+Date: Tue, 27 Mar 2018 10:43:16 +0100
+Subject: [PATCH] gl: pick up GstVideo-1.0.gir from local build dir
+
+https://bugzilla.gnome.org/show_bug.cgi?id=794708
+---
+ gst-libs/gst/gl/Makefile.am | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
+index a3bbc94b0..2df038545 100644
+--- a/gst-libs/gst/gl/Makefile.am
++++ b/gst-libs/gst/gl/Makefile.am
+@@ -185,9 +185,10 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
+ 		-I$(top_builddir)/gst-libs \
+ 		$(GST_PLUGINS_BASE_CFLAGS) \
+ 		$(GL_CFLAGS) \
++		--add-include-path="$(top_builddir)/gst-libs/gst/video/" \
+ 		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+ 		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
+-		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
++		--library-path="$(top_builddir)/gst-libs/gst/video/" \
+ 		--library=libgstgl-@GST_API_VERSION@.la \
+ 		--include=Gst-@GST_API_VERSION@ \
+ 		--include=GstBase-@GST_API_VERSION@ \
+@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+ 		$(INTROSPECTION_COMPILER) \
+ 		--includedir=$(srcdir) \
+ 		--includedir=$(builddir) \
++		--includedir="$(top_builddir)/gst-libs/gst/video/" \
+ 		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+ 		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
+-		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
+ 		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+ 
+ CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
+-- 
+2.17.0
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
new file mode 100644
index 0000000000..1d0e62a8fe
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
@@ -0,0 +1,29 @@
+From 5622ca3b61603dc316a0f1fbede3f9aa353a5e48 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 12 May 2017 16:47:12 +0300
+Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS
+
+Dependencies' include directories should not be added in this way;
+it causes problems when cross-compiling in sysroot environments.
+
+Upstream-Status: Pending
+
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+Signed-off-by: Maxin B. John <maxin.john@intel.com>
+---
+ pkgconfig/gstreamer-gl.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in
+index dc672a97b..8c290bab5 100644
+--- a/pkgconfig/gstreamer-gl.pc.in
++++ b/pkgconfig/gstreamer-gl.pc.in
+@@ -13,4 +13,4 @@ Version: @VERSION@
+ Requires: gstreamer-video-@GST_API_VERSION@ gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
+ 
+ Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
+-Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@
++Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include
+-- 
+2.4.0
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
index 6616e2cf0d..1ef3de8433 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch
@@ -6,11 +6,15 @@ Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with
 
 Upstream-Status: Pending [review on oe-core maillist]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+Update context and remove patch for gst-libs/gst/fft/Makefile.am that the rule
+has been removed. And add patch for gst-libs/gst/gl/Makefile.am
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
 ---
  gst-libs/gst/allocators/Makefile.am |  4 ++--
  gst-libs/gst/app/Makefile.am        |  4 ++--
  gst-libs/gst/audio/Makefile.am      | 12 ++++++------
- gst-libs/gst/fft/Makefile.am        |  4 ++--
  gst-libs/gst/pbutils/Makefile.am    | 12 ++++++------
  gst-libs/gst/riff/Makefile.am       |  8 ++++----
  gst-libs/gst/rtp/Makefile.am        |  8 ++++----
@@ -89,28 +93,6 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am
  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
-Index: gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am
-===================================================================
---- gst-plugins-base-1.12.3.orig/gst-libs/gst/fft/Makefile.am
-+++ gst-plugins-base-1.12.3/gst-libs/gst/fft/Makefile.am
-@@ -63,7 +63,7 @@ GstFft-@GST_API_VERSION@.gir: $(INTROSPE
- 		--c-include "gst/fft/fft.h" \
- 		-I$(top_srcdir)/gst-libs \
- 		-I$(top_builddir)/gst-libs \
--		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
-+		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
- 		--library=libgstfft-@GST_API_VERSION@.la \
- 		--include=Gst-@GST_API_VERSION@ \
- 		--libtool="$(LIBTOOL)" \
-@@ -87,7 +87,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
- 		$(INTROSPECTION_COMPILER) \
- 		--includedir=$(srcdir) \
- 		--includedir=$(builddir) \
--		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
-+		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
- 		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
- 
- CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
 Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am
 ===================================================================
 --- gst-plugins-base-1.12.3.orig/gst-libs/gst/pbutils/Makefile.am
@@ -293,3 +275,29 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am
  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
+Index: gst-plugins-base-1.14.0/gst-libs/gst/gl/Makefile.am
+===================================================================
+--- a/gst-libs/gst/gl/Makefile.am
++++ b/gst-libs/gst/gl/Makefile.am
+@@ -186,8 +186,8 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
+ 		$(GST_PLUGINS_BASE_CFLAGS) \
+ 		$(GL_CFLAGS) \
+ 		--add-include-path="$(top_builddir)/gst-libs/gst/video/" \
+-		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+-		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
++		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
++		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
+ 		--library-path="$(top_builddir)/gst-libs/gst/video/" \
+ 		--library=libgstgl-@GST_API_VERSION@.la \
+ 		--include=Gst-@GST_API_VERSION@ \
+@@ -218,8 +218,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+ 		--includedir=$(srcdir) \
+ 		--includedir=$(builddir) \
+ 		--includedir="$(top_builddir)/gst-libs/gst/video/" \
+-		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
+-		--includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
++		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
++		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
+ 		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
+ 
+ CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
index b924e38824..438f4ebbf2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
@@ -20,7 +20,7 @@ new mode 100755
 index b565e93..7741ccc
 --- a/gst/subparse/gstsubparse.c
 +++ b/gst/subparse/gstsubparse.c
-@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
+@@ -270,24 +270,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
          goto beach;
        }
  
@@ -45,13 +45,15 @@ index b565e93..7741ccc
 -        GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT,
 -            &self->segment);
 -
--        self->need_segment = TRUE;
+-        /* will mark need_segment when receiving segment from upstream,
+-         * after FLUSH and all that has happened,
+-         * rather than racing with chain */
 -      } else {
 +      if (!ret) {
          GST_WARNING_OBJECT (self, "seek to 0 bytes failed");
        }
  
-@@ -1641,8 +1639,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
+@@ -1873,8 +1869,10 @@ gst_sub_parse_sink_event (GstPad * pad, GstObject * parent, GstEvent * event)
        gst_event_parse_segment (event, &s);
        if (s->format == GST_FORMAT_TIME)
          gst_event_copy_segment (event, &self->segment);
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch
new file mode 100644
index 0000000000..c81fb0f6aa
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0009-glimagesink-Downrank-to-marginal.patch
@@ -0,0 +1,32 @@
+From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Thu, 24 Sep 2015 19:47:32 +0300
+Subject: [PATCH] glimagesink: Downrank to marginal
+
+On desktop, where there is good OpenGL, xvimagesink will come up first,
+on other platforms, OpenGL can't be trusted because it's either software (like
+in a VM) or broken (like on embedded)., so let ximagesink come above.
+
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684]
+
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ ext/gl/gstopengl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
+index a4b2540..0ccaacd 100644
+--- a/ext/gl/gstopengl.c
++++ b/ext/gl/gstopengl.c
+@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin)
+ #endif
+ 
+   if (!gst_element_register (plugin, "glimagesink",
+-          GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
++          GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
+     return FALSE;
+   }
+ 
+-- 
+2.1.4
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch
new file mode 100644
index 0000000000..965622f3c9
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/link-with-libvchostif.patch
@@ -0,0 +1,41 @@
+Add -lvchostif to link when using -lEGL on rpi
+
+This is required because libEGL from userland uses sybols
+from this library.
+
+lib/libEGL.so.1.0.0                                                                                                                                                                                                                              121: 00000000     0 FUNC    GLOBAL DEFAULT  UND vc_dispmanx_element_add
+  1552: 00000000     0 FUNC    GLOBAL DEFAULT  UND vc_dispmanx_element_add
+
+These symbols are provided by libvchostif as seen below
+
+lib/libvchostif.so
+   252: 0000b161   192 FUNC    GLOBAL DEFAULT    9 vc_dispmanx_element_add
+   809: 0000b161   192 FUNC    GLOBAL DEFAULT    9 vc_dispmanx_element_add
+
+With this explicit link, plugins fail during runtime
+
+(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstomx.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
+(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstopengl.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+
+
+Move patch from gstreamer1.0-plugins-bad and rebase for gstreamer1.0-plugins-base.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
+index 1e9724094..ab7774c5c 100644
+--- a/m4/gst-gl.m4
++++ b/m4/gst-gl.m4
+@@ -231,7 +231,7 @@ case $host in
+                             HAVE_EGL=yes
+                             HAVE_GLES2=yes
+                             HAVE_EGL_RPI=yes
+-                            EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm"
++                            EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm"
+                             EGL_CFLAGS=""
+                             AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform])
+                           ])
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
index 413eff0695..f4599035df 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch
@@ -25,8 +25,8 @@ diff --git a/configure.ac b/configure.ac
 index 9c52aeb..26cacd6 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -752,9 +752,16 @@ AC_SUBST(FT2_CFLAGS)
- fi dnl of EXT plugins
+@@ -809,9 +809,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
+ AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
  
  dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c ***
 +AC_ARG_ENABLE([gio_unix_2_0],
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb
similarity index 64%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb
index dd895bbcb1..743355b509 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb
@@ -10,9 +10,15 @@ SRC_URI = " \
     file://0003-ssaparse-enhance-SSA-text-lines-parsing.patch \
     file://0004-subparse-set-need_segment-after-sink-pad-received-GS.patch \
     file://make-gio_unix_2_0-dependency-configurable.patch \
+    file://link-with-libvchostif.patch \
+    file://0009-glimagesink-Downrank-to-marginal.patch \
+    file://0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
+    file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
 "
-SRC_URI[md5sum] = "b35b04071f69b8ab69a7f3a497ff0131"
-SRC_URI[sha256sum] = "4c306b03df0212f1b8903784e29bb3493319ba19ebebf13b0c56a17870292282"
+SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a"
+SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940"
 
 S = "${WORKDIR}/gst-plugins-base-${PV}"
+
+FILES_${PN}-dev += "${libdir}/gstreamer-1.0/include"
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v2 3/8] gstreamer1.0-plugins-bad: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
  2018-04-25  7:23 ` [PATCH v2 1/8] " kai.kang
  2018-04-25  7:23 ` [PATCH v2 2/8] gstreamer1.0-plugins-base: " kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-05-02  3:23   ` Anuj Mittal
  2018-04-25  7:23 ` [PATCH v2 4/8] gstreamer1.0-plugins-ugly: " kai.kang
                   ` (5 subsequent siblings)
  8 siblings, 1 reply; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade gstreamer1.0-plugins-bad from 1.12.4 to 1.14.0.

* GStreamer OpenGL integration library is moved to -base, so move
  packageconfigs 'opengl', 'egl' and 'gles2' to -base
* move packageconfig 'wayland' to -base
* move configure option '--disable-cocoa' to -base
* move packageconfig 'gtk' to -good
* move configure option '--disable-qt' to -goood
* drop packageconfig 'schroedinger' that the plugin has been removed

Drop patches of vulkan which are merged by upstream. Refresh patch
0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch and
remove patches which are moved to -base from bb file.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../gstreamer/gstreamer1.0-plugins-bad.inc         | 21 -------
 ...-don-t-hardcode-libtool-name-when-running.patch | 34 +-----------
 ...gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch | 29 ----------
 ...y-Use-ifdef-for-platform-specific-defines.patch | 37 -------------
 ...n-Use-the-generated-version-of-vkconfig.h.patch | 64 ----------------------
 .../0009-glimagesink-Downrank-to-marginal.patch    | 32 -----------
 .../link-with-libvchostif.patch                    | 35 ------------
 ....12.4.bb => gstreamer1.0-plugins-bad_1.14.0.bb} |  9 +--
 8 files changed, 5 insertions(+), 256 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.12.4.bb => gstreamer1.0-plugins-bad_1.14.0.bb} (59%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index ca2ea9e963..b693b16b03 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -10,18 +10,10 @@ SRC_URI_append = " \
     file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
 "
 
-# opengl packageconfig factored out to make it easy for distros
-# and BSP layers to pick either (desktop) opengl, gles2, or no GL
-PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"
-
-# gtk is not in the PACKAGECONFIG variable by default until
-# the transition to gtk+3 is finished
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
-    ${PACKAGECONFIG_GL} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
     bz2 curl dash dtls hls rsvg sbc smoothstreaming sndfile uvch264 webp \
 "
 
@@ -33,13 +25,10 @@ PACKAGECONFIG[dash]            = "--enable-dash,--disable-dash,libxml2"
 PACKAGECONFIG[dc1394]          = "--enable-dc1394,--disable-dc1394,libdc1394"
 PACKAGECONFIG[directfb]        = "--enable-directfb,--disable-directfb,directfb"
 PACKAGECONFIG[dtls]            = "--enable-dtls,--disable-dtls,openssl"
-PACKAGECONFIG[egl]             = "--enable-egl,--disable-egl,virtual/egl"
 PACKAGECONFIG[faac]            = "--enable-faac,--disable-faac,faac"
 PACKAGECONFIG[faad]            = "--enable-faad,--disable-faad,faad2"
 PACKAGECONFIG[flite]           = "--enable-flite,--disable-flite,flite-alsa"
 PACKAGECONFIG[fluidsynth]      = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
-PACKAGECONFIG[gles2]           = "--enable-gles2,--disable-gles2,virtual/libgles2"
-PACKAGECONFIG[gtk]             = "--enable-gtk3,--disable-gtk3,gtk+3"
 PACKAGECONFIG[hls]             = "--enable-hls --with-hls-crypto=nettle,--disable-hls,nettle"
 PACKAGECONFIG[kms]             = "--enable-kms,--disable-kms,libdrm"
 PACKAGECONFIG[libmms]          = "--enable-libmms,--disable-libmms,libmms"
@@ -48,7 +37,6 @@ PACKAGECONFIG[modplug]         = "--enable-modplug,--disable-modplug,libmodplug"
 PACKAGECONFIG[neon]            = "--enable-neon,--disable-neon,neon"
 PACKAGECONFIG[openal]          = "--enable-openal,--disable-openal,openal-soft"
 PACKAGECONFIG[opencv]          = "--enable-opencv,--disable-opencv,opencv"
-PACKAGECONFIG[opengl]          = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
 PACKAGECONFIG[openjpeg]        = "--enable-openjpeg,--disable-openjpeg,openjpeg"
 # the opus encoder/decoder elements are now in the -base package,
 # but the opus parser remains in -bad
@@ -57,7 +45,6 @@ PACKAGECONFIG[resindvd]        = "--enable-resindvd,--disable-resindvd,libdvdrea
 PACKAGECONFIG[rsvg]            = "--enable-rsvg,--disable-rsvg,librsvg"
 PACKAGECONFIG[rtmp]            = "--enable-rtmp,--disable-rtmp,rtmpdump"
 PACKAGECONFIG[sbc]             = "--enable-sbc,--disable-sbc,sbc"
-PACKAGECONFIG[schroedinger]    = "--enable-schro,--disable-schro,schroedinger"
 PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
 PACKAGECONFIG[sndfile]         = "--enable-sndfile,--disable-sndfile,libsndfile1"
 PACKAGECONFIG[srtp]            = "--enable-srtp,--disable-srtp,libsrtp"
@@ -65,7 +52,6 @@ PACKAGECONFIG[uvch264]         = "--enable-uvch264,--disable-uvch264,libusb1 lib
 PACKAGECONFIG[voaacenc]        = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
 PACKAGECONFIG[voamrwbenc]      = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
 PACKAGECONFIG[vulkan]          = "--enable-vulkan,--disable-vulkan,vulkan"
-PACKAGECONFIG[wayland]         = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"
 PACKAGECONFIG[webp]            = "--enable-webp,--disable-webp,libwebp"
 
 # these plugins have no corresponding library in OE-core or meta-openembedded:
@@ -74,11 +60,6 @@ PACKAGECONFIG[webp]            = "--enable-webp,--disable-webp,libwebp"
 #   lv2 mpeg2enc mplex msdk musepack nvenc ofa openh264 opensles soundtouch spandsp
 #   spc teletextdec tinyalsa vdpau wasapi x265 zbar webrtcdsp
 
-# qt5 support is disabled, because it is not present in OE core, and requires more work than
-# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
-# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig
-# in a gstreamer1.0-plugins-bad bbappend).
-
 EXTRA_OECONF += " \
     --enable-decklink \
     --enable-dvb \
@@ -92,7 +73,6 @@ EXTRA_OECONF += " \
     --disable-avc \
     --disable-bs2b \
     --disable-chromaprint \
-    --disable-cocoa \
     --disable-daala \
     --disable-direct3d \
     --disable-directsound \
@@ -115,7 +95,6 @@ EXTRA_OECONF += " \
     --disable-openh264 \
     --disable-openni2 \
     --disable-opensles \
-    --disable-qt \
     --disable-soundtouch \
     --disable-spandsp \
     --disable-spc \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
index 8d99dc6ccc..2f9a97e0cc 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch
@@ -11,38 +11,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
 Signed-off-by: Maxin B. John <maxin.john@intel.com>
 ---
- gst-libs/gst/allocators/Makefile.am | 2 +-
- gst-libs/gst/gl/Makefile.am         | 2 +-
- gst-libs/gst/insertbin/Makefile.am  | 2 +-
- gst-libs/gst/mpegts/Makefile.am     | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ 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/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
-index e50d077..623f092 100644
---- a/gst-libs/gst/allocators/Makefile.am
-+++ b/gst-libs/gst/allocators/Makefile.am
-@@ -37,7 +37,7 @@ GstBadAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstbadalloca
- 		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
- 		--library=libgstbadallocators-@GST_API_VERSION@.la \
- 		--include=Gst-@GST_API_VERSION@ \
--		--libtool="$(top_builddir)/libtool" \
-+		--libtool="$(LIBTOOL)" \
- 		--pkg gstreamer-@GST_API_VERSION@ \
- 		--pkg-export gstreamer-badallocators-@GST_API_VERSION@ \
- 		--output $@ \
-diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
-index 2ae4773..dfa7a7d 100644
---- a/gst-libs/gst/gl/Makefile.am
-+++ b/gst-libs/gst/gl/Makefile.am
-@@ -178,7 +178,7 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
- 		--include=Gst-@GST_API_VERSION@ \
- 		--include=GstBase-@GST_API_VERSION@ \
- 		--include=GstVideo-@GST_API_VERSION@ \
--		--libtool="$(top_builddir)/libtool" \
-+		--libtool="$(LIBTOOL)" \
- 		--pkg gstreamer-@GST_API_VERSION@ \
- 		--pkg gstreamer-base-@GST_API_VERSION@ \
- 		--pkg gstreamer-video-@GST_API_VERSION@ \
 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
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
deleted file mode 100644
index 2235a57afa..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5622ca3b61603dc316a0f1fbede3f9aa353a5e48 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 12 May 2017 16:47:12 +0300
-Subject: [PATCH] gstreamer-gl.pc.in: don't append GL_CFLAGS to CFLAGS
-
-Dependencies' include directories should not be added in this way;
-it causes problems when cross-compiling in sysroot environments.
-
-Upstream-Status: Pending
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-Signed-off-by: Maxin B. John <maxin.john@intel.com>
----
- pkgconfig/gstreamer-gl.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pkgconfig/gstreamer-gl.pc.in b/pkgconfig/gstreamer-gl.pc.in
-index 8e7a303..d167be1 100644
---- a/pkgconfig/gstreamer-gl.pc.in
-+++ b/pkgconfig/gstreamer-gl.pc.in
-@@ -13,4 +13,4 @@ Version: @VERSION@
- Requires: gstreamer-base-@GST_API_VERSION@ gstreamer-@GST_API_VERSION@
- 
- Libs: -L${libdir} -lgstgl-@GST_API_VERSION@
--Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include @GL_CFLAGS@
-+Cflags: -I${includedir} -I${libdir}/gstreamer-@GST_API_VERSION@/include
--- 
-2.4.0
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
deleted file mode 100644
index caaa62d48a..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1523ab462c1bf19055960ced255f4872b6cf9f5c Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Wed, 5 Jul 2017 11:00:42 +0300
-Subject: [PATCH 1/2] vkdisplay: Use ifdef for platform specific defines
-
-VK_KHR_*_SURFACE_EXTENSION_NAME are only available when corresponding
-WSI is enabled.
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539]
----
- ext/vulkan/vkdisplay.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ext/vulkan/vkdisplay.c b/ext/vulkan/vkdisplay.c
-index 550134cd8..ade5d4583 100644
---- a/ext/vulkan/vkdisplay.c
-+++ b/ext/vulkan/vkdisplay.c
-@@ -448,11 +448,15 @@ gst_vulkan_display_type_to_extension_string (GstVulkanDisplayType type)
-   if (type == GST_VULKAN_DISPLAY_TYPE_NONE)
-     return NULL;
- 
-+#if GST_VULKAN_HAVE_WINDOW_XCB
-   if (type & GST_VULKAN_DISPLAY_TYPE_XCB)
-     return VK_KHR_XCB_SURFACE_EXTENSION_NAME;
-+#endif
- 
-+#if GST_VULKAN_HAVE_WINDOW_WAYLAND
-   if (type & GST_VULKAN_DISPLAY_TYPE_WAYLAND)
-     return VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME;
-+#endif
- 
-   return NULL;
- }
--- 
-2.13.2
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
deleted file mode 100644
index 0df145dd25..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From c23e1dc22deb495561cffb877edb2746b740a1fa Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Wed, 5 Jul 2017 11:07:05 +0300
-Subject: [PATCH 2/2] vulkan: Use the generated version of vkconfig.h
-
-Build fails in ext/vulkan/xcb and ext/vulkan/wayland when:
-* building from tarball
-* building out-of-tree
-* Only one WSI integration (xcb or wayland) is enabled by configure.ac
-This is because vkconfig.h from source directory gets used instead
-of the generated one.
-
-Add the correct build directory to "-I". Use angle bracket
-include in vkapi.h so that it actually looks in the include search
-path instead of defaulting to the same (source tree) directory.
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539]
----
- ext/vulkan/vkapi.h             | 2 +-
- ext/vulkan/wayland/Makefile.am | 1 +
- ext/vulkan/xcb/Makefile.am     | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/ext/vulkan/vkapi.h b/ext/vulkan/vkapi.h
-index e9c23aa92..a37c29d0f 100644
---- a/ext/vulkan/vkapi.h
-+++ b/ext/vulkan/vkapi.h
-@@ -23,7 +23,7 @@
- 
- #define VK_PROTOTYPES
- 
--#include "vkconfig.h"
-+#include <vkconfig.h>
- #include "vk_fwd.h"
- #include "vkmacros.h"
- 
-diff --git a/ext/vulkan/wayland/Makefile.am b/ext/vulkan/wayland/Makefile.am
-index f92d85e2c..10cfb70e6 100644
---- a/ext/vulkan/wayland/Makefile.am
-+++ b/ext/vulkan/wayland/Makefile.am
-@@ -14,6 +14,7 @@ noinst_HEADERS = \
- 
- libgstvulkan_wayland_la_CFLAGS = \
- 	-I$(top_srcdir)/gst-libs \
-+	-I$(top_builddir)/ext/vulkan \
- 	-I$(top_srcdir)/ext/vulkan \
- 	-I$(top_builddir)/gst-libs \
- 	$(GST_PLUGINS_BASE_CFLAGS) \
-diff --git a/ext/vulkan/xcb/Makefile.am b/ext/vulkan/xcb/Makefile.am
-index 7debcff9e..b5103551b 100644
---- a/ext/vulkan/xcb/Makefile.am
-+++ b/ext/vulkan/xcb/Makefile.am
-@@ -14,6 +14,7 @@ noinst_HEADERS = \
- 
- libgstvulkan_xcb_la_CFLAGS = \
- 	-I$(top_srcdir)/gst-libs \
-+	-I$(top_builddir)/ext/vulkan \
- 	-I$(top_srcdir)/ext/vulkan \
- 	-I$(top_builddir)/gst-libs \
- 	$(GST_PLUGINS_BASE_CFLAGS) \
--- 
-2.13.2
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
deleted file mode 100644
index c81fb0f6aa..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0009-glimagesink-Downrank-to-marginal.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c6b37a80806f9128de47f1ccc3f2354f8d436bb6 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 24 Sep 2015 19:47:32 +0300
-Subject: [PATCH] glimagesink: Downrank to marginal
-
-On desktop, where there is good OpenGL, xvimagesink will come up first,
-on other platforms, OpenGL can't be trusted because it's either software (like
-in a VM) or broken (like on embedded)., so let ximagesink come above.
-
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=751684]
-
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- ext/gl/gstopengl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
-index a4b2540..0ccaacd 100644
---- a/ext/gl/gstopengl.c
-+++ b/ext/gl/gstopengl.c
-@@ -118,7 +118,7 @@ plugin_init (GstPlugin * plugin)
- #endif
- 
-   if (!gst_element_register (plugin, "glimagesink",
--          GST_RANK_SECONDARY, gst_gl_image_sink_bin_get_type ())) {
-+          GST_RANK_MARGINAL, gst_gl_image_sink_bin_get_type ())) {
-     return FALSE;
-   }
- 
--- 
-2.1.4
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
deleted file mode 100644
index c382b17586..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/link-with-libvchostif.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Add -lvchostif to link when using -lEGL on rpi
-
-This is required because libEGL from userland uses sybols
-from this library.
-
-lib/libEGL.so.1.0.0                                                                                                                                                                                                                              121: 00000000     0 FUNC    GLOBAL DEFAULT  UND vc_dispmanx_element_add
-  1552: 00000000     0 FUNC    GLOBAL DEFAULT  UND vc_dispmanx_element_add
-
-These symbols are provided by libvchostif as seen below
-
-lib/libvchostif.so
-   252: 0000b161   192 FUNC    GLOBAL DEFAULT    9 vc_dispmanx_element_add
-   809: 0000b161   192 FUNC    GLOBAL DEFAULT    9 vc_dispmanx_element_add
-
-With this explicit link, plugins fail during runtime
-
-(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstomx.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
-(gst-plugin-scanner:571): GStreamer-WARNING **: Failed to load plugin '/usr/lib/gstreamer-1.0/libgstopengl.so': Error relocating /usr/lib/libgstgl-1.0.so.0: vc_dispmanx_element_add: symbol not found
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Upstream-Status: Pending
-Index: gst-plugins-bad-1.10.4/configure.ac
-===================================================================
---- gst-plugins-bad-1.10.4.orig/configure.ac
-+++ gst-plugins-bad-1.10.4/configure.ac
-@@ -785,7 +785,7 @@ case $host in
-                             HAVE_EGL=yes
-                             HAVE_GLES2=yes
-                             HAVE_EGL_RPI=yes
--                            EGL_LIBS="-lbcm_host -lvcos -lvchiq_arm"
-+                            EGL_LIBS="-lbcm_host -lvchostif -lvcos -lvchiq_arm"
-                             EGL_CFLAGS=""
-                             AC_DEFINE(USE_EGL_RPI, [1], [Use RPi platform])
-                           ])
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb
similarity index 59%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb
index 82c7ffcb1d..9c4b19d45f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb
@@ -9,15 +9,10 @@ SRC_URI = " \
     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-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
-    file://0009-glimagesink-Downrank-to-marginal.patch \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
-    file://link-with-libvchostif.patch \
-    file://0001-vkdisplay-Use-ifdef-for-platform-specific-defines.patch \
-    file://0002-vulkan-Use-the-generated-version-of-vkconfig.h.patch \
 "
-SRC_URI[md5sum] = "64bf16cf15edaab1c0e02c8dee7170d0"
-SRC_URI[sha256sum] = "0c7857be16686d5c1ba6e34bd338664d3d4599d32714a8eca5c8a41a101e2d08"
+SRC_URI[md5sum] = "555bbe7232fb4653c31b78e1f79068cf"
+SRC_URI[sha256sum] = "ed5e2badb6f2858f60017b93334d91fe58a0e3f85ed2f37f2e931416fafb4f9f"
 
 S = "${WORKDIR}/gst-plugins-bad-${PV}"
 
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v2 4/8] gstreamer1.0-plugins-ugly: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
                   ` (2 preceding siblings ...)
  2018-04-25  7:23 ` [PATCH v2 3/8] gstreamer1.0-plugins-bad: " kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-04-25  7:23 ` [PATCH v2 5/8] gstreamer1.0-plugins-good: " kai.kang
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade gstreamer1.0-plugins-ugly from 1.12.4 to 1.14.0.

* move packageconfigs 'lame', 'mpg123' and configure options
  '--disable-twolame' to -good that plugins have been moved to -good

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc      | 5 +----
 ....0-plugins-ugly_1.12.4.bb => gstreamer1.0-plugins-ugly_1.14.0.bb} | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.12.4.bb => gstreamer1.0-plugins-ugly_1.14.0.bb} (76%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
index 60aa968c95..31f02df3c1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
@@ -9,7 +9,7 @@ inherit gettext
 
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
-    a52dec lame mpg123 mpeg2dec \
+    a52dec mpeg2dec \
 "
 
 PACKAGECONFIG[a52dec]   = "--enable-a52dec,--disable-a52dec,liba52"
@@ -17,14 +17,11 @@ PACKAGECONFIG[amrnb]    = "--enable-amrnb,--disable-amrnb,opencore-amr"
 PACKAGECONFIG[amrwb]    = "--enable-amrwb,--disable-amrwb,opencore-amr"
 PACKAGECONFIG[cdio]     = "--enable-cdio,--disable-cdio,libcdio"
 PACKAGECONFIG[dvdread]  = "--enable-dvdread,--disable-dvdread,libdvdread"
-PACKAGECONFIG[lame]     = "--enable-lame,--disable-lame,lame"
 PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
-PACKAGECONFIG[mpg123]   = "--enable-mpg123,--disable-mpg123,mpg123"
 PACKAGECONFIG[x264]     = "--enable-x264,--disable-x264,x264"
 
 EXTRA_OECONF += " \
     --disable-sidplay \
-    --disable-twolame \
 "
 
 FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
similarity index 76%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
index f8333519e9..24904fdd1f 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
@@ -7,7 +7,7 @@ SRC_URI = " \
     http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
 "
-SRC_URI[md5sum] = "e2b836fb2747f6ae3a1a6f33a9d8c952"
-SRC_URI[sha256sum] = "1c165b8d888ed350acd8e6ac9f6fe06508e6fcc0a3afc6ccc9fbeb30df9be522"
+SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88"
+SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1"
 
 S = "${WORKDIR}/gst-plugins-ugly-${PV}"
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v2 5/8] gstreamer1.0-plugins-good: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
                   ` (3 preceding siblings ...)
  2018-04-25  7:23 ` [PATCH v2 4/8] gstreamer1.0-plugins-ugly: " kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-05-02  3:17   ` Anuj Mittal
  2018-04-25  7:23 ` [PATCH v2 6/8] gstreamer1.0-libav: " kai.kang
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade gstreamer1.0-plugins-good from 1.12.4 to 1.14.0.

* add packageconfig 'gtk' and configure option '--disable-qt' from -bad
* add packageconfig 'lame', 'mpg123' and configure option
  '--disable-twolame' from -ugly
* remove configure option '--disable-sunaudio' since plugin sunaudio has
  been removed

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../gstreamer/gstreamer1.0-plugins-good.inc               | 15 +++++++++++++--
 ...good_1.12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} |  4 ++--
 2 files changed, 15 insertions(+), 4 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} (85%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index 14c3d61848..ed14ed56c2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -6,10 +6,12 @@ DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2"
 
 inherit gettext
 
+# gtk is not in the PACKAGECONFIG variable by default until
+# the transition to gtk+3 is finished
 PACKAGECONFIG ??= " \
     ${GSTREAMER_ORC} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
-    cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \
+    cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \
 "
 
 X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
@@ -18,11 +20,14 @@ PACKAGECONFIG[cairo]      = "--enable-cairo,--disable-cairo,cairo"
 PACKAGECONFIG[dv1394]     = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
 PACKAGECONFIG[flac]       = "--enable-flac,--disable-flac,flac"
 PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
+PACKAGECONFIG[gtk]             = "--enable-gtk3,--disable-gtk3,gtk+3"
 PACKAGECONFIG[gudev]      = "--with-gudev,--without-gudev,libgudev"
 PACKAGECONFIG[jack]       = "--enable-jack,--disable-jack,jack"
 PACKAGECONFIG[jpeg]       = "--enable-jpeg,--disable-jpeg,jpeg"
+PACKAGECONFIG[lame]       = "--enable-lame,--disable-lame,lame"
 PACKAGECONFIG[libpng]     = "--enable-libpng,--disable-libpng,libpng"
 PACKAGECONFIG[libv4l2]    = "--with-libv4l2,--without-libv4l2,v4l-utils"
+PACKAGECONFIG[mpg123]     = "--enable-mpg123,--disable-mpg123,mpg123"
 PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
 PACKAGECONFIG[soup]       = "--enable-soup,--disable-soup,libsoup-2.4"
 PACKAGECONFIG[speex]      = "--enable-speex,--disable-speex,speex"
@@ -32,6 +37,11 @@ PACKAGECONFIG[vpx]        = "--enable-vpx,--disable-vpx,libvpx"
 PACKAGECONFIG[wavpack]    = "--enable-wavpack,--disable-wavpack,wavpack"
 PACKAGECONFIG[x11]        = "--enable-x,--disable-x,${X11DEPENDS}"
 
+# qt5 support is disabled, because it is not present in OE core, and requires more work than
+# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
+# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig
+# in a gstreamer1.0-plugins-bad bbappend).
+
 EXTRA_OECONF += " \
     --enable-bz2 \
     --enable-oss \
@@ -44,8 +54,9 @@ EXTRA_OECONF += " \
     --disable-oss4 \
     --disable-osx_audio \
     --disable-osx_video \
+    --disable-qt \
     --disable-shout2 \
-    --disable-sunaudio \
+    --disable-twolame \
     --disable-waveform \
 "
 
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
similarity index 85%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
index a0609641d6..275e2b7f47 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
@@ -11,8 +11,8 @@ SRC_URI = " \
     file://ensure-valid-sentinel-for-gst_structure_get.patch \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
 "
-SRC_URI[md5sum] = "bdf4791a2b788ec6a149b81ff4032038"
-SRC_URI[sha256sum] = "649f49bec60892d47ee6731b92266974c723554da1c6649f21296097715eb957"
+SRC_URI[md5sum] = "48584b02e469a314b0e71f1553a2d2a7"
+SRC_URI[sha256sum] = "6afa35747d528d3ab4ed8f5eac13f7235d7d28100d6a24dd78f81ec7c0d04688"
 
 S = "${WORKDIR}/gst-plugins-good-${PV}"
 
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v2 6/8] gstreamer1.0-libav: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
                   ` (4 preceding siblings ...)
  2018-04-25  7:23 ` [PATCH v2 5/8] gstreamer1.0-plugins-good: " kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-04-25  7:23 ` [PATCH v2 7/8] gst-validate: " kai.kang
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade gstreamer1.0-libav from 1.12.4 to 1.14.0.

* remove 0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
  which has been fixed by upstream
* add patch to fix host contamination

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 ...a.c-Fix-build-by-Including-libavcodec-hev.patch | 33 ----------------------
 .../remove-host-contamination.patch                | 22 +++++++++++++++
 ...ibav_1.12.4.bb => gstreamer1.0-libav_1.14.0.bb} |  6 ++--
 3 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/remove-host-contamination.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.12.4.bb => gstreamer1.0-libav_1.14.0.bb} (82%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
deleted file mode 100644
index afbfc84db5..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b5226c096a0b7049874858e94a59d43e10ba3fd2 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 21 Sep 2017 10:22:56 -0700
-Subject: [PATCH] hevcpred_msa.c: Fix build by Including libavcodec/hevcdec.h
-
-src/libavcodec/mips/hevcpred_msa.c:1913:32: error: unknown type name 'HEVCContext'; did you mean 'HEVCPredContext'?
- void ff_intra_pred_8_16x16_msa(HEVCContext *s, int x0, int y0, int c_idx)
-                                ^~~~~~~~~~~
-                                HEVCPredContext
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c
-index 6a3b281..963c64c 100644
---- a/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c
-+++ b/gst-libs/ext/libav/libavcodec/mips/hevcpred_msa.c
-@@ -18,7 +18,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  */
- 
--#include "libavcodec/hevc.h"
-+#include "libavcodec/hevcdec.h"
- #include "libavutil/mips/generic_macros_msa.h"
- #include "hevcpred_mips.h"
- 
--- 
-2.14.1
-
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/remove-host-contamination.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/remove-host-contamination.patch
new file mode 100644
index 0000000000..a1f34f05b6
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/remove-host-contamination.patch
@@ -0,0 +1,22 @@
+Upstream-Status: Inappropriate [cross build specific]
+
+Remove '-L$(libdir)' to avoid host contamination.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ gst-libs/ext/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
+index 6cdc048..f45e71f 100644
+--- a/gst-libs/ext/Makefile.am
++++ b/gst-libs/ext/Makefile.am
+@@ -49,7 +49,7 @@ echo "  GEN      $1.la" && \
+  echo "library_names=''" && \
+  echo "old_library='$1.a'" && \
+  echo "inherited_linker_flags=''" && \
+- echo "dependency_libs=' -L$(libdir) $(if $2,$(foreach dep,$2,$(abs_builddir)/$(dep).la)) $(call find_library_la,$3 $(LIBM),$(LDFLAGS)) '" && \
++ echo "dependency_libs=' $(if $2,$(foreach dep,$2,$(abs_builddir)/$(dep).la)) $(call find_library_la,$3 $(LIBM),$(LDFLAGS)) '" && \
+  echo "weak_library_names=''" &&  \
+  echo "current=" && \
+  echo "age=" && \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
similarity index 82%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
index af547ba602..d501855abe 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
@@ -13,9 +13,9 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz
            file://workaround-to-build-gst-libav-for-i586-with-gcc.patch \
            file://mips64_cpu_detection.patch \
            file://0001-configure-check-for-armv7ve-variant.patch \
-           file://0001-hevcpred_msa.c-Fix-build-by-Including-libavcodec-hev.patch \
+           file://remove-host-contamination.patch \
            "
-SRC_URI[md5sum] = "8a851bf2e475e90a3fdac9506e3e4dbd"
-SRC_URI[sha256sum] = "2a56aa5d2d8cd912f2bce17f174713d2c417ca298f1f9c28ee66d4aa1e1d9e62"
+SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d"
+SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89"
 
 S = "${WORKDIR}/gst-libav-${PV}"
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v2 7/8] gst-validate: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
                   ` (5 preceding siblings ...)
  2018-04-25  7:23 ` [PATCH v2 6/8] gstreamer1.0-libav: " kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-04-25  7:23 ` [PATCH v2 8/8] gstreamer1.0: upgrade other packages to 1.14.0 kai.kang
  2018-04-30 12:58 ` [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 Alexander Kanavin
  8 siblings, 0 replies; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade gst-validate from 1.12.4 to 1.14.0:

* fix out of source tree build error

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../gstreamer/gst-validate/out-of-tree-build.patch | 28 ++++++++++++++++++++++
 ...t-validate_1.12.4.bb => gst-validate_1.14.0.bb} |  8 ++++---
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gst-validate/out-of-tree-build.patch
 rename meta/recipes-multimedia/gstreamer/{gst-validate_1.12.4.bb => gst-validate_1.14.0.bb} (81%)

diff --git a/meta/recipes-multimedia/gstreamer/gst-validate/out-of-tree-build.patch b/meta/recipes-multimedia/gstreamer/gst-validate/out-of-tree-build.patch
new file mode 100644
index 0000000000..66124199b1
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-validate/out-of-tree-build.patch
@@ -0,0 +1,28 @@
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795531]
+
+Fix build error when out of source tree build.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+ gst/validate/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gst/validate/Makefile.am b/gst/validate/Makefile.am
+index 342730a..0e6ed28 100644
+--- a/gst/validate/Makefile.am
++++ b/gst/validate/Makefile.am
+@@ -50,12 +50,12 @@ nodist_libgstvalidate_@GST_API_VERSION@include_HEADERS = $(built_header_make)
+ 
+ gst-validate-enum-types.h: $(source_h)
+ 	$(AM_V_GEN)$(GLIB_MKENUMS) \
+-	--template gst-validate-enum-types.h.template \
++	--template $(top_srcdir)/gst/validate/gst-validate-enum-types.h.template \
+ 	$^ > gst-validate-enum-types.h
+ 
+ gst-validate-enum-types.c: $(source_h)
+ 	$(AM_V_GEN)$(GLIB_MKENUMS) \
+-	--template gst-validate-enum-types.c.template \
++	--template $(top_srcdir)/gst/validate/gst-validate-enum-types.c.template \
+ 	$^ > gst-validate-enum-types.c
+ 
+ EXTRA_DIST= \
diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb
similarity index 81%
rename from meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb
index 0f2585a459..b2fd03d1c6 100644
--- a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb
@@ -6,9 +6,11 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
-SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz"
-SRC_URI[md5sum] = "bc074d49677081f9c27de11a09165746"
-SRC_URI[sha256sum] = "f9da9dfe6e5d6f5ba3b38c5752b42d3f927715904942b405c2924d3cb77afba1"
+SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \
+           file://out-of-tree-build.patch \
+           "
+SRC_URI[md5sum] = "deb8654c912b189388fe585b0fc5bc8f"
+SRC_URI[sha256sum] = "33df08bf77f2895d64b7e8a957de3b930b4da0a8edabfbefcff2eab027eeffdf"
 
 DEPENDS = "json-glib glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS_${PN} = "git"
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* [PATCH v2 8/8] gstreamer1.0: upgrade other packages to 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
                   ` (6 preceding siblings ...)
  2018-04-25  7:23 ` [PATCH v2 7/8] gst-validate: " kai.kang
@ 2018-04-25  7:23 ` kai.kang
  2018-04-30 12:58 ` [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 Alexander Kanavin
  8 siblings, 0 replies; 15+ messages in thread
From: kai.kang @ 2018-04-25  7:23 UTC (permalink / raw)
  To: openembedded-core

From: Kai Kang <kai.kang@windriver.com>

Upgrade following packages from 1.12.4 to 1.14.0:
* gstreamer1.0-omx
* gstreamer1.0-python
* gstreamer1.0-rtsp-server
* gstreamer1.0-vaapi

Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
 .../{gstreamer1.0-omx_1.12.4.bb => gstreamer1.0-omx_1.14.0.bb}       | 4 ++--
 .../{gstreamer1.0-python_1.12.4.bb => gstreamer1.0-python_1.14.0.bb} | 4 ++--
 ...r1.0-rtsp-server_1.12.4.bb => gstreamer1.0-rtsp-server_1.14.0.bb} | 4 ++--
 .../{gstreamer1.0-vaapi_1.12.4.bb => gstreamer1.0-vaapi_1.14.0.bb}   | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.12.4.bb => gstreamer1.0-omx_1.14.0.bb} (69%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.12.4.bb => gstreamer1.0-python_1.14.0.bb} (57%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.12.4.bb => gstreamer1.0-rtsp-server_1.14.0.bb} (44%)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.12.4.bb => gstreamer1.0-vaapi_1.14.0.bb} (43%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb
similarity index 69%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb
index 7f7eae3708..45f0345b77 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "eb8d5ae3b69cfeed9dc77c592106247e"
-SRC_URI[sha256sum] = "a025fa24242ec868fe0ff1e66d806a1070bcbc7c14a987a89cdc3395d0d56d5f"
+SRC_URI[md5sum] = "2bca3bd68540a97122450d78576ad2be"
+SRC_URI[sha256sum] = "4d43c354087cb77924982943e34e0d47294b5570304db11fd8b268b53bcff693"
 
 S = "${WORKDIR}/gst-omx-${PV}"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb
similarity index 57%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb
index faec3566c4..8392839c6a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb
@@ -1,7 +1,7 @@
 require gstreamer1.0-python.inc
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[md5sum] = "f1fd046ea781736a794f9f552d77c50d"
-SRC_URI[sha256sum] = "20ce6af6615c9a440c1928c31259a78226516d06bf1a65f888c6d109826fa3ea"
+SRC_URI[md5sum] = "97782b2fde877f1d1d68c64f7db4f735"
+SRC_URI[sha256sum] = "e0b98111150aa3fcdeb6e228cd770995fbdaa8586fc02ec9b3273d4ae83399e6"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb
similarity index 44%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb
index da68dcba20..ef8caa1907 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb
@@ -1,6 +1,6 @@
 require gstreamer1.0-rtsp-server.inc
 
-SRC_URI[md5sum] = "ad70a9735f58da21d0f5cedf48ccadd3"
-SRC_URI[sha256sum] = "7660112ebd59838f1054796b38109dcbe32f0a040e3a252a68a81055aeaa56a9"
+SRC_URI[md5sum] = "8a505c88f7469c3a0d1e9f4e9a315e53"
+SRC_URI[sha256sum] = "6b65a077bed815f6d3157ebea503cc9f3c32d289af2756b7ff7e3958744d9756"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb
similarity index 43%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb
index 1df2301792..b42164aee8 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.12.4.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb
@@ -1,5 +1,6 @@
 require gstreamer1.0-vaapi.inc
-SRC_URI[md5sum] = "2149982cdb348139bca946bb63766f4c"
-SRC_URI[sha256sum] = "1c2d77242e1f30c4d1394636cae9f6877228a017960fca96881e0080d8b6e9c9"
+
+SRC_URI[md5sum] = "248c3aafab59814e71eb4a6c334cb261"
+SRC_URI[sha256sum] = "e4e31f085ef289bf1049398f641345979d20a1b11a80285744bba98504991df2"
 
 DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
-- 
2.14.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0
  2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
                   ` (7 preceding siblings ...)
  2018-04-25  7:23 ` [PATCH v2 8/8] gstreamer1.0: upgrade other packages to 1.14.0 kai.kang
@ 2018-04-30 12:58 ` Alexander Kanavin
  8 siblings, 0 replies; 15+ messages in thread
From: Alexander Kanavin @ 2018-04-30 12:58 UTC (permalink / raw)
  To: kai.kang, openembedded-core

On 04/25/2018 10:23 AM, kai.kang@windriver.com wrote:

>    gstreamer1.0: 1.12.4 -> 1.14.0
>    gstreamer1.0-plugins-base: 1.12.4 -> 1.14.0
>    gstreamer1.0-plugins-bad: 1.12.4 -> 1.14.0
>    gstreamer1.0-plugins-ugly: 1.12.4 -> 1.14.0
>    gstreamer1.0-plugins-good: 1.12.4 -> 1.14.0
>    gstreamer1.0-libav: 1.12.4 -> 1.14.0
>    gst-validate: 1.12.4 -> 1.14.0
>    gstreamer1.0: upgrade other packages to 1.14.0

Are you aware if they plan to drop autotools and provide only meson 
builds, and when?

Alex


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 5/8] gstreamer1.0-plugins-good: 1.12.4 -> 1.14.0
  2018-04-25  7:23 ` [PATCH v2 5/8] gstreamer1.0-plugins-good: " kai.kang
@ 2018-05-02  3:17   ` Anuj Mittal
  2018-05-02  9:26     ` Burton, Ross
  0 siblings, 1 reply; 15+ messages in thread
From: Anuj Mittal @ 2018-05-02  3:17 UTC (permalink / raw)
  To: kai.kang, openembedded-core

On 04/25/2018 03:23 PM, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
> 
> Upgrade gstreamer1.0-plugins-good from 1.12.4 to 1.14.0.
> 
> * add packageconfig 'gtk' and configure option '--disable-qt' from -bad
> * add packageconfig 'lame', 'mpg123' and configure option
>   '--disable-twolame' from -ugly
> * remove configure option '--disable-sunaudio' since plugin sunaudio has
>   been removed
> 
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
>  .../gstreamer/gstreamer1.0-plugins-good.inc               | 15 +++++++++++++--
>  ...good_1.12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} |  4 ++--
>  2 files changed, 15 insertions(+), 4 deletions(-)
>  rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} (85%)
> 
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
> index 14c3d61848..ed14ed56c2 100644
> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
> @@ -6,10 +6,12 @@ DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2"
>  
>  inherit gettext
>  
> +# gtk is not in the PACKAGECONFIG variable by default until
> +# the transition to gtk+3 is finished
>  PACKAGECONFIG ??= " \
>      ${GSTREAMER_ORC} \
>      ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
> -    cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \
> +    cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \
>  "
>  
>  X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
> @@ -18,11 +20,14 @@ PACKAGECONFIG[cairo]      = "--enable-cairo,--disable-cairo,cairo"
>  PACKAGECONFIG[dv1394]     = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
>  PACKAGECONFIG[flac]       = "--enable-flac,--disable-flac,flac"
>  PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
> +PACKAGECONFIG[gtk]             = "--enable-gtk3,--disable-gtk3,gtk+3"
>  PACKAGECONFIG[gudev]      = "--with-gudev,--without-gudev,libgudev"
>  PACKAGECONFIG[jack]       = "--enable-jack,--disable-jack,jack"
>  PACKAGECONFIG[jpeg]       = "--enable-jpeg,--disable-jpeg,jpeg"
> +PACKAGECONFIG[lame]       = "--enable-lame,--disable-lame,lame"
>  PACKAGECONFIG[libpng]     = "--enable-libpng,--disable-libpng,libpng"
>  PACKAGECONFIG[libv4l2]    = "--with-libv4l2,--without-libv4l2,v4l-utils"
> +PACKAGECONFIG[mpg123]     = "--enable-mpg123,--disable-mpg123,mpg123"
>  PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
>  PACKAGECONFIG[soup]       = "--enable-soup,--disable-soup,libsoup-2.4"
>  PACKAGECONFIG[speex]      = "--enable-speex,--disable-speex,speex"
> @@ -32,6 +37,11 @@ PACKAGECONFIG[vpx]        = "--enable-vpx,--disable-vpx,libvpx"
>  PACKAGECONFIG[wavpack]    = "--enable-wavpack,--disable-wavpack,wavpack"
>  PACKAGECONFIG[x11]        = "--enable-x,--disable-x,${X11DEPENDS}"
>  
> +# qt5 support is disabled, because it is not present in OE core, and requires more work than
> +# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
> +# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig
> +# in a gstreamer1.0-plugins-bad bbappend).
> +
>  EXTRA_OECONF += " \
>      --enable-bz2 \

bz2 and zlib are optional and perhaps should be moved to PACKAGECONFIG
instead.

I had done a similar upgrade but was waiting for the release before
submitting:

https://github.com/anujm1/poky/commit/83204baaa9023e1514132534acbb4ec3968c1a15




^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 3/8] gstreamer1.0-plugins-bad: 1.12.4 -> 1.14.0
  2018-04-25  7:23 ` [PATCH v2 3/8] gstreamer1.0-plugins-bad: " kai.kang
@ 2018-05-02  3:23   ` Anuj Mittal
  0 siblings, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2018-05-02  3:23 UTC (permalink / raw)
  To: kai.kang, openembedded-core

On 04/25/2018 03:23 PM, kai.kang@windriver.com wrote:
> -PACKAGECONFIG[wayland]         = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"

wayland is still a dependency and shouldn't probably be removed.

https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/tree/gst-libs/gst/wayland?h=1.14

Also, libpng should probably be removed from DEPENDS since it's no
longer required.

I had this:

https://github.com/anujm1/poky/commit/2cbe5cadbd9e53b244ca1ca03d3edd6da8be1f41


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 2/8] gstreamer1.0-plugins-base: 1.12.4 -> 1.14.0
  2018-04-25  7:23 ` [PATCH v2 2/8] gstreamer1.0-plugins-base: " kai.kang
@ 2018-05-02  3:33   ` Anuj Mittal
  2018-05-02  3:40   ` Anuj Mittal
  1 sibling, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2018-05-02  3:33 UTC (permalink / raw)
  To: kai.kang, openembedded-core

On 04/25/2018 03:23 PM, kai.kang@windriver.com wrote:
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
> index b924e38824..438f4ebbf2 100644
> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0004-subparse-set-need_segment-after-sink-pad-received-GS.patch
> @@ -20,7 +20,7 @@ new mode 100755
>  index b565e93..7741ccc
>  --- a/gst/subparse/gstsubparse.c
>  +++ b/gst/subparse/gstsubparse.c
> -@@ -266,22 +266,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
> +@@ -270,24 +270,20 @@ gst_sub_parse_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
>           goto beach;
>         }
>   
> @@ -45,13 +45,15 @@ index b565e93..7741ccc
>  -        GST_DEBUG_OBJECT (self, "segment after seek: %" GST_SEGMENT_FORMAT,
>  -            &self->segment);
>  -
> --        self->need_segment = TRUE;
> +-        /* will mark need_segment when receiving segment from upstream,
> +-         * after FLUSH and all that has happened,
> +-         * rather than racing with chain */
>  -      } else {
>  +      if (!ret) {

This probably should be checked if it's still required.

Please consider adding a PACKAGECONFIG to have jpeg enabled too ..



^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 2/8] gstreamer1.0-plugins-base: 1.12.4 -> 1.14.0
  2018-04-25  7:23 ` [PATCH v2 2/8] gstreamer1.0-plugins-base: " kai.kang
  2018-05-02  3:33   ` Anuj Mittal
@ 2018-05-02  3:40   ` Anuj Mittal
  1 sibling, 0 replies; 15+ messages in thread
From: Anuj Mittal @ 2018-05-02  3:40 UTC (permalink / raw)
  To: kai.kang, openembedded-core

On 04/25/2018 03:23 PM, kai.kang@windriver.com wrote:
>  CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"

This can probably be removed too now. I remember trying it out and the
build worked for x86. Please check.

Thanks,
Anuj


^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PATCH v2 5/8] gstreamer1.0-plugins-good: 1.12.4 -> 1.14.0
  2018-05-02  3:17   ` Anuj Mittal
@ 2018-05-02  9:26     ` Burton, Ross
  0 siblings, 0 replies; 15+ messages in thread
From: Burton, Ross @ 2018-05-02  9:26 UTC (permalink / raw)
  To: Anuj Mittal; +Cc: OE-core

Anuj, it sounds like your series is a more comprehensive upgrade, can
you submit your patches now?  We'll be reopening master shortly.

Thanks,
Ross

On 2 May 2018 at 04:17, Anuj Mittal <anuj.mittal@intel.com> wrote:
> On 04/25/2018 03:23 PM, kai.kang@windriver.com wrote:
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> Upgrade gstreamer1.0-plugins-good from 1.12.4 to 1.14.0.
>>
>> * add packageconfig 'gtk' and configure option '--disable-qt' from -bad
>> * add packageconfig 'lame', 'mpg123' and configure option
>>   '--disable-twolame' from -ugly
>> * remove configure option '--disable-sunaudio' since plugin sunaudio has
>>   been removed
>>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>>  .../gstreamer/gstreamer1.0-plugins-good.inc               | 15 +++++++++++++--
>>  ...good_1.12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} |  4 ++--
>>  2 files changed, 15 insertions(+), 4 deletions(-)
>>  rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.12.4.bb => gstreamer1.0-plugins-good_1.14.0.bb} (85%)
>>
>> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
>> index 14c3d61848..ed14ed56c2 100644
>> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
>> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
>> @@ -6,10 +6,12 @@ DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2"
>>
>>  inherit gettext
>>
>> +# gtk is not in the PACKAGECONFIG variable by default until
>> +# the transition to gtk+3 is finished
>>  PACKAGECONFIG ??= " \
>>      ${GSTREAMER_ORC} \
>>      ${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
>> -    cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \
>> +    cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 \
>>  "
>>
>>  X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
>> @@ -18,11 +20,14 @@ PACKAGECONFIG[cairo]      = "--enable-cairo,--disable-cairo,cairo"
>>  PACKAGECONFIG[dv1394]     = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
>>  PACKAGECONFIG[flac]       = "--enable-flac,--disable-flac,flac"
>>  PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
>> +PACKAGECONFIG[gtk]             = "--enable-gtk3,--disable-gtk3,gtk+3"
>>  PACKAGECONFIG[gudev]      = "--with-gudev,--without-gudev,libgudev"
>>  PACKAGECONFIG[jack]       = "--enable-jack,--disable-jack,jack"
>>  PACKAGECONFIG[jpeg]       = "--enable-jpeg,--disable-jpeg,jpeg"
>> +PACKAGECONFIG[lame]       = "--enable-lame,--disable-lame,lame"
>>  PACKAGECONFIG[libpng]     = "--enable-libpng,--disable-libpng,libpng"
>>  PACKAGECONFIG[libv4l2]    = "--with-libv4l2,--without-libv4l2,v4l-utils"
>> +PACKAGECONFIG[mpg123]     = "--enable-mpg123,--disable-mpg123,mpg123"
>>  PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
>>  PACKAGECONFIG[soup]       = "--enable-soup,--disable-soup,libsoup-2.4"
>>  PACKAGECONFIG[speex]      = "--enable-speex,--disable-speex,speex"
>> @@ -32,6 +37,11 @@ PACKAGECONFIG[vpx]        = "--enable-vpx,--disable-vpx,libvpx"
>>  PACKAGECONFIG[wavpack]    = "--enable-wavpack,--disable-wavpack,wavpack"
>>  PACKAGECONFIG[x11]        = "--enable-x,--disable-x,${X11DEPENDS}"
>>
>> +# qt5 support is disabled, because it is not present in OE core, and requires more work than
>> +# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
>> +# This is better done in a separate qt5 layer (which then should add a "qt5" packageconfig
>> +# in a gstreamer1.0-plugins-bad bbappend).
>> +
>>  EXTRA_OECONF += " \
>>      --enable-bz2 \
>
> bz2 and zlib are optional and perhaps should be moved to PACKAGECONFIG
> instead.
>
> I had done a similar upgrade but was waiting for the release before
> submitting:
>
> https://github.com/anujm1/poky/commit/83204baaa9023e1514132534acbb4ec3968c1a15
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2018-05-02  9:26 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-25  7:23 [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 kai.kang
2018-04-25  7:23 ` [PATCH v2 1/8] " kai.kang
2018-04-25  7:23 ` [PATCH v2 2/8] gstreamer1.0-plugins-base: " kai.kang
2018-05-02  3:33   ` Anuj Mittal
2018-05-02  3:40   ` Anuj Mittal
2018-04-25  7:23 ` [PATCH v2 3/8] gstreamer1.0-plugins-bad: " kai.kang
2018-05-02  3:23   ` Anuj Mittal
2018-04-25  7:23 ` [PATCH v2 4/8] gstreamer1.0-plugins-ugly: " kai.kang
2018-04-25  7:23 ` [PATCH v2 5/8] gstreamer1.0-plugins-good: " kai.kang
2018-05-02  3:17   ` Anuj Mittal
2018-05-02  9:26     ` Burton, Ross
2018-04-25  7:23 ` [PATCH v2 6/8] gstreamer1.0-libav: " kai.kang
2018-04-25  7:23 ` [PATCH v2 7/8] gst-validate: " kai.kang
2018-04-25  7:23 ` [PATCH v2 8/8] gstreamer1.0: upgrade other packages to 1.14.0 kai.kang
2018-04-30 12:58 ` [PATCH v2 0/8] gstreamer1.0: 1.12.4 -> 1.14.0 Alexander Kanavin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.