summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-21 15:26:27 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-26 11:34:08 +0000
commit216bceccf7da86c74bd72128f5379580ac062140 (patch)
tree8c8b9d8ac532a40ee048a1839234045cb52c0e42
parentaa90e6090d482f43ee941dda6c7f0bc22116c89f (diff)
downloadpoky-216bceccf7da86c74bd72128f5379580ac062140.tar.gz
libmusicbrainz: upgrade to git SRCREV 0749dd0a35b4a543
include/musicbrainz3/includes.h: removed from LIC_FILES_CHKSUM - the file is not present in the new version fix_build_issue_for_gcc_4.5.0.patch: removed - the patched files are removed [Other changes] - moved to git (the last tag version doesn't support cross-compilation) - we need to build the native make-c-interface executable before configuring cmake for the target (From OE-Core rev: a9d25a8e6720ceff5cfefa3191026357dd6e0f49) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch (renamed from meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch)0
-rw-r--r--meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch39
-rw-r--r--meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb22
-rw-r--r--meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb36
4 files changed, 36 insertions, 61 deletions
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch b/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
index d59d12e69b..d59d12e69b 100644
--- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/allow-libdir-override.patch
+++ b/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch
deleted file mode 100644
index 6fb45e1726..0000000000
--- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/fix_build_issue_for_gcc_4.5.0.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1GCC 4.4 cleaned up some more C++ headers. You always have to #include
2headers directly and cannot rely for things to be included indirectly.
3
4Otherwise you get errors like this:
5
6| /home/nitin/build/build0/tmp/work/i586-poky-linux/libmusicbrainz-3.0.2-r0/libmusicbrainz-3.0.2/src/utils_private.cpp: In function 'std::string MusicBrainz::intToString(int)':
7| /home/nitin/build/build0/tmp/work/i586-poky-linux/libmusicbrainz-3.0.2-r0/libmusicbrainz-3.0.2/src/utils_private.cpp:38:23: error: 'sprintf' was not declared in this scope
8| /home/nitin/build/build0/tmp/work/i586-poky-linux/libmusicbrainz-3.0.2-r0/libmusicbrainz-3.0.2/src/utils_private.cpp: In function 'void MusicBrainz::debug(const char*, ...)':
9| /home/nitin/build/build0/tmp/work/i586-poky-linux/libmusicbrainz-3.0.2-r0/libmusicbrainz-3.0.2/src/utils_private.cpp:80:10: error: 'stderr' was not declared in this scope
10| /home/nitin/build/build0/tmp/work/i586-poky-linux/libmusicbrainz-3.0.2-r0/libmusicbrainz-3.0.2/src/utils_private.cpp:80:33: error: 'fprintf' was not declared in this scope
11| /home/nitin/build/build0/tmp/work/i586-poky-linux/libmusicbrainz-3.0.2-r0/libmusicbrainz-3.0.2/src/utils_private.cpp:81:26: error: 'vfprintf' was not declared in this scope
12| make[2]: *** [src/CMakeFiles/musicbrainz3.dir/utils_private.o] Error 1
13| make[2]: *** Waiting for unfinished jobs....
14| /home/nitin/build/build0/tmp/work/i586-poky-linux/libmusicbrainz-3.0.2-r0/libmusicbrainz-3.0.2/src/xmlParser/xmlParser.cpp:116:1: warning: 'typedef' was ignored in this declaration
15| make[1]: *** [src/CMakeFiles/musicbrainz3.dir/all] Error 2
16| make: *** [all] Error 2
17| FATAL: oe_runmake failed
18NOTE: package libmusicbrainz-3.0.2-r0: task do_compile: Failed
19
20Found the solution here:
21http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504895
22
23Date: 2010/07/28
24Nitin A Kamble <nitin.a.kamble@intel.com>
25
26Upstream-Status: Inappropriate [debian patch]
27
28Index: libmusicbrainz-3.0.2/src/utils_private.cpp
29===================================================================
30--- libmusicbrainz-3.0.2.orig/src/utils_private.cpp
31+++ libmusicbrainz-3.0.2/src/utils_private.cpp
32@@ -20,6 +20,7 @@
33 * $Id: utils_private.cpp 9934 2008-07-02 06:57:10Z luks $
34 */
35
36+#include <cstdio>
37 #include <cstdlib>
38 #include <cstring>
39 #include <cstdarg>
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
deleted file mode 100644
index 913c463b62..0000000000
--- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb
+++ /dev/null
@@ -1,22 +0,0 @@
1SUMMARY = "MusicBrainz Client"
2DESCRIPTION = "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."
3HOMEPAGE = "http://musicbrainz.org"
4LICENSE = "LGPLv2.1+"
5LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24 \
6 file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=9ab2846573f560cea7561da472803a72"
7DEPENDS = "expat neon"
8
9PR = "r4"
10
11SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${BPN}-${PV}.tar.gz \
12 file://fix_build_issue_for_gcc_4.5.0.patch \
13 file://allow-libdir-override.patch "
14
15LDFLAGS_prepend_libc-uclibc = " -lpthread "
16
17SRC_URI[md5sum] = "f4824d0a75bdeeef1e45cc88de7bb58a"
18SRC_URI[sha256sum] = "7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5"
19
20inherit cmake pkgconfig
21
22EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir}"
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
new file mode 100644
index 0000000000..7343662d01
--- /dev/null
+++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
@@ -0,0 +1,36 @@
1SUMMARY = "MusicBrainz Client"
2DESCRIPTION = "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."
3HOMEPAGE = "http://musicbrainz.org"
4LICENSE = "LGPLv2.1+"
5LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24"
6DEPENDS = "expat neon"
7
8PV = "5.0.1+git${SRCPV}"
9PR = "r0"
10
11SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e"
12SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \
13 file://allow-libdir-override.patch "
14
15S = "${WORKDIR}/git"
16
17LDFLAGS_prepend_libc-uclibc = " -lpthread "
18
19
20inherit cmake pkgconfig
21
22do_configure_prepend() {
23 mkdir build-native
24 cd build-native
25 cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \
26 -DCMAKE_C_COMPILER=${BUILD_CC} \
27 -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \
28 -DCMAKE_CXX_COMPILER=${BUILD_CXX} \
29 -DCMAKE_LINK_FLAGS=${BUILD_LDFLAGS} \
30 ..
31 make
32 cd ..
33}
34
35EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir} \
36 -DIMPORT_EXECUTABLES=build-native/ImportExecutables.cmake"