diff options
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch) | 64 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch) | 18 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0003-riff-add-missing-include-directories-when-calling-in.patch) | 0 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch (renamed from recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/make-gio_unix_2_0-dependency-configurable.patch) | 0 | ||||
| -rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb | 10 |
5 files changed, 53 insertions, 39 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch index 4b6cfdd69..4f1418667 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | |||
| @@ -1,4 +1,11 @@ | |||
| 1 | From e3f28d15e38f7633d8ed4023fe883b8377c0597e Mon Sep 17 00:00:00 2001 | 1 | From ae10bb875c88321a719a3dbcc94c78eb75b4b97f Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
| 3 | Date: Sun, 22 Dec 2019 14:34:16 +0000 | ||
| 4 | Subject: [PATCH 1/2] Makefile.am: prefix calls to pkg-config with | ||
| 5 | PKG_CONFIG_SYSROOT_DIR | ||
| 6 | |||
| 7 | Rebase following patch to match version 1.16.0 of gstreamer | ||
| 8 | |||
| 2 | From: Yuqing Zhu <carol.zhu@nxp.com> | 9 | From: Yuqing Zhu <carol.zhu@nxp.com> |
| 3 | Date: Fri, 20 Apr 2018 02:03:57 +0800 | 10 | Date: Fri, 20 Apr 2018 02:03:57 +0800 |
| 4 | Subject: [PATCH] Makefile.am: prefix calls to pkg-config with | 11 | Subject: [PATCH] Makefile.am: prefix calls to pkg-config with |
| @@ -9,6 +16,7 @@ Do patch refine base on commit: 990b653c7b6de1937ec759019982d6c5f15770f7 | |||
| 9 | Upstream-Status: Pending [review on oe-core maillist] | 16 | Upstream-Status: Pending [review on oe-core maillist] |
| 10 | 17 | ||
| 11 | Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> | 18 | Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> |
| 19 | Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
| 12 | --- | 20 | --- |
| 13 | gst-libs/gst/allocators/Makefile.am | 4 ++-- | 21 | gst-libs/gst/allocators/Makefile.am | 4 ++-- |
| 14 | gst-libs/gst/app/Makefile.am | 8 ++++---- | 22 | gst-libs/gst/app/Makefile.am | 8 ++++---- |
| @@ -16,17 +24,17 @@ Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> | |||
| 16 | gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ | 24 | gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ |
| 17 | gst-libs/gst/riff/Makefile.am | 8 ++++---- | 25 | gst-libs/gst/riff/Makefile.am | 8 ++++---- |
| 18 | gst-libs/gst/rtp/Makefile.am | 8 ++++---- | 26 | gst-libs/gst/rtp/Makefile.am | 8 ++++---- |
| 19 | gst-libs/gst/rtsp/Makefile.am | 4 ++-- | 27 | gst-libs/gst/rtsp/Makefile.am | 8 ++++---- |
| 20 | gst-libs/gst/sdp/Makefile.am | 4 ++-- | 28 | gst-libs/gst/sdp/Makefile.am | 4 ++-- |
| 21 | gst-libs/gst/tag/Makefile.am | 8 ++++---- | 29 | gst-libs/gst/tag/Makefile.am | 8 ++++---- |
| 22 | gst-libs/gst/video/Makefile.am | 8 ++++---- | 30 | gst-libs/gst/video/Makefile.am | 8 ++++---- |
| 23 | 10 files changed, 38 insertions(+), 38 deletions(-) | 31 | 10 files changed, 40 insertions(+), 40 deletions(-) |
| 24 | 32 | ||
| 25 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am | 33 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am |
| 26 | index c4412a1..9f9d14d 100644 | 34 | index 3e5f2a692..ca66056d3 100644 |
| 27 | --- a/gst-libs/gst/allocators/Makefile.am | 35 | --- a/gst-libs/gst/allocators/Makefile.am |
| 28 | +++ b/gst-libs/gst/allocators/Makefile.am | 36 | +++ b/gst-libs/gst/allocators/Makefile.am |
| 29 | @@ -59,7 +59,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | 37 | @@ -55,7 +55,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ |
| 30 | --c-include "gst/allocators/allocators.h" \ | 38 | --c-include "gst/allocators/allocators.h" \ |
| 31 | -I$(top_srcdir)/gst-libs \ | 39 | -I$(top_srcdir)/gst-libs \ |
| 32 | -I$(top_builddir)/gst-libs \ | 40 | -I$(top_builddir)/gst-libs \ |
| @@ -34,8 +42,8 @@ index c4412a1..9f9d14d 100644 | |||
| 34 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 42 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 35 | --library=libgstallocators-@GST_API_VERSION@.la \ | 43 | --library=libgstallocators-@GST_API_VERSION@.la \ |
| 36 | --include=Gst-@GST_API_VERSION@ \ | 44 | --include=Gst-@GST_API_VERSION@ \ |
| 37 | --libtool="$(LIBTOOL)" \ | 45 | --libtool="${LIBTOOL}" \ |
| 38 | @@ -83,7 +83,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 46 | @@ -79,7 +79,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
| 39 | $(INTROSPECTION_COMPILER) \ | 47 | $(INTROSPECTION_COMPILER) \ |
| 40 | --includedir=$(srcdir) \ | 48 | --includedir=$(srcdir) \ |
| 41 | --includedir=$(builddir) \ | 49 | --includedir=$(builddir) \ |
| @@ -45,7 +53,7 @@ index c4412a1..9f9d14d 100644 | |||
| 45 | 53 | ||
| 46 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | 54 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 47 | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am | 55 | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am |
| 48 | index 5bfd606..c231267 100644 | 56 | index 11018b694..bd48a313c 100644 |
| 49 | --- a/gst-libs/gst/app/Makefile.am | 57 | --- a/gst-libs/gst/app/Makefile.am |
| 50 | +++ b/gst-libs/gst/app/Makefile.am | 58 | +++ b/gst-libs/gst/app/Makefile.am |
| 51 | @@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO | 59 | @@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO |
| @@ -71,10 +79,10 @@ index 5bfd606..c231267 100644 | |||
| 71 | 79 | ||
| 72 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | 80 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 73 | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am | 81 | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am |
| 74 | index 7fb65f2..5379f79 100644 | 82 | index f2d46e8a8..482902746 100644 |
| 75 | --- a/gst-libs/gst/audio/Makefile.am | 83 | --- a/gst-libs/gst/audio/Makefile.am |
| 76 | +++ b/gst-libs/gst/audio/Makefile.am | 84 | +++ b/gst-libs/gst/audio/Makefile.am |
| 77 | @@ -174,12 +174,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE | 85 | @@ -176,12 +176,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE |
| 78 | -I$(top_srcdir)/gst-libs \ | 86 | -I$(top_srcdir)/gst-libs \ |
| 79 | -I$(top_builddir)/gst-libs \ | 87 | -I$(top_builddir)/gst-libs \ |
| 80 | --c-include "gst/audio/audio.h" \ | 88 | --c-include "gst/audio/audio.h" \ |
| @@ -91,7 +99,7 @@ index 7fb65f2..5379f79 100644 | |||
| 91 | --library-path="$(top_builddir)/gst-libs/gst/tag/" \ | 99 | --library-path="$(top_builddir)/gst-libs/gst/tag/" \ |
| 92 | --include=Gst-@GST_API_VERSION@ \ | 100 | --include=Gst-@GST_API_VERSION@ \ |
| 93 | --include=GstBase-@GST_API_VERSION@ \ | 101 | --include=GstBase-@GST_API_VERSION@ \ |
| 94 | @@ -208,8 +208,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 102 | @@ -210,8 +210,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
| 95 | --includedir=$(srcdir) \ | 103 | --includedir=$(srcdir) \ |
| 96 | --includedir=$(builddir) \ | 104 | --includedir=$(builddir) \ |
| 97 | --includedir="$(top_builddir)/gst-libs/gst/tag/" \ | 105 | --includedir="$(top_builddir)/gst-libs/gst/tag/" \ |
| @@ -103,7 +111,7 @@ index 7fb65f2..5379f79 100644 | |||
| 103 | 111 | ||
| 104 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | 112 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 105 | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am | 113 | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am |
| 106 | index 35a6e44..49d6894 100644 | 114 | index a771d5a8a..e926a5ef8 100644 |
| 107 | --- a/gst-libs/gst/pbutils/Makefile.am | 115 | --- a/gst-libs/gst/pbutils/Makefile.am |
| 108 | +++ b/gst-libs/gst/pbutils/Makefile.am | 116 | +++ b/gst-libs/gst/pbutils/Makefile.am |
| 109 | @@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP | 117 | @@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP |
| @@ -137,7 +145,7 @@ index 35a6e44..49d6894 100644 | |||
| 137 | --includedir="$(top_builddir)/gst-libs/gst/video/" \ | 145 | --includedir="$(top_builddir)/gst-libs/gst/video/" \ |
| 138 | --includedir="$(top_builddir)/gst-libs/gst/audio/" \ | 146 | --includedir="$(top_builddir)/gst-libs/gst/audio/" \ |
| 139 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | 147 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am |
| 140 | index e66ef4f..c8c588a 100644 | 148 | index 8f32b48d6..ecec07d1a 100644 |
| 141 | --- a/gst-libs/gst/riff/Makefile.am | 149 | --- a/gst-libs/gst/riff/Makefile.am |
| 142 | +++ b/gst-libs/gst/riff/Makefile.am | 150 | +++ b/gst-libs/gst/riff/Makefile.am |
| 143 | @@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | 151 | @@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) |
| @@ -163,10 +171,10 @@ index e66ef4f..c8c588a 100644 | |||
| 163 | # | 171 | # |
| 164 | #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | 172 | #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 165 | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | 173 | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am |
| 166 | index 77ebeeb..9aee788 100644 | 174 | index f6b996324..25122188f 100644 |
| 167 | --- a/gst-libs/gst/rtp/Makefile.am | 175 | --- a/gst-libs/gst/rtp/Makefile.am |
| 168 | +++ b/gst-libs/gst/rtp/Makefile.am | 176 | +++ b/gst-libs/gst/rtp/Makefile.am |
| 169 | @@ -64,8 +64,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | 177 | @@ -66,8 +66,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO |
| 170 | --c-include "gst/rtp/rtp.h" \ | 178 | --c-include "gst/rtp/rtp.h" \ |
| 171 | -I$(top_builddir)/gst-libs \ | 179 | -I$(top_builddir)/gst-libs \ |
| 172 | -I$(top_srcdir)/gst-libs \ | 180 | -I$(top_srcdir)/gst-libs \ |
| @@ -177,7 +185,7 @@ index 77ebeeb..9aee788 100644 | |||
| 177 | --library=libgstrtp-@GST_API_VERSION@.la \ | 185 | --library=libgstrtp-@GST_API_VERSION@.la \ |
| 178 | --include=Gst-@GST_API_VERSION@ \ | 186 | --include=Gst-@GST_API_VERSION@ \ |
| 179 | --include=GstBase-@GST_API_VERSION@ \ | 187 | --include=GstBase-@GST_API_VERSION@ \ |
| 180 | @@ -92,8 +92,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 188 | @@ -94,8 +94,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
| 181 | $(INTROSPECTION_COMPILER) \ | 189 | $(INTROSPECTION_COMPILER) \ |
| 182 | --includedir=$(srcdir) \ | 190 | --includedir=$(srcdir) \ |
| 183 | --includedir=$(builddir) \ | 191 | --includedir=$(builddir) \ |
| @@ -189,29 +197,33 @@ index 77ebeeb..9aee788 100644 | |||
| 189 | 197 | ||
| 190 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | 198 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 191 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | 199 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am |
| 192 | index db9d0fd..79027cb 100644 | 200 | index 02aaf4f9a..13ac1b395 100644 |
| 193 | --- a/gst-libs/gst/rtsp/Makefile.am | 201 | --- a/gst-libs/gst/rtsp/Makefile.am |
| 194 | +++ b/gst-libs/gst/rtsp/Makefile.am | 202 | +++ b/gst-libs/gst/rtsp/Makefile.am |
| 195 | @@ -71,7 +71,7 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | 203 | @@ -71,8 +71,8 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS |
| 196 | -I$(top_builddir)/gst-libs \ | 204 | -I$(top_builddir)/gst-libs \ |
| 197 | -I$(top_srcdir)/gst-libs \ | 205 | -I$(top_srcdir)/gst-libs \ |
| 198 | --add-include-path=$(builddir)/../sdp \ | 206 | --add-include-path=$(builddir)/../sdp \ |
| 199 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 207 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 208 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 200 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 209 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 210 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 201 | --library=libgstrtsp-@GST_API_VERSION@.la \ | 211 | --library=libgstrtsp-@GST_API_VERSION@.la \ |
| 202 | --include=Gio-2.0 \ | 212 | --include=Gio-2.0 \ |
| 203 | --include=Gst-@GST_API_VERSION@ \ | 213 | --include=Gst-@GST_API_VERSION@ \ |
| 204 | @@ -101,7 +101,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 214 | @@ -104,8 +104,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
| 205 | --includedir=$(srcdir) \ | 215 | --includedir=$(srcdir) \ |
| 206 | --includedir=$(builddir) \ | 216 | --includedir=$(builddir) \ |
| 207 | --includedir=$(builddir)/../sdp \ | 217 | --includedir=$(builddir)/../sdp \ |
| 208 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 218 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 219 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 209 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 220 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 221 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 210 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | 222 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
| 211 | 223 | ||
| 212 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | 224 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 213 | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | 225 | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am |
| 214 | index 6e05cc7..c7cf514 100644 | 226 | index cf8c001ad..61b8d83db 100644 |
| 215 | --- a/gst-libs/gst/sdp/Makefile.am | 227 | --- a/gst-libs/gst/sdp/Makefile.am |
| 216 | +++ b/gst-libs/gst/sdp/Makefile.am | 228 | +++ b/gst-libs/gst/sdp/Makefile.am |
| 217 | @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | 229 | @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO |
| @@ -222,7 +234,7 @@ index 6e05cc7..c7cf514 100644 | |||
| 222 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 234 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 223 | --library=libgstsdp-@GST_API_VERSION@.la \ | 235 | --library=libgstsdp-@GST_API_VERSION@.la \ |
| 224 | --include=Gst-@GST_API_VERSION@ \ | 236 | --include=Gst-@GST_API_VERSION@ \ |
| 225 | --libtool="$(LIBTOOL)" \ | 237 | --libtool="${LIBTOOL}" \ |
| 226 | @@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 238 | @@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
| 227 | $(INTROSPECTION_COMPILER) \ | 239 | $(INTROSPECTION_COMPILER) \ |
| 228 | --includedir=$(srcdir) \ | 240 | --includedir=$(srcdir) \ |
| @@ -233,7 +245,7 @@ index 6e05cc7..c7cf514 100644 | |||
| 233 | 245 | ||
| 234 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | 246 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 235 | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | 247 | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am |
| 236 | index c86515b..363e6d2 100644 | 248 | index 83bda29eb..6c3accbe0 100644 |
| 237 | --- a/gst-libs/gst/tag/Makefile.am | 249 | --- a/gst-libs/gst/tag/Makefile.am |
| 238 | +++ b/gst-libs/gst/tag/Makefile.am | 250 | +++ b/gst-libs/gst/tag/Makefile.am |
| 239 | @@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | 251 | @@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO |
| @@ -259,10 +271,10 @@ index c86515b..363e6d2 100644 | |||
| 259 | 271 | ||
| 260 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | 272 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 261 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | 273 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am |
| 262 | index 0f7c07e..d642267 100644 | 274 | index 22c3f96f9..97342ef3c 100644 |
| 263 | --- a/gst-libs/gst/video/Makefile.am | 275 | --- a/gst-libs/gst/video/Makefile.am |
| 264 | +++ b/gst-libs/gst/video/Makefile.am | 276 | +++ b/gst-libs/gst/video/Makefile.am |
| 265 | @@ -121,8 +121,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | 277 | @@ -126,8 +126,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE |
| 266 | --c-include "gst/video/video.h" \ | 278 | --c-include "gst/video/video.h" \ |
| 267 | -I$(top_srcdir)/gst-libs \ | 279 | -I$(top_srcdir)/gst-libs \ |
| 268 | -I$(top_builddir)/gst-libs \ | 280 | -I$(top_builddir)/gst-libs \ |
| @@ -273,7 +285,7 @@ index 0f7c07e..d642267 100644 | |||
| 273 | --library=libgstvideo-@GST_API_VERSION@.la \ | 285 | --library=libgstvideo-@GST_API_VERSION@.la \ |
| 274 | --include=Gst-@GST_API_VERSION@ \ | 286 | --include=Gst-@GST_API_VERSION@ \ |
| 275 | --include=GstBase-@GST_API_VERSION@ \ | 287 | --include=GstBase-@GST_API_VERSION@ \ |
| 276 | @@ -149,8 +149,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 288 | @@ -154,8 +154,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
| 277 | $(INTROSPECTION_COMPILER) \ | 289 | $(INTROSPECTION_COMPILER) \ |
| 278 | --includedir=$(srcdir) \ | 290 | --includedir=$(srcdir) \ |
| 279 | --includedir=$(builddir) \ | 291 | --includedir=$(builddir) \ |
| @@ -285,5 +297,5 @@ index 0f7c07e..d642267 100644 | |||
| 285 | 297 | ||
| 286 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | 298 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 287 | -- | 299 | -- |
| 288 | 2.7.4 | 300 | 2.17.1 |
| 289 | 301 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch index 4adf60546..b3e4326b0 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch | |||
| @@ -1,4 +1,11 @@ | |||
| 1 | From 4330915d88dc4dd46eb4c28d756482b767c2747f Mon Sep 17 00:00:00 2001 | 1 | From 836769c4a26231f36a48aeadb9e332bd7224c785 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
| 3 | Date: Sun, 22 Dec 2019 14:49:57 +0000 | ||
| 4 | Subject: [PATCH 2/2] rtsp: drop incorrect reference to gstreamer-sdp in | ||
| 5 | Makefile.am | ||
| 6 | |||
| 7 | Rebase following patch from upstream to match NXP version 1.16: | ||
| 8 | |||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 26 Oct 2015 17:30:14 +0200 | 10 | Date: Mon, 26 Oct 2015 17:30:14 +0200 |
| 4 | Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in | 11 | Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in |
| @@ -6,22 +13,23 @@ Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in | |||
| 6 | 13 | ||
| 7 | Upstream-Status: Pending [review on oe-core maillist] | 14 | Upstream-Status: Pending [review on oe-core maillist] |
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 15 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 16 | Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
| 9 | --- | 17 | --- |
| 10 | gst-libs/gst/rtsp/Makefile.am | 1 - | 18 | gst-libs/gst/rtsp/Makefile.am | 1 - |
| 11 | 1 file changed, 1 deletion(-) | 19 | 1 file changed, 1 deletion(-) |
| 12 | 20 | ||
| 13 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | 21 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am |
| 14 | index 4f6d9f8..0afa370 100644 | 22 | index 13ac1b395..8b03125c7 100644 |
| 15 | --- a/gst-libs/gst/rtsp/Makefile.am | 23 | --- a/gst-libs/gst/rtsp/Makefile.am |
| 16 | +++ b/gst-libs/gst/rtsp/Makefile.am | 24 | +++ b/gst-libs/gst/rtsp/Makefile.am |
| 17 | @@ -75,7 +75,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | 25 | @@ -82,7 +82,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS |
| 18 | --libtool="$(LIBTOOL)" \ | ||
| 19 | --pkg gio-2.0 \ | 26 | --pkg gio-2.0 \ |
| 20 | --pkg gstreamer-@GST_API_VERSION@ \ | 27 | --pkg gstreamer-@GST_API_VERSION@ \ |
| 28 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
| 21 | - --pkg gstreamer-sdp-@GST_API_VERSION@ \ | 29 | - --pkg gstreamer-sdp-@GST_API_VERSION@ \ |
| 22 | --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ | 30 | --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ |
| 23 | --add-init-section="$(INTROSPECTION_INIT)" \ | 31 | --add-init-section="$(INTROSPECTION_INIT)" \ |
| 24 | --output $@ \ | 32 | --output $@ \ |
| 25 | -- | 33 | -- |
| 26 | 2.6.2 | 34 | 2.17.1 |
| 27 | 35 | ||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0003-riff-add-missing-include-directories-when-calling-in.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch index 9b66f7f49..9b66f7f49 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/0003-riff-add-missing-include-directories-when-calling-in.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/make-gio_unix_2_0-dependency-configurable.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch index 23950b67f..23950b67f 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base-1.16.imx/make-gio_unix_2_0-dependency-configurable.patch +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb index 416982cc2..ee7a9baf4 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb | |||
| @@ -7,12 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d \ | |||
| 7 | DEPENDS += "iso-codes util-linux" | 7 | DEPENDS += "iso-codes util-linux" |
| 8 | DEPENDS_append_imxgpu2d = " virtual/libg2d" | 8 | DEPENDS_append_imxgpu2d = " virtual/libg2d" |
| 9 | 9 | ||
| 10 | PV = "1.16.0.imx" | ||
| 11 | |||
| 12 | FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/files:" | ||
| 13 | FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/poky/meta/recipes-multimedia/gstreamer/${PN}:" | ||
| 14 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
| 15 | |||
| 16 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" | 10 | GST1.0-PLUGINS-BASE_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-base.git;protocol=https" |
| 17 | SRCBRANCH = "MM_04.05.01_1909_L4.19.35" | 11 | SRCBRANCH = "MM_04.05.01_1909_L4.19.35" |
| 18 | SRCREV = "df30480711d68a1c1d2152bf4d6a7b245a85f967" | 12 | SRCREV = "df30480711d68a1c1d2152bf4d6a7b245a85f967" |
| @@ -20,9 +14,9 @@ SRC_URI = " \ | |||
| 20 | ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ | 14 | ${GST1.0-PLUGINS-BASE_SRC};branch=${SRCBRANCH} \ |
| 21 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ | 15 | file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \ |
| 22 | file://make-gio_unix_2_0-dependency-configurable.patch \ | 16 | file://make-gio_unix_2_0-dependency-configurable.patch \ |
| 23 | file://0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ | 17 | file://0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch \ |
| 24 | file://0003-riff-add-missing-include-directories-when-calling-in.patch \ | 18 | file://0003-riff-add-missing-include-directories-when-calling-in.patch \ |
| 25 | file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ | 19 | file://0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \ |
| 26 | " | 20 | " |
| 27 | 21 | ||
| 28 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
