Date: Tuesday, January 10, 2012 @ 16:46:52 Author: andrea Revision: 146411
upgpkg: bluez 4.97-1 Upstream release Added: bluez/trunk/make-libcheck-optional.patch Modified: bluez/trunk/PKGBUILD ------------------------------+ PKGBUILD | 24 +++++++----- make-libcheck-optional.patch | 79 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+), 9 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-10 21:40:52 UTC (rev 146410) +++ PKGBUILD 2012-01-10 21:46:52 UTC (rev 146411) @@ -1,10 +1,11 @@ # $Id$ -# Maintainer: Andrea Scarpino <[email protected]> +# Maintainer: +# Contributor: Andrea Scarpino <[email protected]> # Contributor: Geoffroy Carrier <[email protected]> pkgname=bluez -pkgver=4.96 -pkgrel=3 +pkgver=4.97 +pkgrel=1 pkgdesc="Libraries and tools for the Bluetooth protocol stack" url="http://www.bluez.org/"; arch=('i686' 'x86_64') @@ -24,17 +25,21 @@ options=('!libtool' 'emptydirs') 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"; -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"; +source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2"; 'bluetooth.conf.d' - 'rc.bluetooth') -md5sums=('255c3dda8b93210ab0dcf8d04ddaf69f' + 'rc.bluetooth' + 'make-libcheck-optional.patch') +md5sums=('b302cee7f9b9527d29775449d7e1dfe6' '7412982b440f29fa7f76a41a87fef985' - '8f9498707f809506928b2e480d3b6789') + '8f9498707f809506928b2e480d3b6789' + 'f112fc5bcaeecc7b6ea994f14786e235') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i "${srcdir}"/make-libcheck-optional.patch + autoreconf -i -f + ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -50,7 +55,8 @@ --enable-pand \ --enable-dund \ --enable-cups \ - --enable-wiimote + --enable-wiimote \ + --disable-test make } Added: make-libcheck-optional.patch =================================================================== --- make-libcheck-optional.patch (rev 0) +++ make-libcheck-optional.patch 2012-01-10 21:46:52 UTC (rev 146411) @@ -0,0 +1,79 @@ +From: Marcel Holtmann <[email protected]> +Date: Wed, 28 Dec 2011 04:09:56 +0000 (-0800) +Subject: build: Move libcheck under TEST conditional +X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=commitdiff_plain;h=bf5d45f2fbd1b1463512f4eb8d30bffb3478ccc7;hp=ec632165d6707bece074dbba43d704e26346ab0a + +build: Move libcheck under TEST conditional +--- + +diff --git a/Makefile.am b/Makefile.am +index 9112483..5cf287c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -449,6 +449,7 @@ endif + + unit_objects = + ++if TEST + unit_tests = unit/test-eir + + noinst_PROGRAMS += $(unit_tests) +@@ -456,8 +457,10 @@ noinst_PROGRAMS += $(unit_tests) + unit_test_eir_SOURCES = unit/test-eir.c src/eir.c src/glib-helper.c + unit_test_eir_LDADD = lib/libbluetooth-private.la @GLIB_LIBS@ @CHECK_LIBS@ + unit_test_eir_CFLAGS = $(AM_CFLAGS) @CHECK_CFLAGS@ +-unit_test_eir_SHORTNAME = unit + unit_objects += $(unit_test_eir_OBJECTS) ++else ++unit_tests = ++endif + + TESTS = $(unit_tests) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 2097d77..753b994 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -170,6 +170,12 @@ AC_DEFUN([AC_PATH_READLINE], [ + []) + ]) + ++AC_DEFUN([AC_PATH_CHECK], [ ++ PKG_CHECK_MODULES(CHECK, check >= 0.9.4, check_found=yes, check_found=no) ++ AC_SUBST(CHECK_CFLAGS) ++ AC_SUBST(CHECK_LIBS) ++]) ++ + AC_DEFUN([AC_PATH_OUI], [ + AC_ARG_WITH(ouifile, + AS_HELP_STRING([--with-ouifile=PATH],[Path to the oui.txt file @<:@auto@:>@]), +@@ -422,7 +428,7 @@ AC_DEFUN([AC_ARG_BLUEZ], [ + AM_CONDITIONAL(PAND, test "${pand_enable}" = "yes") + AM_CONDITIONAL(DUND, test "${dund_enable}" = "yes") + AM_CONDITIONAL(CUPS, test "${cups_enable}" = "yes") +- AM_CONDITIONAL(TEST, test "${test_enable}" = "yes") ++ AM_CONDITIONAL(TEST, test "${test_enable}" = "yes" && test "${check_found}" = "yes") + AM_CONDITIONAL(TOOLS, test "${tools_enable}" = "yes") + AM_CONDITIONAL(BCCMD, test "${bccmd_enable}" = "yes") + AM_CONDITIONAL(PCMCIA, test "${pcmcia_enable}" = "yes") +diff --git a/configure.ac b/configure.ac +index 3a5dfde..a7670da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -24,8 +24,6 @@ AC_PROG_YACC + AM_PROG_LEX + AM_PROG_MKDIR_P + +-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) +- + m4_define([_LT_AC_TAGCONFIG], []) + m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) + +@@ -50,6 +48,7 @@ AC_PATH_UDEV + AC_PATH_SNDFILE + AC_PATH_OUI + AC_PATH_READLINE ++AC_PATH_CHECK + + AC_ARG_BLUEZ +
