diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2018-05-03 16:17:54 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-11 07:49:37 +0100 |
commit | 6b52c84a3f199ddeba71c2ef53375995771660ca (patch) | |
tree | 2d267d29fb7b7abb48b52d76d5c788f5863898c9 | |
parent | 19df6ef6f3ec19c7751aab59c3609fb5320cee06 (diff) | |
download | poky-6b52c84a3f199ddeba71c2ef53375995771660ca.tar.gz |
gst-validate: upgrade 1.12.4 -> 1.14.0
* For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/.
* Patch Makefile to fix compilation errors.
(From OE-Core rev: 64a27c7f9792126b1ad82571c351c96da6addb02)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch | 41 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb (renamed from meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb) | 10 |
2 files changed, 47 insertions, 4 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch b/meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch new file mode 100644 index 0000000000..400b8b0fea --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch | |||
@@ -0,0 +1,41 @@ | |||
1 | From ac9d7d230effdb97870c2f317b3b45449bde1769 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <am.devel@gmail.com> | ||
3 | Date: Wed, 11 Apr 2018 15:40:02 +0800 | ||
4 | Subject: [PATCH] validate: fix template paths when buildir is different | ||
5 | |||
6 | Compilation just fails otherwise because it's not able to locate the files. | ||
7 | |||
8 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=795149] | ||
9 | Signed-off-by: Anuj Mittal <am.devel@gmail.com> | ||
10 | |||
11 | --- | ||
12 | gst/validate/Makefile.am | 7 +++++-- | ||
13 | 1 file changed, 5 insertions(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/gst/validate/Makefile.am b/gst/validate/Makefile.am | ||
16 | index 342730a..3fcc3e5 100644 | ||
17 | --- a/gst/validate/Makefile.am | ||
18 | +++ b/gst/validate/Makefile.am | ||
19 | @@ -48,14 +48,17 @@ source_h = \ | ||
20 | nodist_libgstvalidate_@GST_API_VERSION@_la_SOURCES = $(built_source_make) | ||
21 | nodist_libgstvalidate_@GST_API_VERSION@include_HEADERS = $(built_header_make) | ||
22 | |||
23 | +template_h = $(patsubst %,$(srcdir)/%, gst-validate-enum-types.h.template) | ||
24 | +template_c = $(patsubst %,$(srcdir)/%, gst-validate-enum-types.c.template) | ||
25 | + | ||
26 | gst-validate-enum-types.h: $(source_h) | ||
27 | $(AM_V_GEN)$(GLIB_MKENUMS) \ | ||
28 | - --template gst-validate-enum-types.h.template \ | ||
29 | + --template $(template_h) \ | ||
30 | $^ > gst-validate-enum-types.h | ||
31 | |||
32 | gst-validate-enum-types.c: $(source_h) | ||
33 | $(AM_V_GEN)$(GLIB_MKENUMS) \ | ||
34 | - --template gst-validate-enum-types.c.template \ | ||
35 | + --template $(template_c) \ | ||
36 | $^ > gst-validate-enum-types.c | ||
37 | |||
38 | EXTRA_DIST= \ | ||
39 | -- | ||
40 | 2.7.4 | ||
41 | |||
diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb index 0f2585a459..d12b8f6a0f 100644 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb | |||
@@ -6,11 +6,13 @@ SECTION = "multimedia" | |||
6 | LICENSE = "LGPLv2.1" | 6 | LICENSE = "LGPLv2.1" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" |
8 | 8 | ||
9 | SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz" | 9 | SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz \ |
10 | SRC_URI[md5sum] = "bc074d49677081f9c27de11a09165746" | 10 | file://0001-validate-fix-template-paths-when-buildir-is-differen.patch \ |
11 | SRC_URI[sha256sum] = "f9da9dfe6e5d6f5ba3b38c5752b42d3f927715904942b405c2924d3cb77afba1" | 11 | " |
12 | SRC_URI[md5sum] = "deb8654c912b189388fe585b0fc5bc8f" | ||
13 | SRC_URI[sha256sum] = "33df08bf77f2895d64b7e8a957de3b930b4da0a8edabfbefcff2eab027eeffdf" | ||
12 | 14 | ||
13 | DEPENDS = "json-glib glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" | 15 | DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" |
14 | RRECOMMENDS_${PN} = "git" | 16 | RRECOMMENDS_${PN} = "git" |
15 | 17 | ||
16 | FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" | 18 | FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" |