diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-multimedia/musicbrainz | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-multimedia/musicbrainz')
-rw-r--r-- | meta/recipes-multimedia/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch | 37 | ||||
-rw-r--r-- | meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.2.bb | 13 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch b/meta/recipes-multimedia/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch new file mode 100644 index 0000000000..80d4d8bf2f --- /dev/null +++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz/fix_build_issue_for_gcc_4.5.0.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | GCC 4.4 cleaned up some more C++ headers. You always have to #include | ||
2 | headers directly and cannot rely for things to be included indirectly. | ||
3 | |||
4 | Otherwise 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 | ||
18 | NOTE: package libmusicbrainz-3.0.2-r0: task do_compile: Failed | ||
19 | |||
20 | Found the solution here: | ||
21 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=504895 | ||
22 | |||
23 | Date: 2010/07/28 | ||
24 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
25 | |||
26 | Index: libmusicbrainz-3.0.2/src/utils_private.cpp | ||
27 | =================================================================== | ||
28 | --- libmusicbrainz-3.0.2.orig/src/utils_private.cpp | ||
29 | +++ libmusicbrainz-3.0.2/src/utils_private.cpp | ||
30 | @@ -20,6 +20,7 @@ | ||
31 | * $Id: utils_private.cpp 9934 2008-07-02 06:57:10Z luks $ | ||
32 | */ | ||
33 | |||
34 | +#include <cstdio> | ||
35 | #include <cstdlib> | ||
36 | #include <cstring> | ||
37 | #include <cstdarg> | ||
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.2.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.2.bb new file mode 100644 index 0000000000..5dfda12a3d --- /dev/null +++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.2.bb | |||
@@ -0,0 +1,13 @@ | |||
1 | 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." | ||
2 | HOMEPAGE = "http://musicbrainz.org" | ||
3 | LICENSE = "LGPLv2.1+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24 \ | ||
5 | file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=e7d3b3e6d8bb7ee278dc4040d380ebd5" | ||
6 | DEPENDS = "expat neon" | ||
7 | |||
8 | PR = "r1" | ||
9 | |||
10 | SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${PN}-${PV}.tar.gz \ | ||
11 | file://fix_build_issue_for_gcc_4.5.0.patch" | ||
12 | |||
13 | inherit cmake pkgconfig | ||