diff options
author | Carlos Rafael Giani <dv@pseudoterminal.org> | 2015-11-05 09:32:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-16 11:39:35 +0000 |
commit | ba1bc6335bd3a28b49e293687e06799f4bd949c6 (patch) | |
tree | fa0e1f8d95158b9a29a02b7cfe93635658e0da3c /meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | |
parent | 4a55d12f640410fae25fec76ddf037c208abdaf9 (diff) | |
download | poky-ba1bc6335bd3a28b49e293687e06799f4bd949c6.tar.gz |
gstreamer1.0-plugins-good: upgrade to version 1.6.1
decrease_asteriskh263_rank.patch no longer applies, and is obsolete, since
the asteriskh263 rank has been set to NONE in upstream.
Also, --enable-xshm is no longer part of the configure options.
(From OE-Core rev: 9f0b3251bfab84369b2d4568816254bd968afca0)
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc index 6e316de9f2..1119e10846 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc | |||
@@ -15,9 +15,7 @@ PACKAGECONFIG ??= " \ | |||
15 | " | 15 | " |
16 | 16 | ||
17 | X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" | 17 | X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" |
18 | X11ENABLEOPTS = "--enable-x --enable-xshm" | 18 | PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}" |
19 | X11DISABLEOPTS = "--disable-x --disable-xshm" | ||
20 | PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}" | ||
21 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" | 19 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" |
22 | PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" | 20 | PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" |
23 | PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" | 21 | PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" |
@@ -31,14 +29,13 @@ PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" | |||
31 | PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" | 29 | PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" |
32 | PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" | 30 | PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" |
33 | PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" | 31 | PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" |
34 | 32 | PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394" | |
35 | # the 1394 plugins require both libraw1394 and libiec61883 | ||
36 | # the former is included in meta-oe, the latter isn't | ||
37 | # -> disabled | ||
38 | 33 | ||
39 | EXTRA_OECONF += " \ | 34 | EXTRA_OECONF += " \ |
40 | --enable-oss \ | 35 | --enable-oss \ |
41 | --enable-gst_v4l2 \ | 36 | --enable-gst_v4l2 \ |
37 | --enable-zlib \ | ||
38 | --enable-bz2 \ | ||
42 | --without-libv4l2 \ | 39 | --without-libv4l2 \ |
43 | --disable-directsound \ | 40 | --disable-directsound \ |
44 | --disable-waveform \ | 41 | --disable-waveform \ |
@@ -47,11 +44,11 @@ EXTRA_OECONF += " \ | |||
47 | --disable-osx_audio \ | 44 | --disable-osx_audio \ |
48 | --disable-osx_video \ | 45 | --disable-osx_video \ |
49 | --disable-aalib \ | 46 | --disable-aalib \ |
47 | --disable-aalibtest \ | ||
50 | --disable-libcaca \ | 48 | --disable-libcaca \ |
51 | --disable-libdv \ | 49 | --disable-libdv \ |
52 | --disable-shout2 \ | 50 | --disable-shout2 \ |
53 | --disable-examples \ | 51 | --disable-examples \ |
54 | --disable-dv1394 \ | ||
55 | " | 52 | " |
56 | 53 | ||
57 | FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" | 54 | FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" |