diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-09-26 12:22:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-09-26 12:22:00 +0000 |
| commit | 56f8faaef733e160aedf7dfd7b4c660bc1d0baa0 (patch) | |
| tree | 135fb2b8b9c4817481ae4fdec5b53f6b539ed163 | |
| parent | 5bda0b74e8e2d075a40e18e3d8cd4ed43c2e2f2a (diff) | |
| download | aports-56f8faaef733e160aedf7dfd7b4c660bc1d0baa0.tar.bz2 aports-56f8faaef733e160aedf7dfd7b4c660bc1d0baa0.tar.xz | |
main/bluez: upgrade to 5.23
| -rw-r--r-- | main/bluez/0001-tools-fix-headers-for-bcm43xx.patch | 33 | ||||
| -rw-r--r-- | main/bluez/APKBUILD | 16 | ||||
| -rw-r--r-- | main/bluez/musl-fix-headers.patch | 10 |
3 files changed, 4 insertions, 55 deletions
diff --git a/main/bluez/0001-tools-fix-headers-for-bcm43xx.patch b/main/bluez/0001-tools-fix-headers-for-bcm43xx.patch deleted file mode 100644 index 38932a6574..0000000000 --- a/main/bluez/0001-tools-fix-headers-for-bcm43xx.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 69f8b5ad0467b1f305a5bb753953061e7998d3dc Mon Sep 17 00:00:00 2001 -From: Natanael Copa <ncopa@alpinelinux.org> -Date: Mon, 21 Apr 2014 14:19:02 +0000 -Subject: [PATCH] tools: fix headers for bcm43xx - -PATH_MAX is defined in limits.h so includ it explicitly. - -This fixes the following compile error on musl libc (Alpine Linux): -tools/hciattach_bcm43xx.c: In function 'bcm43xx_locate_patch': -tools/hciattach_bcm43xx.c:313:14: error: 'PATH_MAX' undeclared (first use in this function) - char path[PATH_MAX]; - ^ - -Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> ---- - tools/hciattach_bcm43xx.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c -index ad9b239..cb4bfb9 100644 ---- a/tools/hciattach_bcm43xx.c -+++ b/tools/hciattach_bcm43xx.c -@@ -34,6 +34,7 @@ - #include <errno.h> - #include <dirent.h> - #include <time.h> -+#include <limits.h> - - #include <bluetooth/bluetooth.h> - #include <bluetooth/hci.h> --- -1.9.2 - diff --git a/main/bluez/APKBUILD b/main/bluez/APKBUILD index d07d564f76..63dfcb604e 100644 --- a/main/bluez/APKBUILD +++ b/main/bluez/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=bluez -pkgver=5.22 +pkgver=5.23 pkgrel=0 pkgdesc="Tools for the Bluetooth protocol stack" url="http://www.bluez.org/" @@ -15,8 +15,6 @@ makedepends="dbus-dev libusb-compat-dev udev-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-cups $pkgname-hid2hci" source="http://www.kernel.org/pub/linux/bluetooth/bluez-$pkgver.tar.xz - 0001-tools-fix-headers-for-bcm43xx.patch - musl-fix-headers.patch bluetooth.initd rfcomm.initd rfcomm.confd @@ -74,21 +72,15 @@ hid2hci() { mv "$pkgdir"/lib "$subpkgdir"/ } -md5sums="fd0783c8bc524bc9b26514aad1f85814 bluez-5.22.tar.xz -3a82f8466e8b83b71f46df3710d235ca 0001-tools-fix-headers-for-bcm43xx.patch -9c4e73b24365e83f536eb6dee338c132 musl-fix-headers.patch +md5sums="b6ebf545d496087f3bc2b4aa86f89eb4 bluez-5.23.tar.xz 7a5611fa2cf42da2e844f96b2efa9f3b bluetooth.initd 7672edb8e33c4495ee9febb9864feb10 rfcomm.initd 7f4bb093adb0f519c621f2ea68712f35 rfcomm.confd" -sha256sums="e8b866515a18116c7048a55081be9238a51447c9448ed20997b0432b13ba0882 bluez-5.22.tar.xz -cda215d16807ee3669c9f5cd8c67a3f134d644e8b46aa54609f67421796558f8 0001-tools-fix-headers-for-bcm43xx.patch -968ef5b5b048abf668243e9415065a91710e1053a3792ff223f0756f7bdad548 musl-fix-headers.patch +sha256sums="cdabd38d7ac8dd392a77ce7d76d5c120b277e4115040ba5d3ab91c05ab37f2c1 bluez-5.23.tar.xz d4aef203e184bef4284b3719268c91e07a1e3f84cbdea2ac8ab40a2617ac9186 bluetooth.initd 4430703a9bec9a9482416b2d24aa47492264768a0b61356b361bbc8b1229a83e rfcomm.initd 672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 rfcomm.confd" -sha512sums="3de7657c082352f43c8106c3a8efb5d6e5c7035813b7d6276dd9d5822184dd02633f71ef2bef3cafeb3a2ae56cc800970fec215fa9c5ceb7373d2168ad09ecd9 bluez-5.22.tar.xz -cd7010c5cac9e5020b5509eda42b19117ecccb41dc81537d6a0f125956a7372146e8d2246b69b1ef65dee5a902f888d28c0e52b48dfd1a7c1545a7d969ead7e1 0001-tools-fix-headers-for-bcm43xx.patch -4d55398f22ec7223fe9fbb9f3bf823e5acd864681713bc5b71adc8231d1972e6d63dc2f5017a6e3536b8c190bb749dbac623e8983cb6815019b0e4e6fc319b16 musl-fix-headers.patch +sha512sums="5cbb5c34963c5b70badab618018eda5017b44d240c3a47b4bbaf88e41b67617c5a299a21509a917ef3bb91be79032aa10837138283b6510e2829a6be1554ef92 bluez-5.23.tar.xz 2c13cde6561c5aa8b2f27306851458966c67853f6ac2358d09019fda14d3d8e3ff6d9f1c90512c67063d1e1954ec05bf117c5fafc7716446cc5786e9cc12c49f bluetooth.initd 8f14b4e05c9ecaf4586ed2fdc2d2519de6b613de62ae5c95508baa682630f3112c5b6db6850f76679afc49e06f2ad035d148fa30b9b980747b6fb423f7bebe88 rfcomm.initd a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb rfcomm.confd" diff --git a/main/bluez/musl-fix-headers.patch b/main/bluez/musl-fix-headers.patch deleted file mode 100644 index 910e61d211..0000000000 --- a/main/bluez/musl-fix-headers.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- ./src/shared/util.c.orig -+++ ./src/shared/util.c -@@ -32,6 +32,7 @@ - #include <sys/stat.h> - #include <unistd.h> - #include <dirent.h> -+#include <limits.h> - - #include "src/shared/util.h" - |