summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/gstreamer
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-01-03 09:14:34 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-06 22:17:31 +0000
commit89c3875bf7c208c841179cfaf106dd22fe90d474 (patch)
treebc014f05a66493d422927ef25e4ed8bd0c1d3f70 /meta/recipes-multimedia/gstreamer
parent0faeea05190416983a06f8ab9ce3e7c5c389e197 (diff)
downloadpoky-89c3875bf7c208c841179cfaf106dd22fe90d474.tar.gz
gstreamer1.0-plugins-bad: upgrade to 1.2.2
bluez-fix-compilation-on-big-endian-systems.patch removed, included in upstream. (From OE-Core rev: 44f3a507626d7208caffa18663dd8efab4142bb3) Signed-off-by: Cristian Iorga <cristian.iorga@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-bad/bluez-fix-compilation-on-big-endian-systems.patch35
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.2.bb (renamed from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.0.bb)6
2 files changed, 2 insertions, 39 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/bluez-fix-compilation-on-big-endian-systems.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/bluez-fix-compilation-on-big-endian-systems.patch
deleted file mode 100644
index 6299a475ab..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/bluez-fix-compilation-on-big-endian-systems.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1commit 1ab90f259fee4fa9a7c10dac0a1e85799a15881b
2Author: Sebastian Dröge <slomo@circular-chaos.org>
3Date: Wed Sep 25 20:25:03 2013 +0200
4
5 bluez: Fix compilation on big endian systems
6
7Upstream-Status: Backport
8
9diff --git a/sys/bluez/gstavdtputil.c b/sys/bluez/gstavdtputil.c
10index dea803a..ed5c276 100644
11--- a/sys/bluez/gstavdtputil.c
12+++ b/sys/bluez/gstavdtputil.c
13@@ -611,11 +611,11 @@ gst_avdtp_util_parse_aac_raw (void *config)
14 GValue value = G_VALUE_INIT;
15 GValue value_str = G_VALUE_INIT;
16 GValue list = G_VALUE_INIT;
17+ a2dp_aac_t aac_local = { 0 };
18+ a2dp_aac_t *aac = &aac_local;
19
20 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
21 uint8_t *raw = (uint8_t *) config;
22- a2dp_aac_t aac_local = { 0 };
23- a2dp_aac_t *aac = &aac_local;
24 aac->object_type = raw[0];
25 aac->frequency = (raw[1] << 4) | ((raw[2] & 0xFF) >> 4);
26 aac->channels = (raw[2] >> 2) & 0x3;
27@@ -624,7 +624,7 @@ gst_avdtp_util_parse_aac_raw (void *config)
28 aac->bitrate = (raw[4] << 16) | (raw[3] << 8) | raw[4];
29 aac->bitrate &= ~0x800000;
30 #elif G_BYTE_ORDER == G_BIG_ENDIAN
31- *aac = (a2dp_aac_t *) config;
32+ *aac = *((a2dp_aac_t *) config);
33 #else
34 #error "Unknown byte order"
35 #endif
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.2.bb
index d9e3b487df..da711702a3 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.0.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.2.bb
@@ -5,10 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
5 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \ 5 file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \
6 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50" 6 file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50"
7 7
8SRC_URI[md5sum] = "4fd078e1b9d903d22b67872b616f1715" 8SRC_URI[md5sum] = "d519b7e8e570c4a22d6b79f2ab89765c"
9SRC_URI[sha256sum] = "a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa" 9SRC_URI[sha256sum] = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c"
10
11SRC_URI += "file://bluez-fix-compilation-on-big-endian-systems.patch"
12 10
13S = "${WORKDIR}/gst-plugins-bad-${PV}" 11S = "${WORKDIR}/gst-plugins-bad-${PV}"
14 12