summaryrefslogtreecommitdiff
path: root/meta
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 16:30:01 +0000
commit44f3a507626d7208caffa18663dd8efab4142bb3 (patch)
tree64eae0fceb307468e09df3e6d7f5c1581ddbaa26 /meta
parent73f1b5ca4624231c2fd81a22e69d2e79320cb0b6 (diff)
downloadopenembedded-core-44f3a507626d7208caffa18663dd8efab4142bb3.tar.gz
openembedded-core-44f3a507626d7208caffa18663dd8efab4142bb3.tar.bz2
openembedded-core-44f3a507626d7208caffa18663dd8efab4142bb3.zip
gstreamer1.0-plugins-bad: upgrade to 1.2.2
bluez-fix-compilation-on-big-endian-systems.patch removed, included in upstream. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 @@
-commit 1ab90f259fee4fa9a7c10dac0a1e85799a15881b
-Author: Sebastian Dröge <slomo@circular-chaos.org>
-Date: Wed Sep 25 20:25:03 2013 +0200
-
- bluez: Fix compilation on big endian systems
-
-Upstream-Status: Backport
-
-diff --git a/sys/bluez/gstavdtputil.c b/sys/bluez/gstavdtputil.c
-index dea803a..ed5c276 100644
---- a/sys/bluez/gstavdtputil.c
-+++ b/sys/bluez/gstavdtputil.c
-@@ -611,11 +611,11 @@ gst_avdtp_util_parse_aac_raw (void *config)
- GValue value = G_VALUE_INIT;
- GValue value_str = G_VALUE_INIT;
- GValue list = G_VALUE_INIT;
-+ a2dp_aac_t aac_local = { 0 };
-+ a2dp_aac_t *aac = &aac_local;
-
- #if G_BYTE_ORDER == G_LITTLE_ENDIAN
- uint8_t *raw = (uint8_t *) config;
-- a2dp_aac_t aac_local = { 0 };
-- a2dp_aac_t *aac = &aac_local;
- aac->object_type = raw[0];
- aac->frequency = (raw[1] << 4) | ((raw[2] & 0xFF) >> 4);
- aac->channels = (raw[2] >> 2) & 0x3;
-@@ -624,7 +624,7 @@ gst_avdtp_util_parse_aac_raw (void *config)
- aac->bitrate = (raw[4] << 16) | (raw[3] << 8) | raw[4];
- aac->bitrate &= ~0x800000;
- #elif G_BYTE_ORDER == G_BIG_ENDIAN
-- *aac = (a2dp_aac_t *) config;
-+ *aac = *((a2dp_aac_t *) config);
- #else
- #error "Unknown byte order"
- #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 \
file://COPYING.LIB;md5=21682e4e8fea52413fd26c60acb907e5 \
file://gst/tta/crc32.h;beginline=12;endline=29;md5=27db269c575d1e5317fffca2d33b3b50"
-SRC_URI[md5sum] = "4fd078e1b9d903d22b67872b616f1715"
-SRC_URI[sha256sum] = "a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa"
-
-SRC_URI += "file://bluez-fix-compilation-on-big-endian-systems.patch"
+SRC_URI[md5sum] = "d519b7e8e570c4a22d6b79f2ab89765c"
+SRC_URI[sha256sum] = "63e78db11b482d0529a0bde01e2ac23fd32c7cb99a5508b53ee4ca1051871b2c"
S = "${WORKDIR}/gst-plugins-bad-${PV}"