diff --git a/srcpkgs/bluez/bluez-alsa.rshlibs b/srcpkgs/bluez/bluez-alsa.rshlibs index 93ab2737f0..49db8c0d7c 100644 --- a/srcpkgs/bluez/bluez-alsa.rshlibs +++ b/srcpkgs/bluez/bluez-alsa.rshlibs @@ -1,4 +1,4 @@ -libbluetooth.so.3 libasound.so.2 librt.so.1 libc.so.6 +libpthread.so.0 diff --git a/srcpkgs/bluez/bluez-alsa.template b/srcpkgs/bluez/bluez-alsa.template index 8efa8a49fa..0ddf6ec027 100644 --- a/srcpkgs/bluez/bluez-alsa.template +++ b/srcpkgs/bluez/bluez-alsa.template @@ -1,6 +1,5 @@ # Template file for 'bluez-alsa'. # -revision=1 short_desc="Bluetooth ALSA support" long_desc=" This package contains a driver to operate with the ALSA stack. diff --git a/srcpkgs/bluez/bluez-compat.rshlibs b/srcpkgs/bluez/bluez-compat.rshlibs index 7222fbd917..0b7acb5514 100644 --- a/srcpkgs/bluez/bluez-compat.rshlibs +++ b/srcpkgs/bluez/bluez-compat.rshlibs @@ -1,3 +1,2 @@ -libbluetooth.so.3 libc.so.6 libm.so.6 diff --git a/srcpkgs/bluez/bluez-compat.template b/srcpkgs/bluez/bluez-compat.template index 41a386ebb1..91f74e97da 100644 --- a/srcpkgs/bluez/bluez-compat.template +++ b/srcpkgs/bluez/bluez-compat.template @@ -1,6 +1,5 @@ # Template file for 'bluez-compat'. # -revision=1 short_desc="BlueZ 3.x compatibility binaries" long_desc=" This package provides the legacy binaries that were reminiscent of @@ -9,7 +8,6 @@ long_desc=" hidd dund pand" - do_install() { mkdir -p ${DESTDIR}/usr/bin ${DESTDIR}/usr/share/man/man1 diff --git a/srcpkgs/bluez/bluez-gstreamer.rshlibs b/srcpkgs/bluez/bluez-gstreamer.rshlibs index e21da510f8..db1661f173 100644 --- a/srcpkgs/bluez/bluez-gstreamer.rshlibs +++ b/srcpkgs/bluez/bluez-gstreamer.rshlibs @@ -1,4 +1,3 @@ -libbluetooth.so.3 libdbus-1.so.3 libpthread.so.0 libgstreamer-0.10.so.0 @@ -11,3 +10,4 @@ libglib-2.0.so.0 libgstaudio-0.10.so.0 libgstrtp-0.10.so.0 libc.so.6 +libgstbase-0.10.so.0 diff --git a/srcpkgs/bluez/bluez-gstreamer.template b/srcpkgs/bluez/bluez-gstreamer.template index 3bfc52cfad..9a208b4422 100644 --- a/srcpkgs/bluez/bluez-gstreamer.template +++ b/srcpkgs/bluez/bluez-gstreamer.template @@ -1,6 +1,5 @@ # Template file for 'bluez-gstreamer'. # -revision=1 short_desc="Bluetooth GStreamer support" long_desc=" This package contains a plugin to operate with GStreamer applications. diff --git a/srcpkgs/bluez/bluez.rshlibs b/srcpkgs/bluez/bluez.rshlibs index daa5320f4a..134a574894 100644 --- a/srcpkgs/bluez/bluez.rshlibs +++ b/srcpkgs/bluez/bluez.rshlibs @@ -1,4 +1,3 @@ -libbluetooth.so.3 libc.so.6 libusb-0.1.so.4 libglib-2.0.so.0 diff --git a/srcpkgs/bluez/libbluetooth.template b/srcpkgs/bluez/libbluetooth.template index caa31f4ad4..0cb3a85e45 100644 --- a/srcpkgs/bluez/libbluetooth.template +++ b/srcpkgs/bluez/libbluetooth.template @@ -1,12 +1,10 @@ # Template file for 'libbluetooth'. # -revision=1 short_desc="Library to use the Bluez Linux Bluetooth Stack" 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/patches/missing_symbols.patch b/srcpkgs/bluez/patches/missing_symbols.patch new file mode 100644 index 0000000000..22b2c1fc93 --- /dev/null +++ b/srcpkgs/bluez/patches/missing_symbols.patch @@ -0,0 +1,24 @@ +module_pcm_bluetooth: missing pthread symbols. +libgstbluetooth: missing symbols from libgstbase-0.10. + +--- Makefile.am.orig 2012-01-14 08:13:53.338450039 +0100 ++++ Makefile.am 2012-01-14 08:14:22.302766244 +0100 +@@ -352,7 +352,7 @@ audio_libasound_module_pcm_bluetooth_la_ + audio_libasound_module_pcm_bluetooth_la_LDFLAGS = -module -avoid-version #-export-symbols-regex [_]*snd_pcm_.* + audio_libasound_module_pcm_bluetooth_la_LIBADD = sbc/libsbc.la \ + lib/libbluetooth-private.la @ALSA_LIBS@ +-audio_libasound_module_pcm_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@ ++audio_libasound_module_pcm_bluetooth_la_CFLAGS = $(AM_CFLAGS) @ALSA_CFLAGS@ -pthread + + audio_libasound_module_ctl_bluetooth_la_SOURCES = audio/ctl_bluetooth.c \ + audio/rtp.h audio/ipc.h audio/ipc.c +@@ -386,7 +386,8 @@ audio_libgstbluetooth_la_SOURCES = audio + audio_libgstbluetooth_la_LDFLAGS = -module -avoid-version + audio_libgstbluetooth_la_LIBADD = sbc/libsbc.la lib/libbluetooth-private.la \ + @DBUS_LIBS@ @GSTREAMER_LIBS@ \ +- -lgstaudio-0.10 -lgstrtp-0.10 ++ -lgstaudio-0.10 -lgstrtp-0.10 \ ++ -lgstbase-0.10 + audio_libgstbluetooth_la_CFLAGS = -fvisibility=hidden -fno-strict-aliasing \ + $(AM_CFLAGS) @DBUS_CFLAGS@ @GSTREAMER_CFLAGS@ + endif diff --git a/srcpkgs/bluez/template b/srcpkgs/bluez/template index 86a01b8c8b..84f31ed3e1 100644 --- a/srcpkgs/bluez/template +++ b/srcpkgs/bluez/template @@ -1,19 +1,18 @@ # Template file for 'bluez' pkgname=bluez -version=4.96 -distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.bz2" +version=4.98 +distfiles="${KERNEL_SITE}/bluetooth/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--libexecdir=/lib --enable-gstreamer --enable-dund --enable-alsa --enable-usb --enable-tools --enable-bccmd --enable-hid2hci --enable-dfutool --enable-hidd --enable-pand --disable-cups --enable-capng --enable-pnat --enable-wiimote ---with-systemdunitdir=/lib/systemd/system" -revision=2 +--with-systemdunitdir=/lib/systemd/system --disable-test" short_desc="Bluetooth tools and daemons" maintainer="Juan RP " homepage="http://www.bluez.org/" license="GPL-2" -checksum=7b34aa28c831d77e92d348951653bc58347f4b6177e2f89cd5ffb8ffc37142ae +checksum=6eb21e712e8835eb1aec84bdfb38891cc4dc5353af921b8235d481da13c565d9 long_desc=" This package contains tools and system daemons for using Bluetooth devices. @@ -32,6 +31,7 @@ conf_files=" subpackages="$pkgname-alsa $pkgname-compat $pkgname-gstreamer libbluetooth" subpackages="$subpackages libbluetooth-devel" +Add_dependency build automake Add_dependency build pkg-config Add_dependency build flex Add_dependency build libudev-devel @@ -44,8 +44,11 @@ Add_dependency build libusb-compat-devel Add_dependency build libcap-ng-devel Add_dependency build libsndfile-devel -post_install() -{ +pre_configure() { + autoreconf -fi +} + +post_install() { for f in network input audio serial; do vinstall ${f}/${f}.conf 644 etc/bluetooth done