diff options
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch')
| -rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch | 21 |
1 files changed, 9 insertions, 12 deletions
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 377c89a11d..2e1190ba01 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 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From 77b88eae845060d38cf788651f66a7ae98f9b199 Mon Sep 17 00:00:00 2001 | 1 | From 9601fc0cd6751a1affdc8717217b95931db31d7f Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Thu, 5 Apr 2018 10:26:25 +0800 | 3 | Date: Thu, 5 Apr 2018 10:26:25 +0800 |
| 4 | Subject: [PATCH] Makefile.am: prefix calls to pkg-config with | 4 | Subject: [PATCH] Makefile.am: prefix calls to pkg-config with |
| @@ -12,7 +12,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
| 12 | gst-libs/gst/allocators/Makefile.am | 4 ++-- | 12 | gst-libs/gst/allocators/Makefile.am | 4 ++-- |
| 13 | gst-libs/gst/app/Makefile.am | 4 ++-- | 13 | gst-libs/gst/app/Makefile.am | 4 ++-- |
| 14 | gst-libs/gst/audio/Makefile.am | 12 ++++++------ | 14 | gst-libs/gst/audio/Makefile.am | 12 ++++++------ |
| 15 | gst-libs/gst/gl/Makefile.am | 12 ++++++------ | 15 | gst-libs/gst/gl/Makefile.am | 8 ++++---- |
| 16 | gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ | 16 | gst-libs/gst/pbutils/Makefile.am | 12 ++++++------ |
| 17 | gst-libs/gst/riff/Makefile.am | 8 ++++---- | 17 | gst-libs/gst/riff/Makefile.am | 8 ++++---- |
| 18 | gst-libs/gst/rtp/Makefile.am | 8 ++++---- | 18 | gst-libs/gst/rtp/Makefile.am | 8 ++++---- |
| @@ -20,7 +20,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | |||
| 20 | gst-libs/gst/sdp/Makefile.am | 4 ++-- | 20 | gst-libs/gst/sdp/Makefile.am | 4 ++-- |
| 21 | gst-libs/gst/tag/Makefile.am | 8 ++++---- | 21 | gst-libs/gst/tag/Makefile.am | 8 ++++---- |
| 22 | gst-libs/gst/video/Makefile.am | 8 ++++---- | 22 | gst-libs/gst/video/Makefile.am | 8 ++++---- |
| 23 | 11 files changed, 42 insertions(+), 42 deletions(-) | 23 | 11 files changed, 40 insertions(+), 40 deletions(-) |
| 24 | 24 | ||
| 25 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am | 25 | diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am |
| 26 | index 1ecc950..d6417ac 100644 | 26 | index 1ecc950..d6417ac 100644 |
| @@ -92,32 +92,29 @@ index 7fb65f2..5379f79 100644 | |||
| 92 | 92 | ||
| 93 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) | 93 | CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA) |
| 94 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am | 94 | diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am |
| 95 | index 16f829f..fc15a6d 100644 | 95 | index 3276d7f..0cdfe26 100644 |
| 96 | --- a/gst-libs/gst/gl/Makefile.am | 96 | --- a/gst-libs/gst/gl/Makefile.am |
| 97 | +++ b/gst-libs/gst/gl/Makefile.am | 97 | +++ b/gst-libs/gst/gl/Makefile.am |
| 98 | @@ -185,9 +185,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ | 98 | @@ -186,9 +186,9 @@ GstGL-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@ |
| 99 | -I$(top_builddir)/gst-libs \ | ||
| 100 | $(GST_PLUGINS_BASE_CFLAGS) \ | 99 | $(GST_PLUGINS_BASE_CFLAGS) \ |
| 101 | $(GL_CFLAGS) \ | 100 | $(GL_CFLAGS) \ |
| 101 | --add-include-path="$(top_builddir)/gst-libs/gst/video/" \ | ||
| 102 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 102 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 103 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | 103 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ |
| 104 | - --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ | 104 | --library-path="$(top_builddir)/gst-libs/gst/video/" \ |
| 105 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 105 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 106 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | 106 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ |
| 107 | + --add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ | ||
| 108 | --library=libgstgl-@GST_API_VERSION@.la \ | 107 | --library=libgstgl-@GST_API_VERSION@.la \ |
| 109 | --include=Gst-@GST_API_VERSION@ \ | 108 | --include=Gst-@GST_API_VERSION@ \ |
| 110 | --include=GstBase-@GST_API_VERSION@ \ | 109 | --include=GstBase-@GST_API_VERSION@ \ |
| 111 | @@ -216,9 +216,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) | 110 | @@ -218,8 +218,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) |
| 112 | $(INTROSPECTION_COMPILER) \ | ||
| 113 | --includedir=$(srcdir) \ | 111 | --includedir=$(srcdir) \ |
| 114 | --includedir=$(builddir) \ | 112 | --includedir=$(builddir) \ |
| 113 | --includedir="$(top_builddir)/gst-libs/gst/video/" \ | ||
| 115 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 114 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 116 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | 115 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ |
| 117 | - --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ | ||
| 118 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ | 116 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \ |
| 119 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ | 117 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \ |
| 120 | + --includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \ | ||
| 121 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) | 118 | $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F) |
| 122 | 119 | ||
| 123 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) | 120 | CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA) |