diff options
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch) | 75 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch) | 172 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0003-riff-add-missing-include-directories-when-calling-in.patch) | 0 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch) | 0 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch | 45 | ||||
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb) | 10 |
6 files changed, 175 insertions, 127 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch index 094bdac8..a1cc7d3d 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch @@ -1,16 +1,19 @@ -From f1d9652351e7754c63003104eceb526af424c7e0 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 20 Nov 2015 16:53:04 +0200 -Subject: [PATCH 1/4] Makefile.am: don't hardcode libtool name when running +From a049bb15839557594713cb32e7d6bfe0e2127392 Mon Sep 17 00:00:00 2001 +From: Yuqing Zhu <carol.zhu@nxp.com> +Date: Fri, 20 Apr 2018 22:46:46 +0800 +Subject: [PATCH] Makefile.am: don't hardcode libtool name when running introspection tools +Do patch refine basing on commit: f1d9652351e7754c63003104eceb526af424c7e0 + Upstream-Status: Pending [review on oe-core maillist] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +Signed-off-by: Yuqing Zhu <carol.zhu@nxp.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/gl/Makefile.am | 2 +- gst-libs/gst/pbutils/Makefile.am | 2 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/rtp/Makefile.am | 2 +- @@ -21,10 +24,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am -index 9361bf9..bc7f53a 100644 +index 0edc0ae..d0d425d 100644 --- a/gst-libs/gst/allocators/Makefile.am +++ b/gst-libs/gst/allocators/Makefile.am -@@ -38,7 +38,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ +@@ -58,7 +58,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -34,10 +37,10 @@ index 9361bf9..bc7f53a 100644 --pkg-export gstreamer-allocators-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am -index 6d6de8d..dcc2fe0 100644 +index 52f6ad3..5bfd606 100644 --- a/gst-libs/gst/app/Makefile.am +++ b/gst-libs/gst/app/Makefile.am -@@ -53,7 +53,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO +@@ -56,7 +56,7 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -47,10 +50,10 @@ index 6d6de8d..dcc2fe0 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-app-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am -index 275d222..2374196 100644 +index 2922245..7fb65f2 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am -@@ -116,7 +116,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE +@@ -184,7 +184,7 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ --include=GstTag-@GST_API_VERSION@ \ @@ -59,24 +62,24 @@ 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 \ +diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am +index b04187f..576bf1c 100644 +--- a/gst-libs/gst/gl/Makefile.am ++++ b/gst-libs/gst/gl/Makefile.am +@@ -205,7 +205,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-export gstreamer-fft-@GST_API_VERSION@ \ - --output $@ \ + --pkg gstreamer-base-@GST_API_VERSION@ \ + --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am -index 64d5eb0..91dc214 100644 +index ae51993..35a6e44 100644 --- a/gst-libs/gst/pbutils/Makefile.am +++ b/gst-libs/gst/pbutils/Makefile.am -@@ -99,7 +99,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP +@@ -103,7 +103,7 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --include=GstTag-@GST_API_VERSION@ \ --include=GstVideo-@GST_API_VERSION@ \ --include=GstAudio-@GST_API_VERSION@ \ @@ -86,10 +89,10 @@ index 64d5eb0..91dc214 100644 --pkg gstreamer-tag-@GST_API_VERSION@ \ --pkg gstreamer-video-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am -index 83d83cb..3bd8fc0 100644 +index fb53f06..e66ef4f 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am -@@ -47,7 +47,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) +@@ -49,7 +49,7 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ # --include=Gst-@GST_API_VERSION@ \ @@ -99,10 +102,10 @@ index 83d83cb..3bd8fc0 100644 # --pkg gstreamer-tag-@GST_API_VERSION@ \ # --pkg gstreamer-audio-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am -index fdd01c1..f5445c1 100644 +index a6f971d..77ebeeb 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am -@@ -65,7 +65,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO +@@ -69,7 +69,7 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -112,10 +115,10 @@ index fdd01c1..f5445c1 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-rtp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am -index ede5706..9b0b258 100644 +index ceb07f4..db9d0fd 100644 --- a/gst-libs/gst/rtsp/Makefile.am +++ b/gst-libs/gst/rtsp/Makefile.am -@@ -72,7 +72,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS +@@ -76,7 +76,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ --include=GstSdp-@GST_API_VERSION@ \ @@ -125,10 +128,10 @@ index ede5706..9b0b258 100644 --pkg gstreamer-@GST_API_VERSION@ \ --pkg gstreamer-sdp-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am -index a90f30b..0e149b8 100644 +index e197e9b..6e05cc7 100644 --- a/gst-libs/gst/sdp/Makefile.am +++ b/gst-libs/gst/sdp/Makefile.am -@@ -32,7 +32,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO +@@ -34,7 +34,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ @@ -138,10 +141,10 @@ index a90f30b..0e149b8 100644 --pkg-export gstreamer-sdp-@GST_API_VERSION@ \ --output $@ \ diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am -index c534a4d..cafafd3 100644 +index 0247c33..c86515b 100644 --- a/gst-libs/gst/tag/Makefile.am +++ b/gst-libs/gst/tag/Makefile.am -@@ -45,7 +45,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO +@@ -66,7 +66,7 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -151,10 +154,10 @@ index c534a4d..cafafd3 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-tag-@GST_API_VERSION@ \ diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am -index 5d31fa1..ac64eb3 100644 +index 1b74f37..0f7c07e 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am -@@ -116,7 +116,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE +@@ -126,7 +126,7 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ @@ -164,5 +167,5 @@ index 5d31fa1..ac64eb3 100644 --pkg gstreamer-base-@GST_API_VERSION@ \ --pkg-export gstreamer-video-@GST_API_VERSION@ \ -- -2.6.2 +2.7.4 diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch index 6616e2cf..4b6cfdd6 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch @@ -1,16 +1,18 @@ -From 990b653c7b6de1937ec759019982d6c5f15770f7 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 26 Oct 2015 16:38:18 +0200 -Subject: [PATCH 2/4] Makefile.am: prefix calls to pkg-config with +From e3f28d15e38f7633d8ed4023fe883b8377c0597e Mon Sep 17 00:00:00 2001 +From: Yuqing Zhu <carol.zhu@nxp.com> +Date: Fri, 20 Apr 2018 02:03:57 +0800 +Subject: [PATCH] Makefile.am: prefix calls to pkg-config with PKG_CONFIG_SYSROOT_DIR +Do patch refine base on commit: 990b653c7b6de1937ec759019982d6c5f15770f7 + Upstream-Status: Pending [review on oe-core maillist] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> + +Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> --- gst-libs/gst/allocators/Makefile.am | 4 ++-- - gst-libs/gst/app/Makefile.am | 4 ++-- + gst-libs/gst/app/Makefile.am | 8 ++++---- 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 ++++---- @@ -18,13 +20,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> gst-libs/gst/sdp/Makefile.am | 4 ++-- gst-libs/gst/tag/Makefile.am | 8 ++++---- gst-libs/gst/video/Makefile.am | 8 ++++---- - 11 files changed, 38 insertions(+), 38 deletions(-) + 10 files changed, 38 insertions(+), 38 deletions(-) -Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/allocators/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am -@@ -36,7 +36,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(I +diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am +index c4412a1..9f9d14d 100644 +--- a/gst-libs/gst/allocators/Makefile.am ++++ b/gst-libs/gst/allocators/Makefile.am +@@ -59,7 +59,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ --c-include "gst/allocators/allocators.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -33,7 +35,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am --library=libgstallocators-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -60,7 +60,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -83,7 +83,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -42,11 +44,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/allocators/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/app/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am -@@ -48,8 +48,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am +index 5bfd606..c231267 100644 +--- a/gst-libs/gst/app/Makefile.am ++++ b/gst-libs/gst/app/Makefile.am +@@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO --c-include "gst/app/app.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -57,11 +59,22 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/app/Makefile.am --library=libgstapp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/audio/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am -@@ -167,12 +167,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROS +@@ -79,8 +79,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) + $(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_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/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am +index 7fb65f2..5379f79 100644 +--- a/gst-libs/gst/audio/Makefile.am ++++ b/gst-libs/gst/audio/Makefile.am +@@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ --c-include "gst/audio/audio.h" \ @@ -78,7 +91,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/audio/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -201,8 +201,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir="$(top_builddir)/gst-libs/gst/tag/" \ @@ -89,33 +102,11 @@ 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 -+++ gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am -@@ -85,14 +85,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTR +diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am +index 35a6e44..49d6894 100644 +--- a/gst-libs/gst/pbutils/Makefile.am ++++ b/gst-libs/gst/pbutils/Makefile.am +@@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP --c-include "gst/pbutils/pbutils.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -134,7 +125,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --library-path="$(top_builddir)/gst-libs/gst/tag/" \ --library-path="$(top_builddir)/gst-libs/gst/video/" \ --library-path="$(top_builddir)/gst-libs/gst/audio/" \ -@@ -125,8 +125,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -145,11 +136,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/pbutils/Makefile.am --includedir="$(top_builddir)/gst-libs/gst/tag/" \ --includedir="$(top_builddir)/gst-libs/gst/video/" \ --includedir="$(top_builddir)/gst-libs/gst/audio/" \ -Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/riff/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am -@@ -42,8 +42,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am +index e66ef4f..c8c588a 100644 +--- a/gst-libs/gst/riff/Makefile.am ++++ b/gst-libs/gst/riff/Makefile.am +@@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --c-include "gst/riff/riff.h" \ # --add-include-path=$(builddir)/../tag \ # --add-include-path=$(builddir)/../audio \ @@ -160,7 +151,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # --library=libgstriff-@GST_API_VERSION@.la \ # --include=GstAudio-@GST_API_VERSION@ \ # --include=GstTag-@GST_API_VERSION@ \ -@@ -74,8 +74,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS +@@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) # --includedir=$(builddir) \ # --includedir=$(builddir)/../tag \ # --includedir=$(builddir)/../audio \ @@ -171,11 +162,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/riff/Makefile.am # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) # #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am -@@ -61,8 +61,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am +index 77ebeeb..9aee788 100644 +--- a/gst-libs/gst/rtp/Makefile.am ++++ b/gst-libs/gst/rtp/Makefile.am +@@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO --c-include "gst/rtp/rtp.h" \ -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ @@ -186,7 +177,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am --library=libgstrtp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -197,11 +188,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/rtsp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am -@@ -68,7 +68,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSP +diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am +index db9d0fd..79027cb 100644 +--- a/gst-libs/gst/rtsp/Makefile.am ++++ b/gst-libs/gst/rtsp/Makefile.am +@@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS -I$(top_builddir)/gst-libs \ -I$(top_srcdir)/gst-libs \ --add-include-path=$(builddir)/../sdp \ @@ -210,7 +201,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am --library=libgstrtsp-@GST_API_VERSION@.la \ --include=Gio-2.0 \ --include=Gst-@GST_API_VERSION@ \ -@@ -98,7 +98,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) --includedir=$(srcdir) \ --includedir=$(builddir) \ --includedir=$(builddir)/../sdp \ @@ -219,11 +210,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/rtsp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/sdp/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am -@@ -30,7 +30,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am +index 6e05cc7..c7cf514 100644 +--- a/gst-libs/gst/sdp/Makefile.am ++++ b/gst-libs/gst/sdp/Makefile.am +@@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO --warn-all \ --c-include "gst/sdp/sdp.h" \ -I$(top_srcdir)/gst-libs \ @@ -232,7 +223,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am --library=libgstsdp-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --libtool="$(LIBTOOL)" \ -@@ -54,7 +54,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -241,11 +232,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/sdp/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/tag/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am -@@ -59,8 +59,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPE +diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am +index c86515b..363e6d2 100644 +--- a/gst-libs/gst/tag/Makefile.am ++++ b/gst-libs/gst/tag/Makefile.am +@@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO --c-include "gst/tag/tag.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -256,7 +247,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am --library=libgsttag-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -87,8 +87,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -267,11 +258,11 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/tag/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) -Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -=================================================================== ---- gst-plugins-base-1.12.3.orig/gst-libs/gst/video/Makefile.am -+++ gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am -@@ -116,8 +116,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROS +diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am +index 0f7c07e..d642267 100644 +--- a/gst-libs/gst/video/Makefile.am ++++ b/gst-libs/gst/video/Makefile.am +@@ -121,8 +121,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE --c-include "gst/video/video.h" \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ @@ -282,7 +273,7 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am --library=libgstvideo-@GST_API_VERSION@.la \ --include=Gst-@GST_API_VERSION@ \ --include=GstBase-@GST_API_VERSION@ \ -@@ -144,8 +144,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir= +@@ -149,8 +149,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) $(INTROSPECTION_COMPILER) \ --includedir=$(srcdir) \ --includedir=$(builddir) \ @@ -293,3 +284,6 @@ Index: gst-plugins-base-1.12.3/gst-libs/gst/video/Makefile.am $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) +-- +2.7.4 + diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0003-riff-add-missing-include-directories-when-calling-in.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch index 9b66f7f4..9b66f7f4 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0003-riff-add-missing-include-directories-when-calling-in.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0003-riff-add-missing-include-directories-when-calling-in.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch index 4adf6054..4adf6054 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.12.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch new file mode 100644 index 00000000..23950b67 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.14.imx/make-gio_unix_2_0-dependency-configurable.patch @@ -0,0 +1,45 @@ +From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 +From: Andre McCurdy <armccurdy@gmail.com> +Date: Wed, 20 Jan 2016 13:00:00 -0800 +Subject: [PATCH] make gio_unix_2_0 dependency configurable + +Prior to 1.7.1, gst-plugins-base accepted a configure option to +disable gio_unix_2_0, however it was implemented incorrectly using +AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the +dependency unconditional. + + http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70 + +To make builds deterministic, re-instate support for +--disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE +instead of AG_GST_CHECK_FEATURE. + +Upstream-Status: Pending + +Signed-off-by: Andre McCurdy <armccurdy@gmail.com> + +--- + configure.ac | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 12807bc..35a0bf3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -806,9 +806,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], ++ [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])], ++ [], ++ [enable_gio_unix_2_0=yes]) ++ ++if test "x${enable_gio_unix_2_0}" != "xno"; then + PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24, + HAVE_GIO_UNIX_2_0="yes", + HAVE_GIO_UNIX_2_0="no") ++fi + AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") + + dnl *** finalize CFLAGS, LDFLAGS, LIBS diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb index 35b1a5f1..3ea3d571 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.12.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.imx.bb @@ -6,17 +6,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607" GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" -SRCBRANCH = "MM_04.03.05_1804_L4.9.88_MX7ULP_GA" +SRCBRANCH = "MM_04.04.00_1805_L4.9.88_MX8QXP_BETA2" SRC_URI = " \ ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ + file://make-gio_unix_2_0-dependency-configurable.patch \ file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \ file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ file://0003-riff-add-missing-include-directories-when-calling-in.patch \ file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ " -SRCREV = "7b637f65e7ce2b03c5adb7624501e74c575ac0f2" +SRCREV = "04bafd740a52757f12496206cfabe282835a1eb5" DEFAULT_PREFERENCE = "-1" @@ -27,6 +28,9 @@ S = "${WORKDIR}/git" # Enable pango lib PACKAGECONFIG_append = " pango " +# Disable introspection to fix [GstGL-1.0.gir] Error +EXTRA_OECONF_append = " --disable-introspection --disable-opengl --enable-wayland" + # ion allocator will be enabled only when detecting the ion.h exists, which is built out from kernel. # Now, ion allocator can be supported on all i.MX platform DEPENDS_append = " iso-codes util-linux virtual/kernel" @@ -68,4 +72,6 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs" } +FILES_${PN} += "${libdir}/gstreamer-1.0/include" + COMPATIBLE_MACHINE = "(mx6|mx7|mx8)" |