Various fixesdebian/1.2.0-2

* debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch:
  + Fix compilation on big endian systems.
* debian/build-deps.in:
  + Tighten build dependency on libopenal-dev to >= 1:1.14 (Closes: #724669).

6 files changed, 52 insertions, 3 deletions

diff --git a/debian/build-deps b/debian/build-deps
index 6bf29d30..a9cd4b3d 100644
--- a/debian/build-deps
+++ b/debian/build-deps
@@ -45,7 +45,7 @@ libmodplug-dev
 libmpcdec-dev
 libmpg123-dev (>= 1.13)
 libofa0-dev (>= 0.9.3)
-libopenal-dev
+libopenal-dev (>= 1:1.14)
 libopencv-dev (>= 2.0.0)
 libopenjpeg-dev
 libopus-dev (>= 0.9.4)
diff --git a/debian/build-deps.in b/debian/build-deps.in
index 88d97c40..73de1c17 100644
--- a/debian/build-deps.in
+++ b/debian/build-deps.in
@@ -55,7 +55,7 @@ libcurl4-gnutls-dev (>= 7.21.0)
 libxvidcore-dev
 libvo-aacenc-dev
 libvo-amrwbenc-dev
-libopenal-dev
+libopenal-dev (>= 1:1.14)
 libzvbi-dev
 libspandsp-dev
 libopus-dev (>= 0.9.4)
diff --git a/debian/changelog b/debian/changelog
index 96ddbb18..f2265e47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gst-plugins-bad1.0 (1.2.0-2) unstable; urgency=low
+
+  * debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch:
+    + Fix compilation on big endian systems.
+  * debian/build-deps.in:
+    + Tighten build dependency on libopenal-dev to >= 1:1.14 (Closes: #724669).
+
+ -- Sebastian Dröge <slomo@debian.org>  Thu, 26 Sep 2013 15:02:54 +0200
+
 gst-plugins-bad1.0 (1.2.0-1) unstable; urgency=low
 
   * New upstream stable release:
diff --git a/debian/control b/debian/control
index cb714f00..780a0a51 100644
--- a/debian/control
+++ b/debian/control
@@ -55,7 +55,7 @@ Build-Depends: autoconf (>= 2.62),
                libmpcdec-dev,
                libmpg123-dev (>= 1.13),
                libofa0-dev (>= 0.9.3),
-               libopenal-dev,
+               libopenal-dev (>= 1:1.14),
                libopencv-dev (>= 2.0.0),
                libopenjpeg-dev,
                libopus-dev (>= 0.9.4),
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
new file mode 100644
index 00000000..4547788d
--- /dev/null
+++ b/debian/patches/0001-bluez-Fix-compilation-on-big-endian-systems.patch
@@ -0,0 +1,39 @@
+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 d02a58f9..712d4716 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_fix-modplug-linking.patch
 99_ltmain_as-needed.patch
+0001-bluez-Fix-compilation-on-big-endian-systems.patch