summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorCarlos Rafael Giani <dv@pseudoterminal.org>2015-11-05 09:32:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-16 11:39:35 +0000
commitba1bc6335bd3a28b49e293687e06799f4bd949c6 (patch)
treefa0e1f8d95158b9a29a02b7cfe93635658e0da3c /meta/recipes-multimedia/gstreamer
parent4a55d12f640410fae25fec76ddf037c208abdaf9 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc13
-rwxr-xr-xmeta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch25
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.1.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb)8
3 files changed, 8 insertions, 38 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
17X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage" 17X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
18X11ENABLEOPTS = "--enable-x --enable-xshm" 18PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}"
19X11DISABLEOPTS = "--disable-x --disable-xshm"
20PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
21PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" 19PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
22PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo" 20PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo"
23PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac" 21PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac"
@@ -31,14 +29,13 @@ PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
31PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib" 29PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib"
32PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx" 30PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx"
33PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack" 31PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack"
34 32PACKAGECONFIG[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
39EXTRA_OECONF += " \ 34EXTRA_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
57FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs" 54FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch
deleted file mode 100755
index 288631bf76..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/decrease_asteriskh263_rank.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1commit d71d74daac8ed54156ed103958ab455c63c72b0e
2Author: Song Bing <b06498@freescale.com>
3Date: Mon Nov 10 11:25:47 2014 +0800
4
5[asteriskh263] decrease the rank as we havn't this kind of decoder.
6
7Decrease the rank as we havn't this kind of decoder.
8
9https://bugzilla.gnome.org/show_bug.cgi?id=739935
10
11Upstream-Status: Pending
12
13Signed-off-by: Song Bing <b06498@freescale.com>
14
15diff --git a/gst/rtp/gstasteriskh263.c b/gst/rtp/gstasteriskh263.c
16index a01fbc8..8fa3194 100644
17--- a/gst/rtp/gstasteriskh263.c
18+++ b/gst/rtp/gstasteriskh263.c
19@@ -226,5 +226,5 @@ gboolean
20 gst_asteriskh263_plugin_init (GstPlugin * plugin)
21 {
22 return gst_element_register (plugin, "asteriskh263",
23- GST_RANK_SECONDARY, GST_TYPE_ASTERISK_H263);
24+ GST_RANK_SECONDARY - 1, GST_TYPE_ASTERISK_H263);
25 }
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.1.bb
index 943ab60397..2b7ec7a093 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.4.5.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.6.1.bb
@@ -4,10 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \ 4 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607 \
5 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" 5 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
6 6
7SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch \ 7SRC_URI += "file://0001-gstrtpmp4gpay-set-dafault-value-for-MPEG4-without-co.patch"
8 file://decrease_asteriskh263_rank.patch \ 8SRC_URI[md5sum] = "a930f5ff133f17baf39d2876628b7890"
9" 9SRC_URI[sha256sum] = "86d4b814099f7b7b16be19d4b94fa41002ac01fdf1525b07c5764d54c0605935"
10SRC_URI[md5sum] = "eaf1a6daf73749bc423feac301d60038"
11SRC_URI[sha256sum] = "79b1b5f3f7bcaa8a615202eb5e176121eeb8336960f70687e536ad78dbc7e641"
12 10
13S = "${WORKDIR}/gst-plugins-good-${PV}" 11S = "${WORKDIR}/gst-plugins-good-${PV}"