libmusicbrainz#3.0.3-1, maj port

3 files changed, 45 insertions, 32 deletions

diff --git a/extra/libmusicbrainz/.footprint b/extra/libmusicbrainz/.footprint
index 9f4cdbb84..25f3b330a 100644
--- a/extra/libmusicbrainz/.footprint
+++ b/extra/libmusicbrainz/.footprint
@@ -1,21 +1,37 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/musicbrainz/
--rw-r--r--	root/root	usr/include/musicbrainz/browser.h
--rw-r--r--	root/root	usr/include/musicbrainz/errors.h
--rw-r--r--	root/root	usr/include/musicbrainz/mb_c.h
--rw-r--r--	root/root	usr/include/musicbrainz/musicbrainz.h
--rw-r--r--	root/root	usr/include/musicbrainz/queries.h
+drwxr-xr-x	root/root	usr/include/musicbrainz3/
+-rw-r--r--	root/root	usr/include/musicbrainz3/artist.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/artistalias.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/defines.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/disc.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/entity.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/factory.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/filters.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/includes.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/iwebservice.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/label.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/labelalias.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/lists.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/mb_c.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/mbxmlparser.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/metadata.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/model.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/musicbrainz.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/query.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/relation.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/release.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/releaseevent.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/releasegroup.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/results.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/tag.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/track.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/user.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/utils.h
+-rw-r--r--	root/root	usr/include/musicbrainz3/webservice.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libmusicbrainz.a
--rwxr-xr-x	root/root	usr/lib/libmusicbrainz.la
-lrwxrwxrwx	root/root	usr/lib/libmusicbrainz.so -> libmusicbrainz.so.4.0.3
-lrwxrwxrwx	root/root	usr/lib/libmusicbrainz.so.4 -> libmusicbrainz.so.4.0.3
--rwxr-xr-x	root/root	usr/lib/libmusicbrainz.so.4.0.3
+lrwxrwxrwx	root/root	usr/lib/libmusicbrainz3.so -> libmusicbrainz3.so.6
+lrwxrwxrwx	root/root	usr/lib/libmusicbrainz3.so.6 -> libmusicbrainz3.so.6.3.0
+-rwxr-xr-x	root/root	usr/lib/libmusicbrainz3.so.6.3.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
--rw-r--r--	root/root	usr/lib/pkgconfig/libmusicbrainz.pc
-drwxr-xr-x	root/root	usr/lib/python2.6/
-drwxr-xr-x	root/root	usr/lib/python2.6/site-packages/
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/musicbrainz.py
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/musicbrainz.pyc
--rw-r--r--	root/root	usr/lib/python2.6/site-packages/python_musicbrainz-0.0.0-py2.6.egg-info
+-rw-r--r--	root/root	usr/lib/pkgconfig/libmusicbrainz3.pc
diff --git a/extra/libmusicbrainz/.md5sum b/extra/libmusicbrainz/.md5sum
index 6cb960c19..8561c570a 100644
--- a/extra/libmusicbrainz/.md5sum
+++ b/extra/libmusicbrainz/.md5sum
@@ -1,2 +1 @@
-6cdd86843f6532264306ea158fbe4d99  gcc4.patch
-d5e19bb77edd6ea798ce206bd05ccc5f  libmusicbrainz-2.1.5.tar.gz
+f4824d0a75bdeeef1e45cc88de7bb58a  libmusicbrainz-3.0.3.tar.gz
diff --git a/extra/libmusicbrainz/Pkgfile b/extra/libmusicbrainz/Pkgfile
index cac89d16c..391c38113 100755
--- a/extra/libmusicbrainz/Pkgfile
+++ b/extra/libmusicbrainz/Pkgfile
@@ -2,24 +2,22 @@
 # URL: http://musicbrainz.org/doc/libmusicbrainz
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: python, expat
+# Depends on: 
 
 name=libmusicbrainz
-version=2.1.5
+version=3.0.3
 release=1
-source=( ftp://ftp.musicbrainz.org/pub/musicbrainz/$name-$version.tar.gz\
-	http://nutyx.meticul.eu/files/patchs/$name/gcc4.patch)
-
+source=( ftp://ftp.musicbrainz.org/pub/musicbrainz/$name-$version.tar.gz)
 
 build() {
-	cd $name-$version
-	patch -Np1 -i ../gcc4.patch
-	./configure --prefix=/usr \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
-	make
+	cd $SRC
+	mkdir build
+  	cd build
+  	cmake ../libmusicbrainz-${version} \
+      		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
+      		-DBUILD_SHARED_LIBS:BOOL=ON \
+      		-DBUILD_STATIC_LIBS:BOOL=OFF
+  	make
 	make DESTDIR=$PKG install
-	cd python
-	python setup.py install --root=$PKG
 }