gstreamer: enable ptest support

PATCH In review Anuj Mittal 2 participants 14 messages May 25, 2018 – Jun 14, 2018

Share & tools

Anuj Mittal

author

2018-05-25 06:20 UTC #0 lore raw

PATCH v4 1/12 gstreamer: enable ptest support

Make sure that the tests are packaged and can be executed when ptest is enabled. Also, remove build host specific references from Makefile.

Signed-off-by Anuj Mittal <[email protected]>

---

v4:
Tweak AM_TESTS_ENVIRONMENT to remove hardcoded paths.

---
 .../files/add-a-target-to-compile-tests.patch | 69 +++++++++++++++++++
 .../gstreamer/files/run-ptest                 |  3 +
 .../gstreamer/gstreamer1.0_1.14.0.bb          | 26 ++++++-
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/files/run-ptest

meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch new file +69 -0

new file mode 100644
index 0000000000..d02d869410
@@ -0,0 +1,69 @@
+From d61414bc17cf2df019510c2908048c4cabf5cf09 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <[email protected]>
+Date: Tue, 27 Feb 2018 09:27:01 +0800
+Subject: [PATCH] add targets for test installation
+
+Targets to make sure tests can be installed and then run on
+the target.
+
+Upstream-Status: Inappropriate [specific to oe setup]
+
+Signed-off-by: Anuj Mittal <[email protected]>
+
+---
+ tests/check/Makefile.am | 27 ++++++++++++++++++++-------
+ 1 file changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
+index 13b916d..a66786d 100644
+--- a/tests/check/Makefile.am
++++ b/tests/check/Makefile.am
+@@ -8,11 +8,7 @@ REGISTRY_ENVIRONMENT = \
+ 	GST_REGISTRY=$(CHECK_REGISTRY)
+ 
+ AM_TESTS_ENVIRONMENT += \
+-        GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"	\
+-        $(REGISTRY_ENVIRONMENT)					\
+-        GST_PLUGIN_SCANNER_1_0=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
+-        GST_PLUGIN_SYSTEM_PATH_1_0=					\
+-        GST_PLUGIN_PATH_1_0=$(top_builddir)/plugins
++        GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"
+ 
+ plugindir = $(libdir)/gstreamer-@GST_API_VERSION@
+ 
+@@ -178,6 +174,23 @@ noinst_PROGRAMS =
+ 
+ TESTS = $(check_PROGRAMS)
+ 
++install-ptest: $(TESTS)
++	@$(INSTALL) -d $(DESTDIR)
++	@for dir in `find -maxdepth 1 -type d`; do \
++		if [ -x $$dir/.libs ]; then \
++			$(INSTALL) -d $(DESTDIR)/$$dir; \
++			$(INSTALL_PROGRAM) $$dir/.libs/* $(DESTDIR)/$$dir/; \
++		fi \
++	done
++
++runtests:
++	@for b in $(TESTS); do \
++		if [ -x $$b ]; then \
++			$(AM_TESTS_ENVIRONMENT) $(SHELL) test-driver --test-name "$$b" \
++			--log-file $$b.log --trs-file $$b.trs $$b; \
++		fi \
++	done
++
+ noinst_HEADERS = \
+ 	gst/capslist.h \
+ 	gst/struct_arm.h \
+@@ -221,9 +234,9 @@ gst_gstprintf_LDADD = \
+ 	$(LDADD)
+ 
+ elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+-	-DTESTFILE=\"$(top_srcdir)/configure.ac\"
++	-DTESTFILE=\"Makefile\"
+ elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+-	-DTESTFILE=\"$(top_srcdir)/configure.ac\"
++	-DTESTFILE=\"Makefile\"
+ 
+ libs_controller_LDADD = \
+ 	$(top_builddir)/libs/gst/controller/libgstcontroller-@[email protected] \

meta/recipes-multimedia/gstreamer/files/run-ptest new file +3 -0

new file mode 100644
index 0000000000..473d0b67a7
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make -k runtests

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb +24 -2

index b4398c8111..e842f30c5a 100644
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2+"
 
 DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
 
-inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc
+inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc ptest
 
 # This way common/m4/introspection.m4 will come first
 # (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file)

@@ -24,11 +24,14 @@ SRC_URI = " \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://gtk-doc-tweaks.patch \
     file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
+    file://add-a-target-to-compile-tests.patch \
+    file://run-ptest \
 "
 SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96"
 SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
+                   "
 
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests"

@@ -55,6 +58,7 @@ FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadi
 
 RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
 RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+RDEPENDS_${PN}-ptest += "make"
 
 delete_pkg_m4_file() {
         # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection

@@ -68,4 +72,22 @@ do_compile_prepend() {
         export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"
 }
 
+do_compile_ptest() {
+        oe_runmake build-checks
+}
+
+do_install_ptest() {
+        oe_runmake -C tests/check DESTDIR=${D}${PTEST_PATH} install-ptest
+        install -m 644 ${B}/tests/check/Makefile ${D}${PTEST_PATH}
+        install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
+        sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
+            -e 's|${DEBUG_PREFIX_MAP}||g' \
+            -e 's:${HOSTTOOLS_DIR}/::g' \
+            -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
+            -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \-e 's/^Makefile:/_Makefile:/' \
+            -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \
+            -e 's/^builddir = \(.*\)/builddir = ./' -e 's/^top_builddir = \(.*\)/top_builddir = ./' \
+            -i ${D}${PTEST_PATH}/Makefile
+}
+
 CVE_PRODUCT = "gstreamer"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #1 lore raw

PATCH 2/12 gstreamer1.0: upgrade 1.14.0 -> 1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 .../{gstreamer1.0_1.14.0.bb => gstreamer1.0_1.14.1.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0_1.14.0.bb => gstreamer1.0_1.14.1.bb} (96%)

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb +2 -2

similarity index 96%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.1.bb
index e842f30c5a..2710f25950 100644
@@ -27,8 +27,8 @@ SRC_URI = " \
     file://add-a-target-to-compile-tests.patch \
     file://run-ptest \
 "
-SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96"
-SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e"
+SRC_URI[md5sum] = "c46967bd2b7b6b73fa4f47de61610243"
+SRC_URI[sha256sum] = "28d82b0d261544a9bf85b429399929e4986eb00efcf1ce16cc71d269a4c3186c"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
                    "

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #2 lore raw

PATCH 3/12 gstreamer1.0-plugins-base: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Remove a backport patch and rebase one other patch.

Signed-off-by Anuj Mittal <[email protected]>

---
 ...stVideo-1.0.gir-from-local-build-dir.patch | 42 -------------------
 ...ix-calls-to-pkg-config-with-PKG_CONF.patch | 21 ++++------
 ...bb => gstreamer1.0-plugins-base_1.14.1.bb} |  5 +--
 3 files changed, 11 insertions(+), 57 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-base_1.14.0.bb => gstreamer1.0-plugins-base_1.14.1.bb} (94%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch deleted +0 ~~-42~~

deleted file mode 100644
index eba72db96b..0000000000
@@ -1,42 +0,0 @@
-From 1a7c457cf209e853148865f196edc12ba8d5c10c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]>
-Date: Tue, 27 Mar 2018 10:43:16 +0100
-Subject: [PATCH] gl: pick up GstVideo-1.0.gir from local build dir
-
-https://bugzilla.gnome.org/show_bug.cgi?id=794708
-
-Upstream-Status: Backport [https://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?h=1.14&id=9261296858cb149767ceac44fd6bd13cc0de0d21]
-
-Signed-off-by: Anuj Mittal <[email protected]>
-
----
- gst-libs/gst/gl/Makefile.am | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
-index fc15a6d..ab6cc55 100644
---- a/gst-libs/gst/gl/Makefile.am
-+++ b/gst-libs/gst/gl/Makefile.am
-@@ -185,9 +185,10 @@ GstGL-@[email protected]: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
- 		-I$(top_builddir)/gst-libs \
- 		$(GST_PLUGINS_BASE_CFLAGS) \
- 		$(GL_CFLAGS) \
-+		--add-include-path="$(top_builddir)/gst-libs/gst/video/" \
- 		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`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-base-@GST_API_VERSION@` \
--		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
-+		--library-path="$(top_builddir)/gst-libs/gst/video/" \
- 		--library=libgstgl-@[email protected] \
- 		--include=Gst-@GST_API_VERSION@ \
- 		--include=GstBase-@GST_API_VERSION@ \
-@@ -216,9 +217,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
- 		$(INTROSPECTION_COMPILER) \
- 		--includedir=$(srcdir) \
- 		--includedir=$(builddir) \
-+		--includedir="$(top_builddir)/gst-libs/gst/video/" \
- 		--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@` \
--		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
- 		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
- 
- CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0002-Makefile.am-prefix-calls-to-pkg-config-with-PKG_CONF.patch +9 ~~-12~~

index 377c89a11d..2e1190ba01 100644
@@ -1,4 +1,4 @@
-From 77b88eae845060d38cf788651f66a7ae98f9b199 Mon Sep 17 00:00:00 2001
+From 9601fc0cd6751a1affdc8717217b95931db31d7f Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Thu, 5 Apr 2018 10:26:25 +0800
 Subject: [PATCH] Makefile.am: prefix calls to pkg-config with

@@ -12,7 +12,7 @@ Signed-off-by: Anuj Mittal <[email protected]>
  gst-libs/gst/allocators/Makefile.am |  4 ++--
  gst-libs/gst/app/Makefile.am        |  4 ++--
  gst-libs/gst/audio/Makefile.am      | 12 ++++++------
- gst-libs/gst/gl/Makefile.am         | 12 ++++++------
+ gst-libs/gst/gl/Makefile.am         |  8 ++++----
  gst-libs/gst/pbutils/Makefile.am    | 12 ++++++------
  gst-libs/gst/riff/Makefile.am       |  8 ++++----
  gst-libs/gst/rtp/Makefile.am        |  8 ++++----

@@ -20,7 +20,7 @@ Signed-off-by: Anuj Mittal <[email protected]>
  gst-libs/gst/sdp/Makefile.am        |  4 ++--
  gst-libs/gst/tag/Makefile.am        |  8 ++++----
  gst-libs/gst/video/Makefile.am      |  8 ++++----
- 11 files changed, 42 insertions(+), 42 deletions(-)
+ 11 files changed, 40 insertions(+), 40 deletions(-)
 
 diff --git a/gst-libs/gst/allocators/Makefile.am b/gst-libs/gst/allocators/Makefile.am
 index 1ecc950..d6417ac 100644

@@ -92,32 +92,29 @@ index 7fb65f2..5379f79 100644
  
  CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
 diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
-index 16f829f..fc15a6d 100644
+index 3276d7f..0cdfe26 100644
 --- a/gst-libs/gst/gl/Makefile.am
 +++ b/gst-libs/gst/gl/Makefile.am
-@@ -185,9 +185,9 @@ GstGL-@[email protected]: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
- 		-I$(top_builddir)/gst-libs \
+@@ -186,9 +186,9 @@ GstGL-@[email protected]: $(INTROSPECTION_SCANNER) libgstgl-@GST_API_VERSION@
  		$(GST_PLUGINS_BASE_CFLAGS) \
  		$(GL_CFLAGS) \
+ 		--add-include-path="$(top_builddir)/gst-libs/gst/video/" \
 -		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
 -		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-base-@GST_API_VERSION@` \
--		--add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
+ 		--library-path="$(top_builddir)/gst-libs/gst/video/" \
 +		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`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-base-@GST_API_VERSION@` \
-+		--add-include-path=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
  		--library=libgstgl-@[email protected] \
  		--include=Gst-@GST_API_VERSION@ \
  		--include=GstBase-@GST_API_VERSION@ \
-@@ -216,9 +216,9 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
- 		$(INTROSPECTION_COMPILER) \
+@@ -218,8 +218,8 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
  		--includedir=$(srcdir) \
  		--includedir=$(builddir) \
+ 		--includedir="$(top_builddir)/gst-libs/gst/video/" \
 -		--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_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@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@` \
-+		--includedir=$(PKG_CONFIG_SYSROOT_DIR)`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-video-@GST_API_VERSION@` \
  		$(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
  
  CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb +2 -3

similarity index 94%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb
index 08397a03a8..8d7d3c6192 100644
@@ -18,10 +18,9 @@ SRC_URI = " \
             file://0009-glimagesink-Downrank-to-marginal.patch \
             file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
             file://link-with-libvchostif.patch \
-            file://0001-gl-pick-up-GstVideo-1.0.gir-from-local-build-dir.patch \
             "
-SRC_URI[md5sum] = "370271327dd23110421a9c2927ac989a"
-SRC_URI[sha256sum] = "7e904660ff56e02b036cf7fdfb77a50a540828ca9d2614d69ba931772e5b6940"
+SRC_URI[md5sum] = "c42154ab6f85c59f0e449d8d7e290342"
+SRC_URI[sha256sum] = "1026c7c3082d825d9b5d034c1a6dd8a4ebab60eb3738b0a0afde4ad2dc0b0db5"
 
 S = "${WORKDIR}/gst-plugins-base-${PV}"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #3 lore raw

PATCH 4/12 gstreamer1.0-plugins-good: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...ins-good_1.14.0.bb => gstreamer1.0-plugins-good_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.14.0.bb => gstreamer1.0-plugins-good_1.14.1.bb} (96%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb +2 -2

similarity index 96%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.1.bb
index b269fce173..36eb3107ae 100644
@@ -8,8 +8,8 @@ SRC_URI = " \
             file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
             "
 
-SRC_URI[md5sum] = "48584b02e469a314b0e71f1553a2d2a7"
-SRC_URI[sha256sum] = "6afa35747d528d3ab4ed8f5eac13f7235d7d28100d6a24dd78f81ec7c0d04688"
+SRC_URI[md5sum] = "9afe4dd6678cdbd19d8b316c90d6717a"
+SRC_URI[sha256sum] = "34ec062ddb766a32377532e039781f4a16fbc3e8b449e642605bacab26a99172"
 
 S = "${WORKDIR}/gst-plugins-good-${PV}"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #4 lore raw

PATCH 5/12 gstreamer1.0-plugins-bad: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...ugins-bad_1.14.0.bb => gstreamer1.0-plugins-bad_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-bad_1.14.0.bb => gstreamer1.0-plugins-bad_1.14.1.bb} (97%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb +2 -2

similarity index 97%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb
index 87f2d0367a..0e477e5a9c 100644
@@ -9,8 +9,8 @@ SRC_URI = " \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://0001-Makefile.am-don-t-hardcode-libtool-name-when-running.patch \
 "
-SRC_URI[md5sum] = "555bbe7232fb4653c31b78e1f79068cf"
-SRC_URI[sha256sum] = "ed5e2badb6f2858f60017b93334d91fe58a0e3f85ed2f37f2e931416fafb4f9f"
+SRC_URI[md5sum] = "c2f963501fc6afc084c418894425dcfd"
+SRC_URI[sha256sum] = "2a77c6908032aafdf2cd2e5823fec948f16a25c2d1497a953828d762dc20d61a"
 
 S = "${WORKDIR}/gst-plugins-bad-${PV}"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #5 lore raw

PATCH 6/12 gstreamer1.0-plugins-ugly: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...ins-ugly_1.14.0.bb => gstreamer1.0-plugins-ugly_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-ugly_1.14.0.bb => gstreamer1.0-plugins-ugly_1.14.1.bb} (90%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb +2 -2

similarity index 90%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.14.1.bb
index c8f778bff3..d9d636ad0b 100644
@@ -10,8 +10,8 @@ SRC_URI = " \
             http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
             file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
             "
-SRC_URI[md5sum] = "bcb1f8d9339176aee2b5da2a9cb2df88"
-SRC_URI[sha256sum] = "3fb9ea5fc8a2de4b3eaec4128d71c6a2d81dd19befe1cd87cb833b98bcb542d1"
+SRC_URI[md5sum] = "d1563f5dc0508afc6f8b261324d765d9"
+SRC_URI[sha256sum] = "cff2430bb13f54ef81409a0b3d65ce409a376d4a7bab57a14a97d602539fe1d3"
 
 S = "${WORKDIR}/gst-plugins-ugly-${PV}"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #6 lore raw

PATCH 7/12 gstreamer1.0-vaapi: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...reamer1.0-vaapi_1.14.0.bb => gstreamer1.0-vaapi_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-vaapi_1.14.0.bb => gstreamer1.0-vaapi_1.14.1.bb} (93%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb +2 -2

similarity index 93%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb
index 4f752a57b3..906dc6e6c4 100644
@@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \
           "
 
-SRC_URI[md5sum] = "248c3aafab59814e71eb4a6c334cb261"
-SRC_URI[sha256sum] = "e4e31f085ef289bf1049398f641345979d20a1b11a80285744bba98504991df2"
+SRC_URI[md5sum] = "38c5b2390797b7a0a269a5ab6c8cbe8f"
+SRC_URI[sha256sum] = "585c3ddb0c39220de0a33e5d0ed6196a108b8407ec3538d7c64617713b4434e8"
 
 S = "${WORKDIR}/${REALPN}-${PV}"
 DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #7 lore raw

PATCH 8/12 gstreamer1.0-libav: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...reamer1.0-libav_1.14.0.bb => gstreamer1.0-libav_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-libav_1.14.0.bb => gstreamer1.0-libav_1.14.1.bb} (95%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb +2 -2

similarity index 95%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.14.1.bb
index ee2a043f81..69be590d2f 100644
@@ -19,8 +19,8 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${PV}.tar.xz
            file://0001-configure-check-for-armv7ve-variant.patch \
            file://0001-fix-host-contamination.patch \
            "
-SRC_URI[md5sum] = "943045b9e937ffc5c6cfa0bd5c44230d"
-SRC_URI[sha256sum] = "fb134b4d3e054746ef8b922ff157b0c7903d1fdd910708a45add66954da7ef89"
+SRC_URI[md5sum] = "d57b0052f6eccb8e6762def05995133c"
+SRC_URI[sha256sum] = "eff80a02d2f2fb9f34b67e9a26e9954d3218c7aa18e863f2a47805fa7066029d"
 
 S = "${WORKDIR}/gst-libav-${PV}"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #8 lore raw

PATCH 9/12 gstreamer1.0-python: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...amer1.0-python_1.14.0.bb => gstreamer1.0-python_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-python_1.14.0.bb => gstreamer1.0-python_1.14.1.bb} (90%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb +2 -2

similarity index 90%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-python_1.14.1.bb
index 1eb1a3f6f4..b0f1c259bb 100644
@@ -6,8 +6,8 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=c34deae4e395ca07e725ab0076a5f740"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz"
-SRC_URI[md5sum] = "97782b2fde877f1d1d68c64f7db4f735"
-SRC_URI[sha256sum] = "e0b98111150aa3fcdeb6e228cd770995fbdaa8586fc02ec9b3273d4ae83399e6"
+SRC_URI[md5sum] = "2ae86f1bb2fd8399a942fd94bb17d264"
+SRC_URI[sha256sum] = "1bc6704955e343f78d2d935487f26d2db4c131c9a6dad38eb331c7e3639147d3"
 
 DEPENDS = "gstreamer1.0 python3-pygobject"
 RDEPENDS_${PN} += "gstreamer1.0 python3-pygobject"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #9 lore raw

PATCH 10/12 gstreamer1.0-omx: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...{gstreamer1.0-omx_1.14.0.bb => gstreamer1.0-omx_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-omx_1.14.0.bb => gstreamer1.0-omx_1.14.1.bb} (93%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb +2 -2

similarity index 93%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.14.1.bb
index 792b1e182d..065e0f02b2 100644
@@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "2bca3bd68540a97122450d78576ad2be"
-SRC_URI[sha256sum] = "4d43c354087cb77924982943e34e0d47294b5570304db11fd8b268b53bcff693"
+SRC_URI[md5sum] = "bec524f2a415af865a895fe12bcf0462"
+SRC_URI[sha256sum] = "7cb6c39301dfa3960abce195305c7cf431736bf6b47bde1fd4412c81c3e75cd8"
 
 S = "${WORKDIR}/gst-omx-${PV}"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #10 lore raw

PATCH 11/12 gstreamer1.0-rtsp-server: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...sp-server_1.14.0.bb => gstreamer1.0-rtsp-server_1.14.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-rtsp-server_1.14.0.bb => gstreamer1.0-rtsp-server_1.14.1.bb} (89%)

meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb +2 -2

similarity index 89%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.14.1.bb
index 64906e1abb..1ae1b5b890 100644
@@ -14,8 +14,8 @@ SRC_URI = "http://gstreamer.freedesktop.org/src/${PNREAL}/${PNREAL}-${PV}.tar.xz
            file://gtk-doc-tweaks.patch \
            "
 
-SRC_URI[md5sum] = "8a505c88f7469c3a0d1e9f4e9a315e53"
-SRC_URI[sha256sum] = "6b65a077bed815f6d3157ebea503cc9f3c32d289af2756b7ff7e3958744d9756"
+SRC_URI[md5sum] = "baa721c289880c2cc0e9c5cbebca5201"
+SRC_URI[sha256sum] = "38634f3b25c2bf2967b1ff914b54ff384f8612f5aefc18accd72c78bf3b02d7c"
 
 S = "${WORKDIR}/${PNREAL}-${PV}"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-05-25 06:20 UTC #11 lore raw

PATCH 12/12 gst-validate: upgrade 1.14.0 -> 1.14.1

In reply to Anuj Mittal

Bugfixes only. Please see:

https://gstreamer.freedesktop.org/releases/1.14/#1.14.1

Signed-off-by Anuj Mittal <[email protected]>

---
 ...plate-paths-when-buildir-is-differen.patch | 41 -------------------
 ...idate_1.14.0.bb => gst-validate_1.14.1.bb} |  5 +--
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch
 rename meta/recipes-multimedia/gstreamer/{gst-validate_1.14.0.bb => gst-validate_1.14.1.bb} (80%)

meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch deleted +0 ~~-41~~

deleted file mode 100644
index 400b8b0fea..0000000000
@@ -1,41 +0,0 @@
-From ac9d7d230effdb97870c2f317b3b45449bde1769 Mon Sep 17 00:00:00 2001
-From: Anuj Mittal <[email protected]>
-Date: Wed, 11 Apr 2018 15:40:02 +0800
-Subject: [PATCH] validate: fix template paths when buildir is different
-
-Compilation just fails otherwise because it's not able to locate the files.
-
-Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795149]
-Signed-off-by: Anuj Mittal <[email protected]>
-
----
- gst/validate/Makefile.am | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/gst/validate/Makefile.am b/gst/validate/Makefile.am
-index 342730a..3fcc3e5 100644
---- a/gst/validate/Makefile.am
-+++ b/gst/validate/Makefile.am
-@@ -48,14 +48,17 @@ source_h = \
- nodist_libgstvalidate_@GST_API_VERSION@_la_SOURCES = $(built_source_make)
- nodist_libgstvalidate_@GST_API_VERSION@include_HEADERS = $(built_header_make)
- 
-+template_h = $(patsubst %,$(srcdir)/%, gst-validate-enum-types.h.template)
-+template_c = $(patsubst %,$(srcdir)/%, gst-validate-enum-types.c.template)
-+
- gst-validate-enum-types.h: $(source_h)
- 	$(AM_V_GEN)$(GLIB_MKENUMS) \
--	--template gst-validate-enum-types.h.template \
-+	--template $(template_h) \
- 	$^ > gst-validate-enum-types.h
- 
- gst-validate-enum-types.c: $(source_h)
- 	$(AM_V_GEN)$(GLIB_MKENUMS) \
--	--template gst-validate-enum-types.c.template \
-+	--template $(template_c) \
- 	$^ > gst-validate-enum-types.c
- 
- EXTRA_DIST= \
--- 
-2.7.4
-

meta/recipes-multimedia/gstreamer/gst-validate_1.14.1.bb renamed from meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb +2 -3

similarity index 80%
rename from meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb
rename to meta/recipes-multimedia/gstreamer/gst-validate_1.14.1.bb
index d12b8f6a0f..7517580a8d 100644
@@ -7,10 +7,9 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \
-           file://0001-validate-fix-template-paths-when-buildir-is-differen.patch \
            "
-SRC_URI[md5sum] = "deb8654c912b189388fe585b0fc5bc8f"
-SRC_URI[sha256sum] = "33df08bf77f2895d64b7e8a957de3b930b4da0a8edabfbefcff2eab027eeffdf"
+SRC_URI[md5sum] = "293262badee41357e029e5f2664354d7"
+SRC_URI[sha256sum] = "68e3f38f66e0d04837b60090fe5d9ca1127f5df124669f34ca82e241209171e4"
 
 DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base"
 RRECOMMENDS_${PN} = "git"

Signature · 1 line

2.17.0

Anuj Mittal

author

2018-06-14 01:06 UTC #12 lore raw

In reply to Anuj Mittal

Ping.

Quoted 163 lines · Anuj Mittal

Make sure that the tests are packaged and can be executed when ptest is enabled. Also, remove build host specific references from Makefile.

Signed-off-by Anuj Mittal <[email protected]>

---

v4:
Tweak AM_TESTS_ENVIRONMENT to remove hardcoded paths.

---
 .../files/add-a-target-to-compile-tests.patch | 69 +++++++++++++++++++
 .../gstreamer/files/run-ptest                 |  3 +
 .../gstreamer/gstreamer1.0_1.14.0.bb          | 26 ++++++-
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/files/run-ptest

meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch new file +69 -0

new file mode 100644
index 0000000000..d02d869410
@@ -0,0 +1,69 @@
+From d61414bc17cf2df019510c2908048c4cabf5cf09 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <[email protected]>
+Date: Tue, 27 Feb 2018 09:27:01 +0800
+Subject: [PATCH] add targets for test installation
+
+Targets to make sure tests can be installed and then run on
+the target.
+
+Upstream-Status: Inappropriate [specific to oe setup]
+
+Signed-off-by: Anuj Mittal <[email protected]>
+
+---
+ tests/check/Makefile.am | 27 ++++++++++++++++++++-------
+ 1 file changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
+index 13b916d..a66786d 100644
+--- a/tests/check/Makefile.am
++++ b/tests/check/Makefile.am
+@@ -8,11 +8,7 @@ REGISTRY_ENVIRONMENT = \
+ 	GST_REGISTRY=$(CHECK_REGISTRY)
+ 
+ AM_TESTS_ENVIRONMENT += \
+-        GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"	\
+-        $(REGISTRY_ENVIRONMENT)					\
+-        GST_PLUGIN_SCANNER_1_0=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
+-        GST_PLUGIN_SYSTEM_PATH_1_0=					\
+-        GST_PLUGIN_PATH_1_0=$(top_builddir)/plugins
++        GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"
+ 
+ plugindir = $(libdir)/gstreamer-@GST_API_VERSION@
+ 
+@@ -178,6 +174,23 @@ noinst_PROGRAMS =
+ 
+ TESTS = $(check_PROGRAMS)
+ 
++install-ptest: $(TESTS)
++	@$(INSTALL) -d $(DESTDIR)
++	@for dir in `find -maxdepth 1 -type d`; do \
++		if [ -x $$dir/.libs ]; then \
++			$(INSTALL) -d $(DESTDIR)/$$dir; \
++			$(INSTALL_PROGRAM) $$dir/.libs/* $(DESTDIR)/$$dir/; \
++		fi \
++	done
++
++runtests:
++	@for b in $(TESTS); do \
++		if [ -x $$b ]; then \
++			$(AM_TESTS_ENVIRONMENT) $(SHELL) test-driver --test-name "$$b" \
++			--log-file $$b.log --trs-file $$b.trs $$b; \
++		fi \
++	done
++
+ noinst_HEADERS = \
+ 	gst/capslist.h \
+ 	gst/struct_arm.h \
+@@ -221,9 +234,9 @@ gst_gstprintf_LDADD = \
+ 	$(LDADD)
+ 
+ elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+-	-DTESTFILE=\"$(top_srcdir)/configure.ac\"
++	-DTESTFILE=\"Makefile\"
+ elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+-	-DTESTFILE=\"$(top_srcdir)/configure.ac\"
++	-DTESTFILE=\"Makefile\"
+ 
+ libs_controller_LDADD = \
+ 	$(top_builddir)/libs/gst/controller/libgstcontroller-@[email protected] \

meta/recipes-multimedia/gstreamer/files/run-ptest new file +3 -0

new file mode 100644
index 0000000000..473d0b67a7
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make -k runtests

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb +24 -2

index b4398c8111..e842f30c5a 100644
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2+"
 
 DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
 
-inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc
+inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc ptest
 
 # This way common/m4/introspection.m4 will come first
 # (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file)

@@ -24,11 +24,14 @@ SRC_URI = " \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://gtk-doc-tweaks.patch \
     file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
+    file://add-a-target-to-compile-tests.patch \
+    file://run-ptest \
 "
 SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96"
 SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
+                   "
 
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests"

@@ -55,6 +58,7 @@ FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadi
 
 RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
 RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+RDEPENDS_${PN}-ptest += "make"
 
 delete_pkg_m4_file() {
         # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection

@@ -68,4 +72,22 @@ do_compile_prepend() {
         export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"
 }
 
+do_compile_ptest() {
+        oe_runmake build-checks
+}
+
+do_install_ptest() {
+        oe_runmake -C tests/check DESTDIR=${D}${PTEST_PATH} install-ptest
+        install -m 644 ${B}/tests/check/Makefile ${D}${PTEST_PATH}
+        install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
+        sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \
+            -e 's|${DEBUG_PREFIX_MAP}||g' \
+            -e 's:${HOSTTOOLS_DIR}/::g' \
+            -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
+            -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \-e 's/^Makefile:/_Makefile:/' \
+            -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \
+            -e 's/^builddir = \(.*\)/builddir = ./' -e 's/^top_builddir = \(.*\)/top_builddir = ./' \
+            -i ${D}${PTEST_PATH}/Makefile
+}
+
 CVE_PRODUCT = "gstreamer"

Burton, Ross

2018-06-14 13:25 UTC #13 lore raw

Picked, thanks. Tested it and it passed too! :)

Ross

Quoted 172 lines · Anuj Mittal

Ping.

Quoted 153 lines · Anuj Mittal

Make sure that the tests are packaged and can be executed when ptest is enabled. Also, remove build host specific references from Makefile.

Signed-off-by Anuj Mittal <[email protected]>

---

v4:
Tweak AM_TESTS_ENVIRONMENT to remove hardcoded paths.

---
 .../files/add-a-target-to-compile-tests.patch | 69 +++++++++++++++++++
 .../gstreamer/files/run-ptest                 |  3 +
 .../gstreamer/gstreamer1.0_1.14.0.bb          | 26 ++++++-
 3 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/files/run-ptest

meta/recipes-multimedia/gstreamer/files/add-a-target-to-compile-tests.patch new file +69 -0

new file mode 100644
index 0000000000..d02d869410
@@ -0,0 +1,69 @@
+From d61414bc17cf2df019510c2908048c4cabf5cf09 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <[email protected]>
+Date: Tue, 27 Feb 2018 09:27:01 +0800
+Subject: [PATCH] add targets for test installation
+
+Targets to make sure tests can be installed and then run on
+the target.
+
+Upstream-Status: Inappropriate [specific to oe setup]
+
+Signed-off-by: Anuj Mittal <[email protected]>
+
+---
+ tests/check/Makefile.am | 27 ++++++++++++++++++++-------
+ 1 file changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
+index 13b916d..a66786d 100644
+--- a/tests/check/Makefile.am
++++ b/tests/check/Makefile.am
+@@ -8,11 +8,7 @@ REGISTRY_ENVIRONMENT = \
+     GST_REGISTRY=$(CHECK_REGISTRY)
+
+ AM_TESTS_ENVIRONMENT += \
+-        GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"        \
+-        $(REGISTRY_ENVIRONMENT)                                     \
+-        GST_PLUGIN_SCANNER_1_0=$(top_builddir)/libs/gst/helpers/gst-plugin-scanner \
+-        GST_PLUGIN_SYSTEM_PATH_1_0=                                 \
+-        GST_PLUGIN_PATH_1_0=$(top_builddir)/plugins
++        GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"
+
+ plugindir = $(libdir)/gstreamer-@GST_API_VERSION@
+
+@@ -178,6 +174,23 @@ noinst_PROGRAMS =
+
+ TESTS = $(check_PROGRAMS)
+
++install-ptest: $(TESTS)
++    @$(INSTALL) -d $(DESTDIR)
++    @for dir in `find -maxdepth 1 -type d`; do \
++            if [ -x $$dir/.libs ]; then \
++                    $(INSTALL) -d $(DESTDIR)/$$dir; \
++                    $(INSTALL_PROGRAM) $$dir/.libs/* $(DESTDIR)/$$dir/; \
++            fi \
++    done
++
++runtests:
++    @for b in $(TESTS); do \
++            if [ -x $$b ]; then \
++                    $(AM_TESTS_ENVIRONMENT) $(SHELL) test-driver --test-name "$$b" \
++                    --log-file $$b.log --trs-file $$b.trs $$b; \
++            fi \
++    done
++
+ noinst_HEADERS = \
+     gst/capslist.h \
+     gst/struct_arm.h \
+@@ -221,9 +234,9 @@ gst_gstprintf_LDADD = \
+     $(LDADD)
+
+ elements_fdsrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+-    -DTESTFILE=\"$(top_srcdir)/configure.ac\"
++    -DTESTFILE=\"Makefile\"
+ elements_filesrc_CFLAGS=$(GST_OBJ_CFLAGS) $(AM_CFLAGS) \
+-    -DTESTFILE=\"$(top_srcdir)/configure.ac\"
++    -DTESTFILE=\"Makefile\"
+
+ libs_controller_LDADD = \
+     $(top_builddir)/libs/gst/controller/libgstcontroller-@[email protected] \

meta/recipes-multimedia/gstreamer/files/run-ptest new file +3 -0

new file mode 100644
index 0000000000..473d0b67a7
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make -k runtests

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb +15 -2

index b4398c8111..e842f30c5a 100644
@@ -8,7 +8,7 @@ LICENSE = "LGPLv2+"
 
 DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
 
-inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc
+inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc ptest
 
 # This way common/m4/introspection.m4 will come first
 # (it has a custom INTROSPECTION_INIT macro, and so must be used instead of our common introspection.m4 file)

@@ -24,11 +24,14 @@ SRC_URI = " \
     file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
     file://gtk-doc-tweaks.patch \
     file://0001-gst-gstpluginloader.c-when-env-var-is-set-do-not-fal.patch \
+    file://add-a-target-to-compile-tests.patch \
+    file://run-ptest \
 "
 SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96"
 SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30b9c9f4ac9faea4e6b251db8b4b0398466e"
 
-PACKAGECONFIG ??= ""
+PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)} \
+                   "
 
 PACKAGECONFIG[debug] = "--enable-debug,--disable-debug"
 PACKAGECONFIG[tests] = "--enable-tests,--disable-tests"

@@ -55,6 +58,7 @@ FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadi
 
 RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
 RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+RDEPENDS_${PN}-ptest += "make"
 
 delete_pkg_m4_file() {
         # This m4 file is out of date and is missing PKG_CONFIG_SYSROOT_PATH tweaks which we need for introspection

@@ -68,4 +72,22 @@ do_compile_prepend() {
         export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/.libs"
 }
 
+do_compile_ptest() {
+        oe_runmake build-checks
+}
+
+do_install_ptest() {
+        oe_runmake -C tests/check DESTDIR=${D}${PTEST_PATH} install-ptest
+        install -m 644 ${B}/tests/check/Makefile ${D}${PTEST_PATH}
+        install -m 755 ${S}/test-driver ${D}${PTEST_PATH}
+        sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb do_compile_prepend() { · line 93

Quoted 10 lines

meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb +9 -0

+            -e 's|${DEBUG_PREFIX_MAP}||g' \
+            -e 's:${HOSTTOOLS_DIR}/::g' \
+            -e 's:${RECIPE_SYSROOT_NATIVE}::g' \
+            -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \-e 's/^Makefile:/_Makefile:/' \
+            -e 's/^srcdir = \(.*\)/srcdir = ./' -e 's/^top_srcdir = \(.*\)/top_srcdir = ./' \
+            -e 's/^builddir = \(.*\)/builddir = ./' -e 's/^top_builddir = \(.*\)/top_builddir = ./' \
+            -i ${D}${PTEST_PATH}/Makefile
+}
+
 CVE_PRODUCT = "gstreamer"

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core