From 6e25fcfe56248bef9881c0a81236ccd7c6331681 Mon Sep 17 00:00:00 2001 From: Carlos Rafael Giani Date: Sun, 12 Jan 2020 14:59:48 +0100 Subject: gstreamer1.0-plugins-ugly: Transition to meson based builds * Removed autotools/M4 related patch 0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch. * gettext handling now part of gstreamer1.0-plugins-common.inc. Signed-off-by: Carlos Rafael Giani Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb index ecab318899..30961d0e02 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.16.1.bb @@ -1,4 +1,4 @@ -require gstreamer1.0-plugins.inc +require gstreamer1.0-plugins-common.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" @@ -8,7 +8,6 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://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] = "668795903cb4971fba9aa89abdea8369" SRC_URI[sha256sum] = "4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d" @@ -17,23 +16,23 @@ S = "${WORKDIR}/gst-plugins-ugly-${PV}" DEPENDS += "gstreamer1.0-plugins-base" -inherit gettext +GST_PLUGIN_SET_HAS_EXAMPLES = "0" PACKAGECONFIG ??= " \ ${GSTREAMER_ORC} \ a52dec mpeg2dec \ " -PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52" -PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" -PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" -PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio" -PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread" -PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" -PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" +PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52" +PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr" +PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr" +PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio" +PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread" +PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec" +PACKAGECONFIG[x264] = "-Dx264=enabled,-Dx264=disabled,x264" -EXTRA_OECONF += " \ - --disable-sidplay \ +EXTRA_OEMESON += " \ + -Dsidplay=disabled \ " FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" -- cgit 1.2.3-korg