From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mail.openembedded.org (Postfix) with ESMTP id A2B5374802 for ; Thu, 3 May 2018 08:18:12 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2018 01:18:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,357,1520924400"; d="scan'208";a="55612765" Received: from anmitta2-mobl1.png.intel.com (HELO anmitta2-MOBL1.gar.corp.intel.com) ([10.221.22.40]) by orsmga002.jf.intel.com with ESMTP; 03 May 2018 01:18:13 -0700 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Date: Thu, 3 May 2018 16:17:54 +0800 Message-Id: <20180503081758.4661-8-anuj.mittal@intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180503081758.4661-1-anuj.mittal@intel.com> References: <20180503081758.4661-1-anuj.mittal@intel.com> Subject: [PATCH 08/12] gst-validate: upgrade 1.12.4 -> 1.14.0 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 May 2018 08:18:12 -0000 * For changes, please see: https://gstreamer.freedesktop.org/releases/1.14/. * Patch Makefile to fix compilation errors. Signed-off-by: Anuj Mittal --- ...x-template-paths-when-buildir-is-differen.patch | 41 ++++++++++++++++++++++ ...t-validate_1.12.4.bb => gst-validate_1.14.0.bb} | 10 +++--- 2 files changed, 47 insertions(+), 4 deletions(-) create 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.12.4.bb => gst-validate_1.14.0.bb} (71%) 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.14.0.bb similarity index 71% rename from meta/recipes-multimedia/gstreamer/gst-validate_1.12.4.bb rename to 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" 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" +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 gstreamer1.0 gstreamer1.0-plugins-base" +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/*" -- 2.14.1