diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-07 18:10:48 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-07 18:10:48 +0100 |
commit | 61733e7ff1a756e9325154d9d52cdcdeb27d9097 (patch) | |
tree | a0f842807088c4986fb918be0de70bac3f18ea04 /extra/bluez | |
parent | 42badd081241c57a3b9bbd7a18dec85e64038314 (diff) | |
parent | 5a680f7689b01b4b7a0bfade1a6c1f659f8cbed4 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bin2iso/PKGBUILD
community/espeak/PKGBUILD
community/gnash/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haskell-binary/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/kmess/PKGBUILD
community/libident/PKGBUILD
community/lwm/PKGBUILD
core/dialog/PKGBUILD
core/gcc/PKGBUILD
core/libtool/PKGBUILD
core/ppl/PKGBUILD
extra/boost/PKGBUILD
extra/dnsmasq/PKGBUILD
extra/ghc/PKGBUILD
extra/haskell-html/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-quickcheck/PKGBUILD
extra/haskell-regex-base/PKGBUILD
extra/haskell-regex-compat/PKGBUILD
extra/haskell-regex-posix/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/pekwm/PKGBUILD
extra/soprano/PKGBUILD
extra/udisks/PKGBUILD
multilib-testing/lib32-libpciaccess/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
multilib/lib32-glibc/glibc-2.15-ifunc.patch
multilib/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
multilib/lib32-glibc/glibc-2.15-scanf.patch
multilib/libtool-multilib/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/libpciaccess/PKGBUILD
testing/mkinitcpio-busybox/PKGBUILD
testing/xorg-server/PKGBUILD
Diffstat (limited to 'extra/bluez')
-rw-r--r-- | extra/bluez/PKGBUILD | 28 | ||||
-rw-r--r-- | extra/bluez/fix-compile-issue.patch | 50 |
2 files changed, 66 insertions, 12 deletions
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD index 565602ac1..a238c1f23 100644 --- a/extra/bluez/PKGBUILD +++ b/extra/bluez/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150898 2012-02-23 13:54:59Z allan $ -# Maintainer: +# $Id: PKGBUILD 152235 2012-03-05 13:54:25Z andrea $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> pkgname=bluez pkgver=4.98 -pkgrel=3 +pkgrel=4 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/" arch=('i686' 'x86_64' 'mips64el') @@ -13,28 +13,32 @@ license=('GPL2') depends=('dbus-core') makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile') optdepends=("gstreamer0.10-base: bluetooth GStreamer support" - "alsa-lib: Audio bluetooth devices support" - "dbus-python: to run bluez-simple-agent" - "pygobject: to run bluez-simple-agent" - "libusb-compat: USB adapters support" - "cups: CUPS backend") + "alsa-lib: Audio bluetooth devices support" + "dbus-python: to run bluez-simple-agent" + "pygobject: to run bluez-simple-agent" + "libusb-compat: USB adapters support" + "cups: CUPS backend") conflicts=('bluez-libs' 'bluez-utils') provides=('bluez-libs' 'bluez-utils') replaces=('bluez-libs' 'bluez-utils') -options=('!libtool' 'emptydirs') +options=('!libtool') backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf 'etc/conf.d/bluetooth' 'etc/dbus-1/system.d/bluetooth.conf') source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2" - 'bluetooth.conf.d' 'rc.bluetooth' 'fix-a2dp.patch') + 'bluetooth.conf.d' 'rc.bluetooth' + 'fix-a2dp.patch' + 'fix-compile-issue.patch') md5sums=('4aca8a0929250212e9a75fb60dd75b05' '7412982b440f29fa7f76a41a87fef985' '8f9498707f809506928b2e480d3b6789' - 'd6a34317e56b7c2bd990791d89d6c3cb') + 'd6a34317e56b7c2bd990791d89d6c3cb' + 'd81860cd0d7c3ddd2515591453a85e65') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix-a2dp.patch" + patch -p1 -i "${srcdir}/fix-a2dp.patch" + patch -p1 -i "${srcdir}/fix-compile-issue.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/bluez/fix-compile-issue.patch b/extra/bluez/fix-compile-issue.patch new file mode 100644 index 000000000..ddb5d94e8 --- /dev/null +++ b/extra/bluez/fix-compile-issue.patch @@ -0,0 +1,50 @@ +From 4002cf271e3939714296c535a1ed8d4f0d5ac005 Mon Sep 17 00:00:00 2001 +From: Patrick Ohly <patrick.ohly@intel.com> +Date: Mon, 16 Jan 2012 11:11:55 +0100 +Subject: [PATCH] lib: Fix compile issue when using in C++ +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +The compiler error is: + /usr/include/bluetooth/bluetooth.h::131:9:âerror:âinvalidâconversion fromâ'void*'âtoâ'bt_get_le64(void*)::<anonymousâstruct>*' + ... + +The reason is that C++, in contrast to C, does not allow conversion of +void * to anything, and this code gets compiled as C++ when the app is +written in C++. The macro with the assignment itself is older, but only +recent Bluez starts to use it in inline functions, thus triggering the +problem. + +This patch keeps the "struct __attribute__((packed))" magic and merely +changes the typecast so that it works in C and C++. Like the existing +macro this patch relies on support for typeof. +--- + lib/bluetooth.h | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/bluetooth.h b/lib/bluetooth.h +index ea7373d..0541842 100644 +--- a/lib/bluetooth.h ++++ b/lib/bluetooth.h +@@ -141,7 +141,7 @@ enum { + ({ \ + struct __attribute__((packed)) { \ + typeof(*(ptr)) __v; \ +- } *__p = (void *) (ptr); \ ++ } *__p = (typeof(__p)) (ptr); \ + __p->__v; \ + }) + +@@ -149,7 +149,7 @@ enum { + do { \ + struct __attribute__((packed)) { \ + typeof(*(ptr)) __v; \ +- } *__p = (void *) (ptr); \ ++ } *__p = (typeof(__p)) (ptr); \ + __p->__v = (val); \ + } while(0) + +-- +1.7.6.5 + |