From 64a27c7f9792126b1ad82571c351c96da6addb02 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 3 May 2018 16:17:54 +0800 Subject: 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. Signed-off-by: Anuj Mittal Signed-off-by: Ross Burton --- ...x-template-paths-when-buildir-is-differen.patch | 41 ++++++++++++++++++++++ .../gstreamer/gst-validate_1.12.4.bb | 23 ------------ .../gstreamer/gst-validate_1.14.0.bb | 25 +++++++++++++ 3 files changed, 66 insertions(+), 23 deletions(-) create mode 100644 meta/recipes-multimedia/gstreamer/gst-validate/0001-validate-fix-template-paths-when-buildir-is-differen.patch delete mode 100644 meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb create mode 100644 meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb (limited to 'meta/recipes-multimedia') 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 @@ +From ac9d7d230effdb97870c2f317b3b45449bde1769 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal +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 + +--- + 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 + diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb deleted file mode 100644 index 0f2585a459..0000000000 --- a/meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Gstreamer validation tool" -DESCRIPTION = "A Tool to test GStreamer components" -HOMEPAGE = "https://gstreamer.freedesktop.org/releases/gst-validate/1.12.3.html" -SECTION = "multimedia" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" - -SRC_URI = "https://gstreamer.freedesktop.org/src/${BPN}/${BP}.tar.xz" -SRC_URI[md5sum] = "bc074d49677081f9c27de11a09165746" -SRC_URI[sha256sum] = "f9da9dfe6e5d6f5ba3b38c5752b42d3f927715904942b405c2924d3cb77afba1" - -DEPENDS = "json-glib glib-2.0 gstreamer1.0 gstreamer1.0-plugins-base" -RRECOMMENDS_${PN} = "git" - -FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" - -inherit pkgconfig gettext autotools gobject-introspection gtk-doc upstream-version-is-even - -# With gtk-doc enabled this recipe fails to build, so forcibly disable it: -# WORKDIR/build/docs/validate/gst-validate-scan: line 117: -# WORKDIR/build/docs/validate/.libs/lt-gst-validate-scan: No such file or directory -GTKDOC_ENABLED = "False" diff --git a/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb new file mode 100644 index 0000000000..d12b8f6a0f --- /dev/null +++ b/meta/recipes-multimedia/gstreamer/gst-validate_1.14.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "Gstreamer validation tool" +DESCRIPTION = "A Tool to test GStreamer components" +HOMEPAGE = "https://gstreamer.freedesktop.org/releases/gst-validate/1.12.3.html" +SECTION = "multimedia" + +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" + +DEPENDS = "json-glib glib-2.0 glib-2.0-native gstreamer1.0 gstreamer1.0-plugins-base" +RRECOMMENDS_${PN} = "git" + +FILES_${PN} += "${datadir}/gstreamer-1.0/* ${libdir}/gst-validate-launcher/* ${libdir}/gstreamer-1.0/*" + +inherit pkgconfig gettext autotools gobject-introspection gtk-doc upstream-version-is-even + +# With gtk-doc enabled this recipe fails to build, so forcibly disable it: +# WORKDIR/build/docs/validate/gst-validate-scan: line 117: +# WORKDIR/build/docs/validate/.libs/lt-gst-validate-scan: No such file or directory +GTKDOC_ENABLED = "False" -- cgit 1.2.3-korg