1 files changed, 11 insertions, 12 deletions
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[a52dec]   = "-Da52dec=enabled,-Da52dec=disabled,liba52"
-PACKAGECONFIG[amrnb]    = "--enable-amrnb,--disable-amrnb,opencore-amr"
+PACKAGECONFIG[amrnb]    = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
-PACKAGECONFIG[amrwb]    = "--enable-amrwb,--disable-amrwb,opencore-amr"
+PACKAGECONFIG[amrwb]    = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr"
-PACKAGECONFIG[cdio]     = "--enable-cdio,--disable-cdio,libcdio"
+PACKAGECONFIG[cdio]     = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
-PACKAGECONFIG[dvdread]  = "--enable-dvdread,--disable-dvdread,libdvdread"
+PACKAGECONFIG[dvdread]  = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
-PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
+PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
-PACKAGECONFIG[x264]     = "--enable-x264,--disable-x264,x264"
+PACKAGECONFIG[x264]     = "-Dx264=enabled,-Dx264=disabled,x264"
-EXTRA_OECONF += " \
+EXTRA_OEMESON += " \
-    --disable-sidplay \
+    -Dsidplay=disabled \
 "
 FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"

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 @@
1	require gstreamer1.0-plugins.inc	1	require gstreamer1.0-plugins-common.inc
2		2
3	LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \	3	LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
4	file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068"	4	file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068"
@@ -8,7 +8,6 @@ LICENSE_FLAGS = "commercial"
8		8
9	SRC_URI = " \	9	SRC_URI = " \
10	https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \	10	https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${PV}.tar.xz \
11	file://0001-introspection.m4-prefix-pkgconfig-paths-with-PKG_CON.patch \
12	"	11	"
13	SRC_URI[md5sum] = "668795903cb4971fba9aa89abdea8369"	12	SRC_URI[md5sum] = "668795903cb4971fba9aa89abdea8369"
14	SRC_URI[sha256sum] = "4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d"	13	SRC_URI[sha256sum] = "4bf913b2ca5195ac3b53b5e3ade2dc7c45d2258507552ddc850c5fa425968a1d"
@@ -17,23 +16,23 @@ S = "${WORKDIR}/gst-plugins-ugly-${PV}"
17		16
18	DEPENDS += "gstreamer1.0-plugins-base"	17	DEPENDS += "gstreamer1.0-plugins-base"
19		18
20	inherit gettext	19	GST_PLUGIN_SET_HAS_EXAMPLES = "0"
21		20
22	PACKAGECONFIG ??= " \	21	PACKAGECONFIG ??= " \
23	${GSTREAMER_ORC} \	22	${GSTREAMER_ORC} \
24	a52dec mpeg2dec \	23	a52dec mpeg2dec \
25	"	24	"
26		25
27	PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52"	26	PACKAGECONFIG[a52dec] = "-Da52dec=enabled,-Da52dec=disabled,liba52"
28	PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr"	27	PACKAGECONFIG[amrnb] = "-Damrnb=enabled,-Damrnb=disabled,opencore-amr"
29	PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr"	28	PACKAGECONFIG[amrwb] = "-Damrwbdec=enabled,-Damrwbdec=disabled,opencore-amr"
30	PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio"	29	PACKAGECONFIG[cdio] = "-Dcdio=enabled,-Dcdio=disabled,libcdio"
31	PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread"	30	PACKAGECONFIG[dvdread] = "-Ddvdread=enabled,-Ddvdread=disabled,libdvdread"
32	PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"	31	PACKAGECONFIG[mpeg2dec] = "-Dmpeg2dec=enabled,-Dmpeg2dec=disabled,mpeg2dec"
33	PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264"	32	PACKAGECONFIG[x264] = "-Dx264=enabled,-Dx264=disabled,x264"
34		33
35	EXTRA_OECONF += " \	34	EXTRA_OEMESON += " \
36	--disable-sidplay \	35	-Dsidplay=disabled \
37	"	36	"
38		37
39	FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"	38	FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs"