diff options
author | Ross Burton <ross.burton@intel.com> | 2013-03-11 16:46:36 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-12 18:33:27 +0000 |
commit | d6a06cf42a26dc2c7ec26d61b4a50d251daddd84 (patch) | |
tree | 42302c43f01726db6c6f9a253ebdeb34fa7f66f6 | |
parent | 365eb9b5d22208c967dcd91d8ab52faed20f04b5 (diff) | |
download | poky-d6a06cf42a26dc2c7ec26d61b4a50d251daddd84.tar.gz |
musicbrainz: remove
This is in meta-multimedia now, so remove from oe-core.
(From OE-Core rev: 62a2f7e9fad6cd6863670ba2376f73c0e929f075)
Signed-off-by: Ross Burton <ross.burton@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 | 21 | ||||
-rw-r--r-- | meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb | 38 |
2 files changed, 0 insertions, 59 deletions
diff --git a/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch deleted file mode 100644 index d59d12e69b..0000000000 --- a/meta/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation. We dont | ||
2 | easily have a way of determining something that patches ${LIB_SUFFIX} so we'll | ||
3 | set LIB_INSTALL_DIR. | ||
4 | |||
5 | Upstream-Status: Inappropriate [configuration] | ||
6 | |||
7 | Signed-off-by: Kumar Gala <galak@kernel.crashing.org> | ||
8 | |||
9 | Index: libmusicbrainz-3.0.3/CMakeLists.txt | ||
10 | =================================================================== | ||
11 | --- libmusicbrainz-3.0.3.orig/CMakeLists.txt | ||
12 | +++ libmusicbrainz-3.0.3/CMakeLists.txt | ||
13 | @@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId) | ||
14 | SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)") | ||
15 | SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE) | ||
16 | SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE) | ||
17 | -SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE) | ||
18 | +SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries") | ||
19 | SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE) | ||
20 | |||
21 | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc) | ||
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb deleted file mode 100644 index 21eec6df5a..0000000000 --- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | SUMMARY = "MusicBrainz Client" | ||
2 | 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." | ||
3 | HOMEPAGE = "http://musicbrainz.org" | ||
4 | LICENSE = "LGPLv2.1+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24" | ||
6 | DEPENDS = "expat neon" | ||
7 | |||
8 | PV = "5.0.1+git${SRCPV}" | ||
9 | PR = "r0" | ||
10 | |||
11 | SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e" | ||
12 | SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \ | ||
13 | file://allow-libdir-override.patch " | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | LDFLAGS_prepend_libc-uclibc = " -lpthread " | ||
18 | |||
19 | |||
20 | inherit cmake pkgconfig | ||
21 | |||
22 | do_configure_prepend() { | ||
23 | # The native build really doesn't like being rebuilt, so delete | ||
24 | # it if it's already present. | ||
25 | rm -rf build-native | ||
26 | mkdir build-native | ||
27 | cd build-native | ||
28 | cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \ | ||
29 | -DCMAKE_C_COMPILER=${BUILD_CC} \ | ||
30 | -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \ | ||
31 | -DCMAKE_CXX_COMPILER=${BUILD_CXX} \ | ||
32 | .. | ||
33 | make make-c-interface | ||
34 | cd .. | ||
35 | } | ||
36 | |||
37 | EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir} \ | ||
38 | -DIMPORT_EXECUTABLES=build-native/ImportExecutables.cmake" | ||