commit e675601fc4cfbc5efcf9f63beaef28084c23ce94 Author: Danny Rawlins <monster.romster@gmail.com> Date: Sun Feb 25 17:10:35 2018 +1100 bluez: fix patch bluetooth.h diff --git a/bluez/.md5sum b/bluez/.md5sum index 2e34a36c8..f2907bfef 100644 --- a/bluez/.md5sum +++ b/bluez/.md5sum @@ -1,3 +1,3 @@ -39f8eb8796b87682aaebe0651875373b bluetooth.h?id=cf52a40302d0d20ccca22a7a1f53e46ef8abfca8 +3baf168e1894791e7d00675698dcbc34 bluetooth.h 8faf24d9748450e7caecd0673109dddf bluetoothd c828c172f01f20c6ecd7f407894956a2 bluez-4.101.tar.xz diff --git a/bluez/.signature b/bluez/.signature index f2cc3f168..60d50a6d0 100644 --- a/bluez/.signature +++ b/bluez/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/fHmSh9Fhu9Xnzlw5KxHXMPgU/g+jX6bV5i7mvQgEEGfFLvamfPVSYLPnYf6nbUPSnEMlYoVCdhpbNEmHMnAQA8= -SHA256 (Pkgfile) = 6f8ddbaa443f11488d7a02d715ffe18d71ab56039b82662279430bf16bf9a786 +RWSE3ohX2g5d/Vn5VwpHcYB3zdHJQFefPBfyEVR6t9vmC6wsZzWOHFLu53aolqY+APUx68IuxGB7yY2vdU03ewtbNRk6FbSdsAw= +SHA256 (Pkgfile) = d507dd5b984a2318f1f7396833f963320f7979a26fe8f143d1116928bb36c0a9 SHA256 (.footprint) = 2d6aa1ed3254ec65ed77e30f5e3c6bc2aa4bfeb0df1e15745d89129529f48db2 SHA256 (bluez-4.101.tar.xz) = 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d SHA256 (bluetoothd) = 3cd23999762c0ca3e0559af307a8dbd4b7f8a58fc4bb2701d278dc49ec14a0b9 -SHA256 (bluetooth.h?id=cf52a40302d0d20ccca22a7a1f53e46ef8abfca8) = 83fcd8435ef1010170b9c67cb7adb936e340f88e5eb84f5033d07278aa79071a +SHA256 (bluetooth.h) = 83fcd8435ef1010170b9c67cb7adb936e340f88e5eb84f5033d07278aa79071a diff --git a/bluez/Pkgfile b/bluez/Pkgfile index afa0be32a..92b2d622c 100644 --- a/bluez/Pkgfile +++ b/bluez/Pkgfile @@ -7,15 +7,15 @@ name=bluez version=4.101 release=5 -source=(http://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz bluetoothd -http://git.kernel.org/cgit/bluetooth/bluez.git/patch/lib/bluetooth.h?id=cf52... -) +source=(http://www.kernel.org/pub/linux/bluetooth/bluez-$version.tar.xz + bluetoothd bluetooth.h) build() { cd $name-$version # Fix bluetooth.h to compile in strict C - patch -p1 -i $SRC/'bluetooth.h?id=cf52a40302d0d20ccca22a7a1f53e46ef8abfca8' + # http://git.kernel.org/cgit/bluetooth/bluez.git/patch/lib/bluetooth.h?id=cf52... + patch -p1 -i $SRC/bluetooth.h ./configure \ --prefix=/usr \ diff --git a/bluez/bluetooth.h b/bluez/bluetooth.h new file mode 100644 index 000000000..b5e64824f --- /dev/null +++ b/bluez/bluetooth.h @@ -0,0 +1,42 @@ +From cf52a40302d0d20ccca22a7a1f53e46ef8abfca8 Mon Sep 17 00:00:00 2001 +From: Gabriel Souza Franco <gabrielfrancosouza@gmail.com> +Date: Tue, 28 Oct 2014 15:03:07 -0200 +Subject: lib: Change bluetooth.h to compile in strict C + +--- + lib/bluetooth.h | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +(limited to 'lib/bluetooth.h') + +diff --git a/lib/bluetooth.h b/lib/bluetooth.h +index 61c1f9a..f214d81 100644 +--- a/lib/bluetooth.h ++++ b/lib/bluetooth.h +@@ -156,18 +156,18 @@ enum { + + /* Bluetooth unaligned access */ + #define bt_get_unaligned(ptr) \ +-({ \ ++__extension__ ({ \ + struct __attribute__((packed)) { \ +- typeof(*(ptr)) __v; \ +- } *__p = (typeof(__p)) (ptr); \ ++ __typeof__(*(ptr)) __v; \ ++ } *__p = (__typeof__(__p)) (ptr); \ + __p->__v; \ + }) + + #define bt_put_unaligned(val, ptr) \ + do { \ + struct __attribute__((packed)) { \ +- typeof(*(ptr)) __v; \ +- } *__p = (typeof(__p)) (ptr); \ ++ __typeof__(*(ptr)) __v; \ ++ } *__p = (__typeof__(__p)) (ptr); \ + __p->__v = (val); \ + } while(0) + +-- +cgit v1.1 +