libraries/libmusicbrainz: Updated for version 2.1.5

3 files changed, 65 insertions, 1 deletions

diff --git a/libraries/libmusicbrainz/libmusicbrainz-2.1.5-include_stringh.patch b/libraries/libmusicbrainz/libmusicbrainz-2.1.5-include_stringh.patch
new file mode 100644
index 0000000000..dd6f4b72c4
--- /dev/null
+++ b/libraries/libmusicbrainz/libmusicbrainz-2.1.5-include_stringh.patch
@@ -0,0 +1,56 @@
+diff -Nur libmusicbrainz-2.1.5.orig/lib/c_wrapper.cpp libmusicbrainz-2.1.5/lib/c_wrapper.cpp
+--- libmusicbrainz-2.1.5.orig/lib/c_wrapper.cpp	2006-11-14 10:34:49.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/c_wrapper.cpp	2009-07-03 00:21:19.990048479 -0500
+@@ -21,6 +21,7 @@
+      $Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
+ 
+ ----------------------------------------------------------------------------*/
++#include <string.h>
+ #include "musicbrainz.h"
+ #include "trm.h"
+ #include "mb_c.h"
+diff -Nur libmusicbrainz-2.1.5.orig/lib/comhttpsocket.cpp libmusicbrainz-2.1.5/lib/comhttpsocket.cpp
+--- libmusicbrainz-2.1.5.orig/lib/comhttpsocket.cpp	2006-11-14 10:34:49.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/comhttpsocket.cpp	2009-07-03 00:22:48.829320455 -0500
+@@ -19,6 +19,7 @@
+ #include "comsocket.h"
+ #endif
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+ 
+ const char* g_strCOMVer = "libmusicbrainz/"VERSION;
+diff -Nur libmusicbrainz-2.1.5.orig/lib/comsocket.cpp libmusicbrainz-2.1.5/lib/comsocket.cpp
+--- libmusicbrainz-2.1.5.orig/lib/comsocket.cpp	2006-11-14 10:34:49.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/comsocket.cpp	2009-07-03 00:23:24.353011308 -0500
+@@ -37,6 +37,7 @@
+ #include <netinet/tcp.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+diff -Nur libmusicbrainz-2.1.5.orig/lib/http.cpp libmusicbrainz-2.1.5/lib/http.cpp
+--- libmusicbrainz-2.1.5.orig/lib/http.cpp	2007-05-11 01:21:21.000000000 -0500
++++ libmusicbrainz-2.1.5/lib/http.cpp	2009-07-03 00:24:08.036649042 -0500
+@@ -24,6 +24,7 @@
+ ----------------------------------------------------------------------------*/
+ #include <stdlib.h>
+ #include <stdio.h> 
++#include <string.h> 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+diff -Nur libmusicbrainz-2.1.5.orig/lib/sigclient.cpp libmusicbrainz-2.1.5/lib/sigclient.cpp
+--- libmusicbrainz-2.1.5.orig/lib/sigclient.cpp	2006-11-14 10:34:49.000000000 -0600
++++ libmusicbrainz-2.1.5/lib/sigclient.cpp	2009-07-03 00:25:16.980119224 -0500
+@@ -33,6 +33,8 @@
+ #pragma warning(disable:4786)
+ #endif
+ 
++#include <string.h>
++
+ #include "sigclient.h"
+ #include "comhttpsocket.h"
+ 
diff --git a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
index 9948cf091f..3e93f755ae 100644
--- a/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
+++ b/libraries/libmusicbrainz/libmusicbrainz.SlackBuild
@@ -15,10 +15,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -36,10 +39,13 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/libmusicbrainz-2.1.5-include_stringh.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --disable-static \
@@ -65,4 +71,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libmusicbrainz/libmusicbrainz.info b/libraries/libmusicbrainz/libmusicbrainz.info
index cc139d4e1a..0d1d025dbf 100644
--- a/libraries/libmusicbrainz/libmusicbrainz.info
+++ b/libraries/libmusicbrainz/libmusicbrainz.info
@@ -3,6 +3,8 @@ VERSION="2.1.5"
 HOMEPAGE="http://musicbrainz.org/"
 DOWNLOAD="http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.5.tar.gz"
 MD5SUM="d5e19bb77edd6ea798ce206bd05ccc5f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michales Michaloudes"
 EMAIL="korgie@gmail.com"
 APPROVED="rworkman"