diff options
| author |   Andre McCurdy <armccurdy@gmail.com> | 2016-01-18 17:29:17 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:41 +0000 |
| commit | 91ac8a8aec76208d468586b6f42d2379675071be (patch) | |
| tree | aa5e48130d988bb8b15dcaa4fecbe4fd9899b3e7 /meta/recipes-multimedia/gstreamer | |
| parent | c4a5b8d7c9a78a29d080b15f049df5a1fba3c4eb (diff) | |
| download | openembedded-core-contrib-91ac8a8aec76208d468586b6f42d2379675071be.tar.gz | |
gstreamer1.0-plugins-good: minor formatting improvements
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer')
3 files changed, 21 insertions, 22 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index 3d17497df8..e79da9e796 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc @@ -2,53 +2,52 @@ require gstreamer1.0-plugins.inc LICENSE = "GPLv2+ & LGPLv2.1+" -# libid3tag -DEPENDS += "gstreamer1.0-plugins-base zlib bzip2 libcap" +DEPENDS += "gstreamer1.0-plugins-base libcap zlib bzip2" inherit gettext - PACKAGECONFIG ??= " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ - orc cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 \ - " + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + cairo flac gdk-pixbuf gudev jpeg libpng orc soup speex taglib v4l2 \ +" X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" -PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}" -PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" + PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" +PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394" PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf" PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev" -PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng" +PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,libv4l2" +PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" +PACKAGECONFIG[v4l2] = "--enable-gst_v4l2,--disable-gst_v4l2" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" -PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394" -PACKAGECONFIG[v4l2] = "--enable-gst_v4l2,--disable-gst_v4l2" +PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}" EXTRA_OECONF += " \ + --enable-bz2 \ --enable-oss \ --enable-zlib \ - --enable-bz2 \ - --disable-directsound \ - --disable-waveform \ - --disable-oss4 \ - --disable-sunaudio \ - --disable-osx_audio \ - --disable-osx_video \ --disable-aalib \ --disable-aalibtest \ + --disable-directsound \ + --disable-examples \ --disable-libcaca \ --disable-libdv \ + --disable-oss4 \ + --disable-osx_audio \ + --disable-osx_video \ --disable-shout2 \ - --disable-examples \ + --disable-sunaudio \ + --disable-waveform \ " FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb index 92ebe1da42..022cfd2790 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.2.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch" + SRC_URI[md5sum] = "ef4f5bc4f31f706832a234b0f603967b" SRC_URI[sha256sum] = "876e54dfce93274b98e024f353258d35fa4d49d1f9010069e676c530f6eb6a92" diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb index 2c0e0efe68..d60eaffc2f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb @@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" -S = "${WORKDIR}/git" - SRCREV = "fd0123800c8c1cf1468c0fa5d592ad0d0d8b4140" +S = "${WORKDIR}/git" + do_configure_prepend() { cd ${S} ./autogen.sh --noconfigure cd ${B} } - |