diff options
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0-plugins-base')
4 files changed, 409 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-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 new file mode 100644 index 000000000..4f1418667 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | |||
| @@ -0,0 +1,301 @@ | |||
| 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 | |||
| 9 | From: Yuqing Zhu <carol.zhu@nxp.com> | ||
| 10 | Date: Fri, 20 Apr 2018 02:03:57 +0800 | ||
| 11 | Subject: [PATCH] Makefile.am: prefix calls to pkg-config with | ||
| 12 | PKG_CONFIG_SYSROOT_DIR | ||
| 13 | |||
| 14 | Do patch refine base on commit: 990b653c7b6de1937ec759019982d6c5f15770f7 | ||
| 15 | |||
| 16 | Upstream-Status: Pending [review on oe-core maillist] | ||
| 17 | |||
| 18 | Signed-off-by: Yuqing Zhu <carol.zhu@nxp.com> | ||
| 19 | Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
| 20 | --- | ||
| 21 | gst-libs/gst/allocators/Makefile.am | 4 ++-- | ||
| 22 | gst-libs/gst/app/Makefile.am | 8 ++++---- | ||
| 23 | gst-libs/gst/audio/Makefile.am | 12 ++++++------ | ||
| 24 | gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ | ||
| 25 | gst-libs/gst/riff/Makefile.am | 8 ++++---- | ||
| 26 | gst-libs/gst/rtp/Makefile.am | 8 ++++---- | ||
| 27 | gst-libs/gst/rtsp/Makefile.am | 8 ++++---- | ||
| 28 | gst-libs/gst/sdp/Makefile.am | 4 ++-- | ||
| 29 | gst-libs/gst/tag/Makefile.am | 8 ++++---- | ||
| 30 | gst-libs/gst/video/Makefile.am | 8 ++++---- | ||
| 31 | 10 files changed, 40 insertions(+), 40 deletions(-) | ||
| 32 | |||
| 33 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am | ||
| 34 | index 3e5f2a692..ca66056d3 100644 | ||
| 35 | --- a/gst-libs/gst/allocators/Makefile.am | ||
| 36 | +++ b/gst-libs/gst/allocators/Makefile.am | ||
| 37 | @@ -55,7 +55,7 @@ GstAllocators-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstallocators-@ | ||
| 38 | --c-include "gst/allocators/allocators.h" \ | ||
| 39 | -I$(top_srcdir)/gst-libs \ | ||
| 40 | -I$(top_builddir)/gst-libs \ | ||
| 41 | - --add-include-path=`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@` \ | ||
| 43 | --library=libgstallocators-@GST_API_VERSION@.la \ | ||
| 44 | --include=Gst-@GST_API_VERSION@ \ | ||
| 45 | --libtool="${LIBTOOL}" \ | ||
| 46 | @@ -79,7 +79,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 47 | $(INTROSPECTION_COMPILER) \ | ||
| 48 | --includedir=$(srcdir) \ | ||
| 49 | --includedir=$(builddir) \ | ||
| 50 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 51 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 52 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 53 | |||
| 54 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 55 | diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am | ||
| 56 | index 11018b694..bd48a313c 100644 | ||
| 57 | --- a/gst-libs/gst/app/Makefile.am | ||
| 58 | +++ b/gst-libs/gst/app/Makefile.am | ||
| 59 | @@ -51,8 +51,8 @@ GstApp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstapp-@GST_API_VERSIO | ||
| 60 | --c-include "gst/app/app.h" \ | ||
| 61 | -I$(top_srcdir)/gst-libs \ | ||
| 62 | -I$(top_builddir)/gst-libs \ | ||
| 63 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 64 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 65 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 66 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 67 | --library=libgstapp-@GST_API_VERSION@.la \ | ||
| 68 | --include=Gst-@GST_API_VERSION@ \ | ||
| 69 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 70 | @@ -79,8 +79,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 71 | $(INTROSPECTION_COMPILER) \ | ||
| 72 | --includedir=$(srcdir) \ | ||
| 73 | --includedir=$(builddir) \ | ||
| 74 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 75 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 76 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 77 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 78 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 79 | |||
| 80 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 81 | diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am | ||
| 82 | index f2d46e8a8..482902746 100644 | ||
| 83 | --- a/gst-libs/gst/audio/Makefile.am | ||
| 84 | +++ b/gst-libs/gst/audio/Makefile.am | ||
| 85 | @@ -176,12 +176,12 @@ GstAudio-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstaudio-@GST_API_VE | ||
| 86 | -I$(top_srcdir)/gst-libs \ | ||
| 87 | -I$(top_builddir)/gst-libs \ | ||
| 88 | --c-include "gst/audio/audio.h" \ | ||
| 89 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 90 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 91 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 92 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 93 | --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
| 94 | --library=libgstaudio-@GST_API_VERSION@.la \ | ||
| 95 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
| 96 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 97 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
| 98 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 99 | --library-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
| 100 | --include=Gst-@GST_API_VERSION@ \ | ||
| 101 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 102 | @@ -210,8 +210,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 103 | --includedir=$(srcdir) \ | ||
| 104 | --includedir=$(builddir) \ | ||
| 105 | --includedir="$(top_builddir)/gst-libs/gst/tag/" \ | ||
| 106 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 107 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 108 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 109 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 110 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 111 | |||
| 112 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 113 | diff --git a/gst-libs/gst/pbutils/Makefile.am b/gst-libs/gst/pbutils/Makefile.am | ||
| 114 | index a771d5a8a..e926a5ef8 100644 | ||
| 115 | --- a/gst-libs/gst/pbutils/Makefile.am | ||
| 116 | +++ b/gst-libs/gst/pbutils/Makefile.am | ||
| 117 | @@ -88,14 +88,14 @@ GstPbutils-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstpbutils-@GST_AP | ||
| 118 | --c-include "gst/pbutils/pbutils.h" \ | ||
| 119 | -I$(top_srcdir)/gst-libs \ | ||
| 120 | -I$(top_builddir)/gst-libs \ | ||
| 121 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 122 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 123 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 124 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 125 | --add-include-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
| 126 | --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ | ||
| 127 | --add-include-path="$(top_builddir)/gst-libs/gst/audio/" \ | ||
| 128 | --library=libgstpbutils-@GST_API_VERSION@.la \ | ||
| 129 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
| 130 | - --library-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 131 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-@GST_API_VERSION@` \ | ||
| 132 | + --library-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=libdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 133 | --library-path="$(top_builddir)/gst-libs/gst/tag/" \ | ||
| 134 | --library-path="$(top_builddir)/gst-libs/gst/video/" \ | ||
| 135 | --library-path="$(top_builddir)/gst-libs/gst/audio/" \ | ||
| 136 | @@ -128,8 +128,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 137 | $(INTROSPECTION_COMPILER) \ | ||
| 138 | --includedir=$(srcdir) \ | ||
| 139 | --includedir=$(builddir) \ | ||
| 140 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 141 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 142 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 143 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 144 | --includedir="$(top_builddir)/gst-libs/gst/tag/" \ | ||
| 145 | --includedir="$(top_builddir)/gst-libs/gst/video/" \ | ||
| 146 | --includedir="$(top_builddir)/gst-libs/gst/audio/" \ | ||
| 147 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | ||
| 148 | index 8f32b48d6..ecec07d1a 100644 | ||
| 149 | --- a/gst-libs/gst/riff/Makefile.am | ||
| 150 | +++ b/gst-libs/gst/riff/Makefile.am | ||
| 151 | @@ -43,8 +43,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
| 152 | # --c-include "gst/riff/riff.h" \ | ||
| 153 | # --add-include-path=$(builddir)/../tag \ | ||
| 154 | # --add-include-path=$(builddir)/../audio \ | ||
| 155 | -# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 156 | -# --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 157 | +# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 158 | +# --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 159 | # --library=libgstriff-@GST_API_VERSION@.la \ | ||
| 160 | # --include=GstAudio-@GST_API_VERSION@ \ | ||
| 161 | # --include=GstTag-@GST_API_VERSION@ \ | ||
| 162 | @@ -75,8 +75,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
| 163 | # --includedir=$(builddir) \ | ||
| 164 | # --includedir=$(builddir)/../tag \ | ||
| 165 | # --includedir=$(builddir)/../audio \ | ||
| 166 | -# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 167 | -# --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 168 | +# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 169 | +# --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 170 | # $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 171 | # | ||
| 172 | #CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 173 | diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am | ||
| 174 | index f6b996324..25122188f 100644 | ||
| 175 | --- a/gst-libs/gst/rtp/Makefile.am | ||
| 176 | +++ b/gst-libs/gst/rtp/Makefile.am | ||
| 177 | @@ -66,8 +66,8 @@ GstRtp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtp-@GST_API_VERSIO | ||
| 178 | --c-include "gst/rtp/rtp.h" \ | ||
| 179 | -I$(top_builddir)/gst-libs \ | ||
| 180 | -I$(top_srcdir)/gst-libs \ | ||
| 181 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 182 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 183 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 184 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 185 | --library=libgstrtp-@GST_API_VERSION@.la \ | ||
| 186 | --include=Gst-@GST_API_VERSION@ \ | ||
| 187 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 188 | @@ -94,8 +94,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 189 | $(INTROSPECTION_COMPILER) \ | ||
| 190 | --includedir=$(srcdir) \ | ||
| 191 | --includedir=$(builddir) \ | ||
| 192 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 193 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 194 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 195 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 196 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 197 | |||
| 198 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 199 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | ||
| 200 | index 02aaf4f9a..13ac1b395 100644 | ||
| 201 | --- a/gst-libs/gst/rtsp/Makefile.am | ||
| 202 | +++ b/gst-libs/gst/rtsp/Makefile.am | ||
| 203 | @@ -71,8 +71,8 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | ||
| 204 | -I$(top_builddir)/gst-libs \ | ||
| 205 | -I$(top_srcdir)/gst-libs \ | ||
| 206 | --add-include-path=$(builddir)/../sdp \ | ||
| 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@` \ | ||
| 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@` \ | ||
| 211 | --library=libgstrtsp-@GST_API_VERSION@.la \ | ||
| 212 | --include=Gio-2.0 \ | ||
| 213 | --include=Gst-@GST_API_VERSION@ \ | ||
| 214 | @@ -104,8 +104,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 215 | --includedir=$(srcdir) \ | ||
| 216 | --includedir=$(builddir) \ | ||
| 217 | --includedir=$(builddir)/../sdp \ | ||
| 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@` \ | ||
| 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@` \ | ||
| 222 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 223 | |||
| 224 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 225 | diff --git a/gst-libs/gst/sdp/Makefile.am b/gst-libs/gst/sdp/Makefile.am | ||
| 226 | index cf8c001ad..61b8d83db 100644 | ||
| 227 | --- a/gst-libs/gst/sdp/Makefile.am | ||
| 228 | +++ b/gst-libs/gst/sdp/Makefile.am | ||
| 229 | @@ -31,7 +31,7 @@ GstSdp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstsdp-@GST_API_VERSIO | ||
| 230 | --warn-all \ | ||
| 231 | --c-include "gst/sdp/sdp.h" \ | ||
| 232 | -I$(top_srcdir)/gst-libs \ | ||
| 233 | - --add-include-path=`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@` \ | ||
| 235 | --library=libgstsdp-@GST_API_VERSION@.la \ | ||
| 236 | --include=Gst-@GST_API_VERSION@ \ | ||
| 237 | --libtool="${LIBTOOL}" \ | ||
| 238 | @@ -55,7 +55,7 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 239 | $(INTROSPECTION_COMPILER) \ | ||
| 240 | --includedir=$(srcdir) \ | ||
| 241 | --includedir=$(builddir) \ | ||
| 242 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 243 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 244 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 245 | |||
| 246 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 247 | diff --git a/gst-libs/gst/tag/Makefile.am b/gst-libs/gst/tag/Makefile.am | ||
| 248 | index 83bda29eb..6c3accbe0 100644 | ||
| 249 | --- a/gst-libs/gst/tag/Makefile.am | ||
| 250 | +++ b/gst-libs/gst/tag/Makefile.am | ||
| 251 | @@ -61,8 +61,8 @@ GstTag-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgsttag-@GST_API_VERSIO | ||
| 252 | --c-include "gst/tag/tag.h" \ | ||
| 253 | -I$(top_srcdir)/gst-libs \ | ||
| 254 | -I$(top_builddir)/gst-libs \ | ||
| 255 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 256 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 257 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 258 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 259 | --library=libgsttag-@GST_API_VERSION@.la \ | ||
| 260 | --include=Gst-@GST_API_VERSION@ \ | ||
| 261 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 262 | @@ -89,8 +89,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 263 | $(INTROSPECTION_COMPILER) \ | ||
| 264 | --includedir=$(srcdir) \ | ||
| 265 | --includedir=$(builddir) \ | ||
| 266 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 267 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 268 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 269 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 270 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 271 | |||
| 272 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 273 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | ||
| 274 | index 22c3f96f9..97342ef3c 100644 | ||
| 275 | --- a/gst-libs/gst/video/Makefile.am | ||
| 276 | +++ b/gst-libs/gst/video/Makefile.am | ||
| 277 | @@ -126,8 +126,8 @@ GstVideo-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstvideo-@GST_API_VE | ||
| 278 | --c-include "gst/video/video.h" \ | ||
| 279 | -I$(top_srcdir)/gst-libs \ | ||
| 280 | -I$(top_builddir)/gst-libs \ | ||
| 281 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 282 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 283 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 284 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 285 | --library=libgstvideo-@GST_API_VERSION@.la \ | ||
| 286 | --include=Gst-@GST_API_VERSION@ \ | ||
| 287 | --include=GstBase-@GST_API_VERSION@ \ | ||
| 288 | @@ -154,8 +154,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | ||
| 289 | $(INTROSPECTION_COMPILER) \ | ||
| 290 | --includedir=$(srcdir) \ | ||
| 291 | --includedir=$(builddir) \ | ||
| 292 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 293 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 294 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 295 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | ||
| 296 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | ||
| 297 | |||
| 298 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | ||
| 299 | -- | ||
| 300 | 2.17.1 | ||
| 301 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-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 new file mode 100644 index 000000000..b3e4326b0 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 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 | |||
| 9 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 10 | Date: Mon, 26 Oct 2015 17:30:14 +0200 | ||
| 11 | Subject: [PATCH 4/4] rtsp: drop incorrect reference to gstreamer-sdp in | ||
| 12 | Makefile.am | ||
| 13 | |||
| 14 | Upstream-Status: Pending [review on oe-core maillist] | ||
| 15 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 16 | Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | ||
| 17 | --- | ||
| 18 | gst-libs/gst/rtsp/Makefile.am | 1 - | ||
| 19 | 1 file changed, 1 deletion(-) | ||
| 20 | |||
| 21 | diff --git a/gst-libs/gst/rtsp/Makefile.am b/gst-libs/gst/rtsp/Makefile.am | ||
| 22 | index 13ac1b395..8b03125c7 100644 | ||
| 23 | --- a/gst-libs/gst/rtsp/Makefile.am | ||
| 24 | +++ b/gst-libs/gst/rtsp/Makefile.am | ||
| 25 | @@ -82,7 +82,6 @@ GstRtsp-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstrtsp-@GST_API_VERS | ||
| 26 | --pkg gio-2.0 \ | ||
| 27 | --pkg gstreamer-@GST_API_VERSION@ \ | ||
| 28 | --pkg gstreamer-base-@GST_API_VERSION@ \ | ||
| 29 | - --pkg gstreamer-sdp-@GST_API_VERSION@ \ | ||
| 30 | --pkg-export gstreamer-rtsp-@GST_API_VERSION@ \ | ||
| 31 | --add-init-section="$(INTROSPECTION_INIT)" \ | ||
| 32 | --output $@ \ | ||
| 33 | -- | ||
| 34 | 2.17.1 | ||
| 35 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/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 new file mode 100644 index 000000000..9b66f7f49 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0003-riff-add-missing-include-directories-when-calling-in.patch | |||
| @@ -0,0 +1,28 @@ | |||
| 1 | From 3c2c2d5dd08aa30ed0e8acd8566ec99412bb8209 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Mon, 26 Oct 2015 17:29:37 +0200 | ||
| 4 | Subject: [PATCH 3/4] riff: add missing include directories when calling | ||
| 5 | introspection scanner | ||
| 6 | |||
| 7 | Upstream-Status: Pending [review on oe-core maillist] | ||
| 8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 9 | --- | ||
| 10 | gst-libs/gst/riff/Makefile.am | 2 ++ | ||
| 11 | 1 file changed, 2 insertions(+) | ||
| 12 | |||
| 13 | diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am | ||
| 14 | index 0a115cc..5057a58 100644 | ||
| 15 | --- a/gst-libs/gst/riff/Makefile.am | ||
| 16 | +++ b/gst-libs/gst/riff/Makefile.am | ||
| 17 | @@ -39,6 +39,8 @@ libgstriff_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) | ||
| 18 | # --strip-prefix=Gst \ | ||
| 19 | # --warn-all \ | ||
| 20 | # --c-include "gst/riff/riff.h" \ | ||
| 21 | +# -I$(top_srcdir)/gst-libs \ | ||
| 22 | +# -I$(top_builddir)/gst-libs \ | ||
| 23 | # --add-include-path=$(builddir)/../tag \ | ||
| 24 | # --add-include-path=$(builddir)/../audio \ | ||
| 25 | # --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | ||
| 26 | -- | ||
| 27 | 2.6.2 | ||
| 28 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch new file mode 100644 index 000000000..23950b67f --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/make-gio_unix_2_0-dependency-configurable.patch | |||
| @@ -0,0 +1,45 @@ | |||
| 1 | From 7ffa6e3d00e1d8a060f3f4c2bb9a72691af05d79 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Andre McCurdy <armccurdy@gmail.com> | ||
| 3 | Date: Wed, 20 Jan 2016 13:00:00 -0800 | ||
| 4 | Subject: [PATCH] make gio_unix_2_0 dependency configurable | ||
| 5 | |||
| 6 | Prior to 1.7.1, gst-plugins-base accepted a configure option to | ||
| 7 | disable gio_unix_2_0, however it was implemented incorrectly using | ||
| 8 | AG_GST_CHECK_FEATURE. That was fixed in 1.7.1 by making the | ||
| 9 | dependency unconditional. | ||
| 10 | |||
| 11 | http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=aadefefba88afe4acbe64454650f24e7ce7c8d70 | ||
| 12 | |||
| 13 | To make builds deterministic, re-instate support for | ||
| 14 | --disable-gio_unix_2_0, but implement it using the AC_ARG_ENABLE | ||
| 15 | instead of AG_GST_CHECK_FEATURE. | ||
| 16 | |||
| 17 | Upstream-Status: Pending | ||
| 18 | |||
| 19 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | ||
| 20 | |||
| 21 | --- | ||
| 22 | configure.ac | 7 +++++++ | ||
| 23 | 1 file changed, 7 insertions(+) | ||
| 24 | |||
| 25 | diff --git a/configure.ac b/configure.ac | ||
| 26 | index 12807bc..35a0bf3 100644 | ||
| 27 | --- a/configure.ac | ||
| 28 | +++ b/configure.ac | ||
| 29 | @@ -806,9 +806,16 @@ AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes") | ||
| 30 | AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes") | ||
| 31 | |||
| 32 | dnl *** gio-unix-2.0 for tests/check/pipelines/tcp.c *** | ||
| 33 | +AC_ARG_ENABLE([gio_unix_2_0], | ||
| 34 | + [AS_HELP_STRING([--disable-gio_unix_2_0],[disable use of gio_unix_2_0])], | ||
| 35 | + [], | ||
| 36 | + [enable_gio_unix_2_0=yes]) | ||
| 37 | + | ||
| 38 | +if test "x${enable_gio_unix_2_0}" != "xno"; then | ||
| 39 | PKG_CHECK_MODULES(GIO_UNIX_2_0, gio-unix-2.0 >= 2.24, | ||
| 40 | HAVE_GIO_UNIX_2_0="yes", | ||
| 41 | HAVE_GIO_UNIX_2_0="no") | ||
| 42 | +fi | ||
| 43 | AM_CONDITIONAL(USE_GIO_UNIX_2_0, test "x$HAVE_GIO_UNIX_2_0" = "xyes") | ||
| 44 | |||
| 45 | dnl *** finalize CFLAGS, LDFLAGS, LIBS | ||
