From 1d6e61a85688a06edaa54a1c7f81da22896a47ba Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Mon, 18 Jan 2016 17:29:51 -0800 Subject: gstreamer1.0-plugins-ugly: minor formatting improvements (From OE-Core rev: fb839d7c244b53e555d02cad747617aacf63d1a3) Signed-off-by: Andre McCurdy Signed-off-by: Richard Purdie --- .../gstreamer/gstreamer1.0-plugins-ugly.inc | 14 ++++++-------- .../gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb | 3 +-- .../gstreamer/gstreamer1.0-plugins-ugly_git.bb | 7 +++---- 3 files changed, 10 insertions(+), 14 deletions(-) (limited to 'meta/recipes-multimedia') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc index eb49e2220e..869022a2d2 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc @@ -7,26 +7,24 @@ DEPENDS += "gstreamer1.0-plugins-base libid3tag" inherit gettext - PACKAGECONFIG ??= " \ - orc a52dec lame mad mpeg2dec \ - " + a52dec lame mad mpeg2dec orc \ +" 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[lame] = "--enable-lame,--disable-lame,lame" PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264" -PACKAGECONFIG[amrnb] = "--enable-amrnb,--disable-amrnb,opencore-amr" -PACKAGECONFIG[amrwb] = "--enable-amrwb,--disable-amrwb,opencore-amr" - EXTRA_OECONF += " \ --disable-sidplay \ --disable-twolame \ - " +" -FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" FILES_${PN}-amrnb += "${datadir}/gstreamer-1.0/presets/GstAmrnbEnc.prs" +FILES_${PN}-x264 += "${datadir}/gstreamer-1.0/presets/GstX264Enc.prs" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb index 67b72fa7f9..d935f6dfbd 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.6.2.bb @@ -1,10 +1,9 @@ include gstreamer1.0-plugins-ugly.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " + file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" SRC_URI[md5sum] = "0f0e30336e3155443cd5bfec5c215d56" SRC_URI[sha256sum] = "e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9845" S = "${WORKDIR}/gst-plugins-ugly-${PV}" - diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb index dcf5ffc3c1..e06b5ea285 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_git.bb @@ -3,15 +3,14 @@ DEFAULT_PREFERENCE = "-1" include gstreamer1.0-plugins-ugly.inc LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ - file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068 " - -S = "${WORKDIR}/git" + file://tests/check/elements/xingmux.c;beginline=1;endline=21;md5=4c771b8af188724855cb99cadd390068" SRCREV = "06b8ac10cee85c5c304ca320997aa8f44295a66f" +S = "${WORKDIR}/git" + do_configure_prepend() { cd ${S} ./autogen.sh --noconfigure cd ${B} } - -- cgit 1.2.3-korg