[arch-commits] Commit in (5 files)

[Jan Steffens]

    Date: Friday, March 30, 2012 @ 14:41:12
  Author: heftig
Revision: 154805

add libmusicbrainz4

Added:
  libmusicbrainz4/
  libmusicbrainz4/trunk/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
Modified:
  libmusicbrainz4/trunk/PKGBUILD
Deleted:
  libmusicbrainz4/repos/extra-i686/
  libmusicbrainz4/repos/extra-x86_64/

--------------------------------------------------------------------------------+
 libmusicbrainz4/trunk/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch |   28 ++++++++
 trunk/PKGBUILD                                                                 |   33 +++++-----
 2 files changed, 45 insertions(+), 16 deletions(-)

Added: libmusicbrainz4/trunk/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
===================================================================
--- libmusicbrainz4/trunk/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch	                        (rev 0)
+++ libmusicbrainz4/trunk/0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch	2012-03-30 18:41:12 UTC (rev 154805)
@@ -0,0 +1,28 @@
+From 64c68ad42a9089c92dfa4e74f55b6c1b65b8f11c Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Sun, 4 Mar 2012 14:32:49 +0100
+Subject: [PATCH] Make sure gcc 4.7 can find usleep declaration
+
+Without this, compilation fails with:
+
+libmusicbrainz-4.0.0/src/Query.cc: In member function 'void MusicBrainz4::CQuery::WaitRequest() const':
+libmusicbrainz-4.0.0/src/Query.cc:295:19: error: 'usleep' was not declared in this scope
+---
+ src/Query.cc |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/src/Query.cc b/src/Query.cc
+index 5f5934f..9332346 100644
+--- a/src/Query.cc
++++ b/src/Query.cc
+@@ -33,6 +33,7 @@
+ 
+ #include <string.h>
+ #include <sys/time.h>
++#include <unistd.h>
+ 
+ #include <ne_uri.h>
+ 
+-- 
+1.7.7.6
+

Modified: libmusicbrainz4/trunk/PKGBUILD
===================================================================
--- libmusicbrainz3/trunk/PKGBUILD	2012-03-30 18:18:03 UTC (rev 154799)
+++ libmusicbrainz4/trunk/PKGBUILD	2012-03-30 18:41:12 UTC (rev 154805)
@@ -1,29 +1,30 @@
 # $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
 # Contributor: Max Fehrm max.fehrm at gmail.com
-pkgname=libmusicbrainz3
-pkgver=3.0.3
-pkgrel=2
+
+pkgname=libmusicbrainz4
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="Library That Provides Access to the MusicBrainz Server  "
 url="http://musicbrainz.org/"
 arch=('i686' 'x86_64')
 license=('LGPL2.1')
-depends=('neon' 'libdiscid')
+depends=('neon')
 makedepends=('cmake')
-source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz)
-md5sums=('f4824d0a75bdeeef1e45cc88de7bb58a')
+source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz
+        0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch)
+md5sums=('21c33f5dd20b8bb945b800e2a964f27e'
+         'df1dfa423d32a7a1d08b3fc0114bf087')
+
 build() {
-  cd ${srcdir}
-  mkdir build
-  cd build
-  cmake ../libmusicbrainz-${pkgver} \
-      -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-      -DBUILD_SHARED_LIBS:BOOL=ON \
-      -DBUILD_STATIC_LIBS:BOOL=OFF
+  cd libmusicbrainz-$pkgver
+  patch -Np1 -i ../0001-Make-sure-gcc-4.7-can-find-usleep-declaration.patch
+  cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr
   make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd libmusicbrainz-$pkgver
+  make DESTDIR="$pkgdir" install
 }