diff --git a/srcpkgs/bluez-alsa b/srcpkgs/bluez-alsa deleted file mode 120000 index db15886a96..0000000000 --- a/srcpkgs/bluez-alsa +++ /dev/null @@ -1 +0,0 @@ -bluez \ No newline at end of file diff --git a/srcpkgs/bluez-compat b/srcpkgs/bluez-compat deleted file mode 120000 index db15886a96..0000000000 --- a/srcpkgs/bluez-compat +++ /dev/null @@ -1 +0,0 @@ -bluez \ No newline at end of file diff --git a/srcpkgs/bluez-gstreamer b/srcpkgs/bluez-gstreamer deleted file mode 120000 index db15886a96..0000000000 --- a/srcpkgs/bluez-gstreamer +++ /dev/null @@ -1 +0,0 @@ -bluez \ No newline at end of file diff --git a/srcpkgs/bluez/bluez-alsa.template b/srcpkgs/bluez/bluez-alsa.template deleted file mode 100644 index 5c046c0535..0000000000 --- a/srcpkgs/bluez/bluez-alsa.template +++ /dev/null @@ -1,18 +0,0 @@ -# Template file for 'bluez-alsa'. -# -depends="bluez" -short_desc="Bluetooth ALSA support" -long_desc=" - This package contains a driver to operate with the ALSA stack. - - BlueZ is the official Linux Bluetooth Stack. It is an Open Source project - distributed under GNU General Public License (GPL)." - -conf_files="/usr/share/alsa/bluetooth.conf" - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/alsa-lib ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/bluez/bluez-compat.template b/srcpkgs/bluez/bluez-compat.template deleted file mode 100644 index 91f74e97da..0000000000 --- a/srcpkgs/bluez/bluez-compat.template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'bluez-compat'. -# -short_desc="BlueZ 3.x compatibility binaries" -long_desc=" - This package provides the legacy binaries that were reminiscent of - the BlueZ 3.x pairing methods. These binaries are not supported, and - will go away again in the future. The provides binaries are: - - hidd dund pand" - -do_install() -{ - mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1 - for _bin_ in dund hidd pand; do - mv ${SRCPKGDESTDIR}/usr/bin/${_bin_} ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/share/man/man1/${_bin_}.1 \ - ${DESTDIR}/usr/share/man/man1 - done -} diff --git a/srcpkgs/bluez/bluez-gstreamer.template b/srcpkgs/bluez/bluez-gstreamer.template deleted file mode 100644 index 3fa4875cd3..0000000000 --- a/srcpkgs/bluez/bluez-gstreamer.template +++ /dev/null @@ -1,16 +0,0 @@ -# Template file for 'bluez-gstreamer'. -# -depends="bluez" -short_desc="Bluetooth GStreamer support" -long_desc=" - This package contains a plugin to operate with GStreamer applications. - - BlueZ is the official Linux Bluetooth Stack. It is an Open Source project - distributed under GNU General Public License (GPL)." - - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/gstreamer* ${DESTDIR}/usr/lib -} diff --git a/srcpkgs/bluez/libbluetooth-devel.template b/srcpkgs/bluez/libbluetooth-devel.template index 9da8f22361..abff1936b7 100644 --- a/srcpkgs/bluez/libbluetooth-devel.template +++ b/srcpkgs/bluez/libbluetooth-devel.template @@ -1,11 +1,7 @@ # Template file for 'libbluetooth-devel'. # -noarch=yes depends="libbluetooth-${version}_${revision}" short_desc="Development files to use the BlueZ Linux Bluetooth library" -long_desc=" - BlueZ is the official Linux Bluetooth Stack. It is an Open Source project - distributed under GNU General Public License (GPL)." do_install() { mkdir -p ${DESTDIR}/usr/lib diff --git a/srcpkgs/bluez/libbluetooth.template b/srcpkgs/bluez/libbluetooth.template index 0cb3a85e45..27df968b5b 100644 --- a/srcpkgs/bluez/libbluetooth.template +++ b/srcpkgs/bluez/libbluetooth.template @@ -5,8 +5,7 @@ long_desc=" BlueZ is the official Linux Bluetooth Stack. It is an Open Source project distributed under GNU General Public License (GPL)." -do_install() -{ +do_install() { mkdir -p ${DESTDIR}/usr/lib mv ${SRCPKGDESTDIR}/usr/lib/libbluetooth.so* ${DESTDIR}/usr/lib } diff --git a/srcpkgs/bluez/patches/01_lower_sink_ranking.patch b/srcpkgs/bluez/patches/01_lower_sink_ranking.patch deleted file mode 100644 index 31945c8fbf..0000000000 --- a/srcpkgs/bluez/patches/01_lower_sink_ranking.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: a2dpsink should have a rank < GST_RANK_MARGINAL -Author: Sebastian Dröge -Origin: Sebastian Dröge -Updated by Nobuhiro Iwamatsu -Debian BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571595 - ---- audio/gsta2dpsink.c -+++ audio/gsta2dpsink.c -@@ -725,6 +725,6 @@ static void gst_a2dp_sink_init(GstA2dpSink *self, - gboolean gst_a2dp_sink_plugin_init(GstPlugin *plugin) - { - return gst_element_register(plugin, "a2dpsink", -- GST_RANK_MARGINAL, GST_TYPE_A2DP_SINK); -+ GST_RANK_MARGINAL-1, GST_TYPE_A2DP_SINK); - } - --- -1.7.5.4 - diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index b205a75049..40de782b55 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,53 +1,24 @@ # Template file for 'bluez' pkgname=bluez -version=4.101 -revision=3 +version=5.3 +revision=1 build_style=gnu-configure -configure_args="--libexecdir=/usr/lib --enable-gstreamer --enable-dund - --enable-alsa --enable-usb --enable-tools --enable-bccmd - --enable-hid2hci --enable-dfutool --enable-hidd --enable-pand - --enable-cups --enable-pnat --enable-wiimote --disable-test - --with-systemdunitdir=/usr/lib/systemd/system --enable-sap - --enable-datafiles --enable-dbusoob --enable-health" -subpackages="bluez-alsa bluez-compat bluez-gstreamer - libbluetooth libbluetooth-devel" -makedepends="pkg-config flex libudev-devel>=183 readline-devel - dbus-devel glib-devel libusb-compat-devel libcap-ng-devel - gst-plugins-base-devel libsndfile-devel cups-devel" +configure_args="--with-udevdir=/usr/lib/udev + --with-systemdsystemunitdir=/usr/lib/systemd/system + --enable-pie --enable-threads --enable-library" +subpackages="libbluetooth libbluetooth-devel" +hostmakedepends="pkg-config flex" +makedepends="libglib-devel libudev-devel>=183 dbus-devel + libusb-compat-devel cups-devel libical-devel readline-devel + systemd-devel" short_desc="Bluetooth tools and daemons" maintainer="Juan RP " homepage="http://www.bluez.org/" license="GPL-2" distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" -checksum=41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d +checksum=41b0559e3a8436a739eb7cc79156ca91daf8c115f57971b6bcb422ee0213db42 long_desc=" This package contains tools and system daemons for using Bluetooth devices. BlueZ is the official Linux Bluetooth protocol stack. It is an Open Source project distributed under GNU General Public License (GPL)." - -systemd_services="bluetooth.service on" -make_dirs="/var/lib/bluetooth 0755 root root" -conf_files=" -/etc/bluetooth/main.conf -/etc/bluetooth/rfcomm.conf -/etc/bluetooth/network.conf -/etc/bluetooth/input.conf -/etc/bluetooth/audio.conf -/etc/bluetooth/serial.conf" - -post_install() { - for f in network input audio serial; do - vinstall ${f}/${f}.conf 644 etc/bluetooth - done - vinstall scripts/bluetooth_serial 755 lib/udev - for f in simple-agent test-device test-input; do - vinstall test/${f} 755 usr/bin bluez-${f} - done - # systemd takes care of bluetoothd initialization. - rm -f ${DESTDIR}/usr/lib/udev/rules.d/97-bluetooth.rules - - # Switch to /usr. - vmove "lib/*" usr/lib - -}