meta-gstreamer ships its own inc files (as it should). Ross
On 3 May 2018 at 23:49, Khem Raj <[email protected]> wrote: > > On Thu, May 3, 2018 at 1:18 AM Anuj Mittal <[email protected]> wrote: > >> * For changes, please see: https://gstreamer.freedesktop. >> org/releases/1.14/ >> * Merge inc and bb file since we only have one version now. > > > Threre is meta gstreamer can you check if this is not going to affect that > layer > >> >> >> Signed-off-by: Anuj Mittal <[email protected]> >> --- >> meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb | 14 >> -------------- >> .../gstreamer/{gstreamer1.0.inc => gstreamer1.0_1.14.0.bb} | 12 >> +++++++++++- >> 2 files changed, 11 insertions(+), 15 deletions(-) >> delete mode 100644 meta/recipes-multimedia/gstreamer/ >> gstreamer1.0_1.12.4.bb >> rename meta/recipes-multimedia/gstreamer/{gstreamer1.0.inc => >> gstreamer1.0_1.14.0.bb} (84%) >> >> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >> b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >> deleted file mode 100644 >> index 01b2396513..0000000000 >> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.12.4.bb >> +++ /dev/null >> @@ -1,14 +0,0 @@ >> -require gstreamer1.0.inc >> - >> -LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d >> \ >> - file://gst/gst.h;beginline=1;endline=21;md5= >> e059138481205ee2c6fc1c079c016d0d" >> - >> -SRC_URI = " \ >> - http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${ >> PV}.tar.xz \ >> -" >> -SRC_URI[md5sum] = "9d268f2e891cce1ac0832f1cc467d4ea" >> -SRC_URI[sha256sum] = "5a8704aa4c2eeb04da192c4a9942f9 >> 4f860ac1a585de90d9f914bac26a970674" >> - >> -S = "${WORKDIR}/gstreamer-${PV}" >> - >> -CVE_PRODUCT = "gstreamer" >> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >> b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >> similarity index 84% >> rename from meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >> rename to meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >> index c2df1f3258..b4398c8111 100644 >> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0.inc >> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.14.0.bb >> @@ -14,11 +14,19 @@ inherit autotools pkgconfig gettext >> upstream-version-is-even gobject-introspecti >> # (it has a custom INTROSPECTION_INIT macro, and so must be used instead >> of our common introspection.m4 file) >> acpaths = "-I ${S}/common/m4 -I ${S}/m4" >> >> -SRC_URI_append = " \ >> +LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d >> \ >> + file://gst/gst.h;beginline=1;endline=21;md5= >> e059138481205ee2c6fc1c079c016d0d" >> + >> +S = "${WORKDIR}/gstreamer-${PV}" >> + >> +SRC_URI = " \ >> + http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${ >> PV}.tar.xz \ >> 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 >> \ >> " >> +SRC_URI[md5sum] = "63c7cbfb86aa28c4522e374dc5555b96" >> +SRC_URI[sha256sum] = "fc361367f0d4b780a868a8833f9f30 >> b9c9f4ac9faea4e6b251db8b4b0398466e" >> >> PACKAGECONFIG ??= "" >> >> @@ -59,3 +67,5 @@ do_configure[prefuncs] += "delete_pkg_m4_file" >> do_compile_prepend() { >> export GIR_EXTRA_LIBS_PATH="${B}/gst/.libs:${B}/libs/gst/base/. >> libs" >> } >> + >> +CVE_PRODUCT = "gstreamer" >> -- >> 2.14.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> [email protected] >> http://lists.openembedded.org/mailman/listinfo/openembedded-core >> > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core > >
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
