libmusicbrainz: Upgraded to 3.0.2
Removed the autofoo.patch since the latest version uses cmake instead Remove gcc43_fix.patch since the code is not in latest package Change SRC_URI to be more generic Also fix the metadata Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
This commit is contained in:
Dongxiao Xu
Richard Purdie
parent
b82851ad38
commit
2b533d04bd
|
|
@ -1,180 +0,0 @@
|
|||
---
|
||||
ac_func_accept_argtypes.m4 | 94 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
configure.in | 64 ------------------------------
|
||||
2 files changed, 96 insertions(+), 62 deletions(-)
|
||||
|
||||
Index: libmusicbrainz-2.1.3/ac_func_accept_argtypes.m4
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ libmusicbrainz-2.1.3/ac_func_accept_argtypes.m4 2007-08-01 22:08:44.000000000 +0100
|
||||
@@ -0,0 +1,94 @@
|
||||
+##### http://autoconf-archive.cryp.to/ac_func_accept_argtypes.html
|
||||
+#
|
||||
+# SYNOPSIS
|
||||
+#
|
||||
+# AC_FUNC_ACCEPT_ARGTYPES
|
||||
+#
|
||||
+# DESCRIPTION
|
||||
+#
|
||||
+# Checks the data types of the three arguments to accept(). Results
|
||||
+# are placed into the symbols ACCEPT_TYPE_ARG[123], consistent with
|
||||
+# the following example:
|
||||
+#
|
||||
+# #define ACCEPT_ARG1 int
|
||||
+# #define ACCEPT_ARG2 struct sockaddr *
|
||||
+# #define ACCEPT_ARG3 socklen_t *
|
||||
+#
|
||||
+# This macro requires AC_CHECK_HEADERS to have already verified the
|
||||
+# presence or absence of sys/types.h and sys/socket.h.
|
||||
+#
|
||||
+# NOTE: This is just a modified version of the
|
||||
+# AC_FUNC_SELECT_ARGTYPES macro. Credit for that one goes to David
|
||||
+# MacKenzie et. al.
|
||||
+#
|
||||
+# LAST MODIFICATION
|
||||
+#
|
||||
+# 2006-10-22
|
||||
+#
|
||||
+# COPYLEFT
|
||||
+#
|
||||
+# Copyright (c) 2006 Daniel Richard G. <skunk@iskunk.org>
|
||||
+#
|
||||
+# This program is free software; you can redistribute it and/or
|
||||
+# modify it under the terms of the GNU General Public License as
|
||||
+# published by the Free Software Foundation; either version 2 of the
|
||||
+# License, or (at your option) any later version.
|
||||
+#
|
||||
+# This program is distributed in the hope that it will be useful, but
|
||||
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+# General Public License for more details.
|
||||
+#
|
||||
+# You should have received a copy of the GNU General Public License
|
||||
+# along with this program; if not, write to the Free Software
|
||||
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
+# 02111-1307, USA.
|
||||
+#
|
||||
+# As a special exception, the respective Autoconf Macro's copyright
|
||||
+# owner gives unlimited permission to copy, distribute and modify the
|
||||
+# configure scripts that are the output of Autoconf when processing
|
||||
+# the Macro. You need not follow the terms of the GNU General Public
|
||||
+# License when using or distributing such scripts, even though
|
||||
+# portions of the text of the Macro appear in them. The GNU General
|
||||
+# Public License (GPL) does govern all other use of the material that
|
||||
+# constitutes the Autoconf Macro.
|
||||
+#
|
||||
+# This special exception to the GPL applies to versions of the
|
||||
+# Autoconf Macro released by the Autoconf Macro Archive. When you
|
||||
+# make and distribute a modified version of the Autoconf Macro, you
|
||||
+# may extend this special exception to the GPL to apply to your
|
||||
+# modified version as well.
|
||||
+
|
||||
+AC_DEFUN([AC_FUNC_ACCEPT_ARGTYPES],
|
||||
+[AC_MSG_CHECKING([types of arguments for accept()])
|
||||
+ AC_CACHE_VAL(ac_cv_func_accept_arg1,dnl
|
||||
+ [AC_CACHE_VAL(ac_cv_func_accept_arg2,dnl
|
||||
+ [AC_CACHE_VAL(ac_cv_func_accept_arg3,dnl
|
||||
+ [for ac_cv_func_accept_arg1 in 'int' 'unsigned int'; do
|
||||
+ for ac_cv_func_accept_arg2 in 'struct sockaddr' 'void'; do
|
||||
+ for ac_cv_func_accept_arg3 in 'socklen_t' 'size_t' 'unsigned int' 'int'; do
|
||||
+ AC_TRY_COMPILE(dnl
|
||||
+[#ifdef HAVE_SYS_TYPES_H
|
||||
+#include <sys/types.h>
|
||||
+#endif
|
||||
+#ifdef HAVE_SYS_SOCKET_H
|
||||
+#include <sys/socket.h>
|
||||
+#endif
|
||||
+extern accept ($ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2 *, $ac_cv_func_accept_arg3 *);],,dnl
|
||||
+ [ac_not_found=no ; break 3], ac_not_found=yes)
|
||||
+ done
|
||||
+ done
|
||||
+ done
|
||||
+ ])dnl AC_CACHE_VAL
|
||||
+ ])dnl AC_CACHE_VAL
|
||||
+ ])dnl AC_CACHE_VAL
|
||||
+ if test "$ac_not_found" = yes; then
|
||||
+ ac_cv_func_accept_arg1=int
|
||||
+ ac_cv_func_accept_arg2='struct sockaddr'
|
||||
+ ac_cv_func_accept_arg3='socklen_t'
|
||||
+ fi
|
||||
+ AC_MSG_RESULT([$ac_cv_func_accept_arg1, $ac_cv_func_accept_arg2, $ac_cv_func_accept_arg3])
|
||||
+ AC_DEFINE_UNQUOTED(ACCEPT_ARG1,$ac_cv_func_accept_arg1, "Argument 1 to accept()")
|
||||
+ AC_DEFINE_UNQUOTED(ACCEPT_ARG2,$ac_cv_func_accept_arg2, "Argument 2 to accept()")
|
||||
+ AC_DEFINE_UNQUOTED(ACCEPT_ARG3,$ac_cv_func_accept_arg3, "Argument 3 to accept()")
|
||||
+])
|
||||
Index: libmusicbrainz-2.1.3/configure.in
|
||||
===================================================================
|
||||
--- libmusicbrainz-2.1.3.orig/configure.in 2007-08-01 21:14:59.000000000 +0100
|
||||
+++ libmusicbrainz-2.1.3/configure.in 2007-08-01 21:46:03.000000000 +0100
|
||||
@@ -76,69 +76,9 @@ AC_DEFUN([AC_PROTOTYPE],[
|
||||
popdef([function])
|
||||
])
|
||||
|
||||
-AC_DEFUN([AC_PROTOTYPE_REVERSE],[ifelse($#,0,,$#,1,[[$1]],[AC_PROTOTYPE_REVERSE(builtin([shift],$@)),[$1]])])
|
||||
-
|
||||
-AC_DEFUN([AC_PROTOTYPE_SUBST],[ifelse($2,,[$1],[AC_PROTOTYPE_SUBST(patsubst([$1],[$2],[$2[]_VAL]),builtin([shift],builtin([shift],$@)))])])
|
||||
-
|
||||
-AC_DEFUN([AC_PROTOTYPE_TAGS],[ifelse($1,,[],[$1, AC_PROTOTYPE_TAGS(builtin([shift],builtin([shift],$@)))])])
|
||||
-AC_DEFUN([AC_PROTOTYPE_DEFINES],[ifelse($1,,[],[AC_DEFINE(function[]_$1, $1_VAL) AC_PROTOTYPE_DEFINES(builtin([shift],$@))])])
|
||||
-
|
||||
-AC_DEFUN([AC_PROTOTYPE_STATUS],[ifelse($1,,[],[$1 => $1_VAL AC_PROTOTYPE_STATUS(builtin([shift],$@))])])
|
||||
-
|
||||
-AC_DEFUN([AC_PROTOTYPE_EACH],[
|
||||
- ifelse($2,, [
|
||||
- ], [
|
||||
- pushdef([$1_VAL], $2)
|
||||
- AC_PROTOTYPE_LOOP(rest)
|
||||
- popdef([$1_VAL])
|
||||
- AC_PROTOTYPE_EACH($1, builtin([shift], builtin([shift], $@)))
|
||||
- ])
|
||||
-])
|
||||
-
|
||||
-AC_DEFUN([AC_PROTOTYPE_LOOP],[
|
||||
- ifelse(builtin([eval], $# > 3), 1,
|
||||
- [
|
||||
- pushdef([rest],[builtin([shift],builtin([shift],$@))])
|
||||
- AC_PROTOTYPE_EACH($2,$1)
|
||||
- popdef([rest])
|
||||
- ], [
|
||||
- AC_MSG_CHECKING($3 AC_PROTOTYPE_STATUS(tags))
|
||||
- ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
- ifelse(AC_LANG(C++),,if test "$GXX" = "yes" ; then CPPFLAGS="$CPPFLAGS -Werror" ; fi)
|
||||
- ifelse(AC_LANG(C),,if test "$GCC" = "yes" ; then CPPFLAGS="$CPPFLAGS -Werror" ; fi)
|
||||
- AC_TRY_COMPILE($2, $1, [
|
||||
- CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
- AC_MSG_RESULT(ok)
|
||||
- AC_PROTOTYPE_DEFINES(tags)
|
||||
- break;
|
||||
- ], [
|
||||
- CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
- AC_MSG_RESULT(not ok)
|
||||
- ])
|
||||
- ]
|
||||
- )
|
||||
-])
|
||||
-
|
||||
-AC_DEFUN([AC_PROTOTYPE_ACCEPT],[
|
||||
-AC_PROTOTYPE(accept,
|
||||
- [
|
||||
- #include <sys/types.h>
|
||||
- #include <sys/socket.h>
|
||||
- ],
|
||||
- [
|
||||
- int a = 0;
|
||||
- ARG2 * b = 0;
|
||||
- ARG3 * c = 0;
|
||||
- accept(a, b, c);
|
||||
- ],
|
||||
- ARG2, [struct sockaddr, void],
|
||||
- ARG3, [socklen_t, size_t, int, unsigned int, long unsigned int])
|
||||
-])
|
||||
-
|
||||
-AC_PROTOTYPE_ACCEPT
|
||||
+m4_include(ac_func_accept_argtypes.m4)
|
||||
+AC_FUNC_ACCEPT_ARGTYPES()
|
||||
|
||||
-AC_DEFINE_UNQUOTED([ACCEPT_ARG2],,"Argument 2 to accept()")
|
||||
-AC_DEFINE_UNQUOTED([ACCEPT_ARG3],,"Argument 3 to accept()")
|
||||
AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", [Application install prefix])
|
||||
|
||||
AC_OUTPUT([
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
Index: libmusicbrainz-2.1.3/lib/c_wrapper.cpp
|
||||
===================================================================
|
||||
--- libmusicbrainz-2.1.3.orig/lib/c_wrapper.cpp 2008-07-18 15:40:55.000000000 +0100
|
||||
+++ libmusicbrainz-2.1.3/lib/c_wrapper.cpp 2008-07-18 15:42:05.000000000 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
$Id: c_wrapper.cpp 665 2003-10-16 22:21:10Z robert $
|
||||
|
||||
----------------------------------------------------------------------------*/
|
||||
+#include <cstring>
|
||||
#include "musicbrainz.h"
|
||||
#include "trm.h"
|
||||
#include "mb_c.h"
|
||||
Index: libmusicbrainz-2.1.3/lib/comhttpsocket.cpp
|
||||
===================================================================
|
||||
--- libmusicbrainz-2.1.3.orig/lib/comhttpsocket.cpp 2008-07-18 15:40:55.000000000 +0100
|
||||
+++ libmusicbrainz-2.1.3/lib/comhttpsocket.cpp 2008-07-18 15:42:38.000000000 +0100
|
||||
@@ -10,6 +10,8 @@
|
||||
#pragma warning(disable:4786)
|
||||
#endif
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
#include "comhttpsocket.h"
|
||||
#ifdef WIN32
|
||||
#include "../config_win32.h"
|
||||
Index: libmusicbrainz-2.1.3/lib/comsocket.cpp
|
||||
===================================================================
|
||||
--- libmusicbrainz-2.1.3.orig/lib/comsocket.cpp 2008-07-18 15:40:55.000000000 +0100
|
||||
+++ libmusicbrainz-2.1.3/lib/comsocket.cpp 2008-07-18 15:43:05.000000000 +0100
|
||||
@@ -28,6 +28,7 @@
|
||||
programed by : Sean Ward
|
||||
email : sward@relatable.com
|
||||
***************************************************************************/
|
||||
+#include <cstring>
|
||||
|
||||
#include "config.h"
|
||||
|
||||
Index: libmusicbrainz-2.1.3/lib/http.cpp
|
||||
===================================================================
|
||||
--- libmusicbrainz-2.1.3.orig/lib/http.cpp 2008-07-18 15:40:55.000000000 +0100
|
||||
+++ libmusicbrainz-2.1.3/lib/http.cpp 2008-07-18 15:41:32.000000000 +0100
|
||||
@@ -23,6 +23,8 @@
|
||||
|
||||
----------------------------------------------------------------------------*/
|
||||
#include <stdio.h>
|
||||
+#include <cstring>
|
||||
+#include <cstdlib>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <ctype.h>
|
||||
Index: libmusicbrainz-2.1.3/lib/sigclient.cpp
|
||||
===================================================================
|
||||
--- libmusicbrainz-2.1.3.orig/lib/sigclient.cpp 2008-07-18 15:40:55.000000000 +0100
|
||||
+++ libmusicbrainz-2.1.3/lib/sigclient.cpp 2008-07-18 15:43:27.000000000 +0100
|
||||
@@ -29,6 +29,8 @@
|
||||
email : ijr@relatable.com
|
||||
***************************************************************************/
|
||||
|
||||
+#include <cstring>
|
||||
+
|
||||
#ifdef WIN32
|
||||
#pragma warning(disable:4786)
|
||||
#endif
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. The library allows you to access the data held on the MusicBrainz server."
|
||||
HOMEPAGE = "http://musicbrainz.org"
|
||||
LICENSE = "LGPL"
|
||||
DEPENDS = "expat"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-2.1.3.tar.gz \
|
||||
file://gcc43_fix.patch;patch=1 \
|
||||
file://autofoo.patch;patch=1"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. The library allows you to access the data held on the MusicBrainz server."
|
||||
HOMEPAGE = "http://musicbrainz.org"
|
||||
LICENSE = "LGPLv2.1+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24 \
|
||||
file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=e7d3b3e6d8bb7ee278dc4040d380ebd5"
|
||||
DEPENDS = "expat neon"
|
||||
|
||||
PR = "r0"
|
||||
|
||||
SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${PN}-${PV}.tar.gz"
|
||||
|
||||
inherit cmake pkgconfig
|
||||
Loading…
Reference in New Issue