diff options
| author | Yuqing Zhu <b54851@freescale.com> | 2015-09-23 14:05:51 +0800 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-19 15:03:20 -0300 |
| commit | 4de61e84bf8f3726619d2b657a7e10af0f925e13 (patch) | |
| tree | c76dd6ce1f905ad4c658a86514781fed47b48369 | |
| parent | 8f4d2cce42ecd36b86e1435ae8b95a5206c6cb56 (diff) | |
| download | meta-freescale-4de61e84bf8f3726619d2b657a7e10af0f925e13.tar.gz | |
gstreamer1.0-plugins-bad: Install head file of gstaggregator and gstvideoaggregator
Install the head file of gstaggregator and gstvideoaggregator.
So that we can use them outside of gstreamer-plugins-bad package.
Add SoC family and package arch.
Signed-off-by: Yuqing Zhu <b54851@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2 files changed, 70 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch new file mode 100755 index 000000000..018826fb1 --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch | |||
| @@ -0,0 +1,59 @@ | |||
| 1 | From 853d7f2ca821682c1e1e594b23ff654505e07054 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Mingke Wang <mingke.wang@freescale.com> | ||
| 3 | Date: Wed, 1 Jul 2015 10:19:25 +0800 | ||
| 4 | Subject: [PATCH] [PATCH] install gstaggregator and gstvideoaggregator header | ||
| 5 | file | ||
| 6 | |||
| 7 | intall the header file of gstaggregator and gstvideoaggregator | ||
| 8 | so that we can use them outside of gstreamer-plugins-bad package | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [i.MX specific] | ||
| 11 | |||
| 12 | Signed-off-by: Mingke Wang <mingke.wang@freescale.com> | ||
| 13 | |||
| 14 | diff --git a/gst-libs/gst/base/Makefile.am b/gst-libs/gst/base/Makefile.am | ||
| 15 | old mode 100644 | ||
| 16 | new mode 100755 | ||
| 17 | index 0d55368..7268095 | ||
| 18 | --- a/gst-libs/gst/base/Makefile.am | ||
| 19 | +++ b/gst-libs/gst/base/Makefile.am | ||
| 20 | @@ -6,11 +6,12 @@ libgstbadbase_@GST_API_VERSION@_la_SOURCES = \ | ||
| 21 | libgstbadbase_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) \ | ||
| 22 | -DGST_USE_UNSTABLE_API | ||
| 23 | |||
| 24 | +libgstbadbase_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/base | ||
| 25 | +libgstbadbase_@GST_API_VERSION@include_HEADERS = \ | ||
| 26 | + gstaggregator.h | ||
| 27 | + | ||
| 28 | libgstbadbase_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS) | ||
| 29 | libgstbadbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) | ||
| 30 | |||
| 31 | -noinst_HEADERS = \ | ||
| 32 | - gstaggregator.h | ||
| 33 | - | ||
| 34 | EXTRA_DIST = | ||
| 35 | |||
| 36 | diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am | ||
| 37 | old mode 100644 | ||
| 38 | new mode 100755 | ||
| 39 | index 4f0f09f..3c5da6b | ||
| 40 | --- a/gst-libs/gst/video/Makefile.am | ||
| 41 | +++ b/gst-libs/gst/video/Makefile.am | ||
| 42 | @@ -19,8 +19,13 @@ libgstbadvideo_@GST_API_VERSION@_la_CFLAGS = \ | ||
| 43 | $(GST_PLUGINS_BASE_CFLAGS) \ | ||
| 44 | $(GST_BASE_CFLAGS) | ||
| 45 | |||
| 46 | +libgstbadvideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video | ||
| 47 | +libgstbadvideo_@GST_API_VERSION@include_HEADERS = \ | ||
| 48 | + gstvideoaggregatorpad.h \ | ||
| 49 | + gstvideoaggregator.h | ||
| 50 | + | ||
| 51 | libgstbadvideo_@GST_API_VERSION@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) -lgstvideo-$(GST_API_VERSION)\ | ||
| 52 | $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la $(LIBM) | ||
| 53 | libgstbadvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) | ||
| 54 | |||
| 55 | -noinst_HEADERS = gstcms.h videoconvert.h gstvideoaggregatorpad.h gstvideoaggregator.h | ||
| 56 | +noinst_HEADERS = gstcms.h videoconvert.h | ||
| 57 | -- | ||
| 58 | 1.7.9.5 | ||
| 59 | |||
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend index bcce7c785..2c78cd2a5 100644 --- a/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend +++ b/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_%.bbappend | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | # Vivante EGL headers require the correct preprocessor | 1 | # Vivante EGL headers require the correct preprocessor |
| 2 | # defines to be set for each platform | 2 | # defines to be set for each platform |
| 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
| 4 | |||
| 3 | CFLAGS_append_mx6 = " -DLINUX \ | 5 | CFLAGS_append_mx6 = " -DLINUX \ |
| 4 | ${@base_contains('DISTRO_FEATURES', 'x11', '', \ | 6 | ${@base_contains('DISTRO_FEATURES', 'x11', '', \ |
| 5 | base_contains('DISTRO_FEATURES', 'wayland', '-DEGL_API_FB -DWL_EGL_PLATFORM', \ | 7 | base_contains('DISTRO_FEATURES', 'wayland', '-DEGL_API_FB -DWL_EGL_PLATFORM', \ |
| @@ -9,3 +11,12 @@ CFLAGS_append_mx6 = " -DLINUX \ | |||
| 9 | PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \ | 11 | PACKAGECONFIG_GL_mx6sl = "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', \ |
| 10 | base_contains('DISTRO_FEATURES', 'x11', \ | 12 | base_contains('DISTRO_FEATURES', 'x11', \ |
| 11 | 'opengl', '', d), '', d)}" | 13 | 'opengl', '', d), '', d)}" |
| 14 | |||
| 15 | SRC_URI_append_mx6 = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch" | ||
| 16 | SRC_URI_append_mx6ul = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch" | ||
| 17 | SRC_URI_append_mx7 = " file://0001-PATCH-install-gstaggregator-and-gstvideoaggregator-h.patch" | ||
| 18 | |||
| 19 | |||
| 20 | PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}" | ||
| 21 | PACKAGE_ARCH_mx6ul = "${MACHINE_SOCARCH}" | ||
| 22 | PACKAGE_ARCH_mx7 = "${MACHINE_SOCARCH}" | ||
