diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2013-11-09 17:11:57 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2013-11-09 17:11:57 +0100 |
| commit | c77493453cf2ed5288692360e29ff40166d7eb30 (patch) | |
| tree | 1e1ab6783678e93cba68be0400657fa149b7fd88 | |
| parent | f0a4c07fa103a4eca4805dad3fbe6fa9977598da (diff) | |
Drop patches merged upstreamdebian/1.2.1-1
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch | 39 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 4 insertions, 42 deletions
diff --git a/debian/changelog b/debian/changelog index fc3d227a..3997736f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,11 @@ gst-plugins-bad1.0 (1.2.1-1) unstable; urgency=low * Turn versioned Conflicts into Breaks to simplify lockstep upgrades. [ Sebastian Dröge ] - * New upstream bugfix release. + * New upstream bugfix release: + + debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch: + - Dropped, merged upstream. - -- Fabian Greffrath <fabian+debian@greffrath.com> Thu, 24 Oct 2013 09:50:13 +0200 + -- Sebastian Dröge <slomo@debian.org> Sat, 09 Nov 2013 17:10:09 +0100 gst-plugins-bad1.0 (1.2.0-4) unstable; urgency=low diff --git a/debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch b/debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch deleted file mode 100644 index 4547788d..00000000 --- a/debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1ab90f259fee4fa9a7c10dac0a1e85799a15881b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org> -Date: Wed, 25 Sep 2013 20:25:03 +0200 -Subject: [PATCH] bluez: Fix compilation on big endian systems - ---- - sys/bluez/gstavdtputil.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -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 --- -1.8.4 - diff --git a/debian/patches/series b/debian/patches/series index 712d4716..d02a58f9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ 01_fix-modplug-linking.patch 99_ltmain_as-needed.patch -0001-bluez-Fix-compilation-on-big-endian-systems.patch |