From 666324a0b392e03d94eb81f6d83c37ca7b10925f Mon Sep 17 00:00:00 2001
From: Manuel <manutortosa@chakra-project.org>
Date: Sun, 19 Dec 2010 23:58:29 +0000
Subject: [PATCH] New musicbrainz it's needed for KSCD, tunepimp will not
 compile anymore

---
 musicbrainz/PKGBUILD     | 56 +++++++++++++++++++--------------------
 musicbrainz/gcc4.3.patch | 57 ----------------------------------------
 2 files changed, 27 insertions(+), 86 deletions(-)
 delete mode 100644 musicbrainz/gcc4.3.patch

diff --git a/musicbrainz/PKGBUILD b/musicbrainz/PKGBUILD
index 1906cbd4e..129a376be 100644
--- a/musicbrainz/PKGBUILD
+++ b/musicbrainz/PKGBUILD
@@ -1,34 +1,32 @@
-# $Id: PKGBUILD 69566 2010-02-21 05:29:26Z allan $
-# Maintainer: 
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: Sarah Hay <sarah@archlinux.org>
+#
+# Platform Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=musicbrainz
-pkgver=2.1.5
-pkgrel=3
-pkgdesc="The second generation incarnation of the CD Index"
+pkgver=3.0.3
+pkgrel=1
+pkgdesc="Library That Provides Access to the MusicBrainz Server  "
+url="http://musicbrainz.org/"
 arch=('i686' 'x86_64')
-url="http://www.musicbrainz.org/index.html"
-license=('LGPL')
-depends=('expat>=2.0')
-makedepends=('python2')
-options=('!libtool')
-source=(ftp://ftp.musicbrainz.org/pub/$pkgname/libmusicbrainz-${pkgver}.tar.gz
-	'gcc4.3.patch')
-
-
+license=('LGPL2.1')
+depends=('neon' 'libdiscid')
+makedepends=('cmake')
+source=(ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-$pkgver.tar.gz)
+md5sums=('f4824d0a75bdeeef1e45cc88de7bb58a')
 build() {
-  cd ${srcdir}/lib${pkgname}-${pkgver}
-
-  patch -p1 -i ${srcdir}/gcc4.3.patch
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=${pkgdir} install
-
-  cd python
-  python2 setup.py install --root=${pkgdir} || return 1
+  cd ${srcdir}
+  mkdir build
+  cd build
+  cmake ../libmusicbrainz-${pkgver} \
+      -DCMAKE_INSTALL_PREFIX:PATH=/usr \
+      -DBUILD_SHARED_LIBS:BOOL=ON \
+      -DBUILD_STATIC_LIBS:BOOL=OFF
+  make
 }
-md5sums=('d5e19bb77edd6ea798ce206bd05ccc5f'
-         '9455555d03e3bd15d488ffdb2287ffa7')
+
+package() {
+  cd ${srcdir}/build
+  make DESTDIR=${pkgdir} install
+}
\ No newline at end of file
diff --git a/musicbrainz/gcc4.3.patch b/musicbrainz/gcc4.3.patch
deleted file mode 100644
index cc412f3d2..000000000
--- a/musicbrainz/gcc4.3.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp libmusicbrainz-2.1.4/lib/c_wrapper.cpp
---- libmusicbrainz-2.1.4-orig/lib/c_wrapper.cpp	2003-10-16 16:21:10.000000000 -0600
-+++ libmusicbrainz-2.1.4/lib/c_wrapper.cpp	2007-12-16 09:45:21.000000000 -0600
-@@ -24,6 +24,7 @@
- #include "musicbrainz.h"
- #include "trm.h"
- #include "mb_c.h"
-+#include <cstring>
- 
- extern "C"
- {
-diff -Naur libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp libmusicbrainz-2.1.4/lib/comhttpsocket.cpp
---- libmusicbrainz-2.1.4-orig/lib/comhttpsocket.cpp	2006-05-11 12:46:54.000000000 -0600
-+++ libmusicbrainz-2.1.4/lib/comhttpsocket.cpp	2007-12-16 09:46:28.000000000 -0600
-@@ -20,6 +20,7 @@
- #endif
- #include <stdlib.h>
- #include <assert.h>
-+#include <cstring>
- 
- const char* g_strCOMVer = "libmusicbrainz/"VERSION;
- 
-diff -Naur libmusicbrainz-2.1.4-orig/lib/comsocket.cpp libmusicbrainz-2.1.4/lib/comsocket.cpp
---- libmusicbrainz-2.1.4-orig/lib/comsocket.cpp	2006-05-11 12:46:54.000000000 -0600
-+++ libmusicbrainz-2.1.4/lib/comsocket.cpp	2007-12-16 09:46:08.000000000 -0600
-@@ -37,6 +37,7 @@
- #include <netinet/tcp.h>
- #include <errno.h>
- #include <stdio.h>
-+#include <cstring>
- #include <sys/time.h>
- #include <sys/types.h>
- #include <unistd.h>
-diff -Naur libmusicbrainz-2.1.4-orig/lib/http.cpp libmusicbrainz-2.1.4/lib/http.cpp
---- libmusicbrainz-2.1.4-orig/lib/http.cpp	2007-12-16 09:52:48.000000000 -0600
-+++ libmusicbrainz-2.1.4/lib/http.cpp	2007-12-16 09:52:36.000000000 -0600
-@@ -31,6 +31,8 @@
- #endif
- #include <fcntl.h>    
- #include <errno.h>    
-+#include <cstring>
-+#include <cstdlib>
- 
- #ifdef WIN32
- #include <winsock.h>
-diff -Naur libmusicbrainz-2.1.4-orig/lib/sigclient.cpp libmusicbrainz-2.1.4/lib/sigclient.cpp
---- libmusicbrainz-2.1.4-orig/lib/sigclient.cpp	2006-05-11 12:46:54.000000000 -0600
-+++ libmusicbrainz-2.1.4/lib/sigclient.cpp	2007-12-16 09:54:48.000000000 -0600
-@@ -33,6 +33,8 @@
- #pragma warning(disable:4786)
- #endif
- 
-+#include <cstring>
-+
- #include "sigclient.h"
- #include "comhttpsocket.h"
-