[meta-multimedia][PATCH 0/1] Add libmusicbrainz

[meta-multimedia][PATCH 0/1] Add libmusicbrainz

[Ross Burton]

libmusicbrainz isn't actually used in oe-core, as the dependency in
gst-plugins-bad is actually for the old v1 of libmusicbrainz, where as this is
v5.

Move to meta-multimedia as it's still a useful package.

One caveat is that if it's rebuild, you'll occasionally see cmake failures due
to the existing build and the host/target split.  I've tried fixing this but
don't understand enough about cmake to resolve it.

Ross

The following changes since commit d6d009b2625d6bcc7152d700fce2fdfecd3e0bd7:

  nodejs: update 0.6.x to 0.6.21 (2013-01-31 12:59:06 +0100)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib ross/mb

for you to fetch changes up to 8368232e3997a3553addd705aacd0d1c56177682:

  libmusicbrainz: add (2013-01-31 13:30:09 +0000)

----------------------------------------------------------------
Ross Burton (1):
      libmusicbrainz: add

 .../musicbrainz/files/allow-libdir-override.patch  |   21 +++++++++++
 .../musicbrainz/libmusicbrainz_git.bb              |   38 ++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
 create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb

Ross Burton (1):
  libmusicbrainz: add

 .../musicbrainz/files/allow-libdir-override.patch  |   21 +++++++++++
 .../musicbrainz/libmusicbrainz_git.bb              |   38 ++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
 create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb

-- 
1.7.10.4

[meta-multimedia][PATCH 1/1] libmusicbrainz: add

[Ross Burton]

Moved from oe-core.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../musicbrainz/files/allow-libdir-override.patch  |   21 +++++++++++
 .../musicbrainz/libmusicbrainz_git.bb              |   38 ++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
 create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb

diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
new file mode 100644
index 0000000..d59d12e
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
@@ -0,0 +1,21 @@
+Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation.  We dont
+easily have a way of determining something that patches ${LIB_SUFFIX} so we'll
+set LIB_INSTALL_DIR.
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
+
+Index: libmusicbrainz-3.0.3/CMakeLists.txt
+===================================================================
+--- libmusicbrainz-3.0.3.orig/CMakeLists.txt
++++ libmusicbrainz-3.0.3/CMakeLists.txt
+@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId)
+ SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+ SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE)
+ SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE)
+-SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH  "Installation prefix for object code libraries" FORCE)
++SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH  "Installation prefix for object code libraries")
+ SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE)
+ 
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc)
diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
new file mode 100644
index 0000000..051db7b
--- /dev/null
+++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
@@ -0,0 +1,38 @@
+SUMMARY = "MusicBrainz client library"
+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"
+DEPENDS = "expat neon"
+
+PV = "5.0.1+git${SRCPV}"
+PR = "r0"
+
+SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e"
+SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \
+           file://allow-libdir-override.patch "
+
+S = "${WORKDIR}/git"
+
+LDFLAGS_prepend_libc-uclibc = " -lpthread "
+
+
+inherit cmake pkgconfig
+
+do_configure_prepend() {
+    # The native build really doesn't like being rebuilt, so delete
+    # it if it's already present.
+    rm -rf build-native
+    mkdir build-native
+    cd build-native
+    cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \
+          -DCMAKE_C_COMPILER=${BUILD_CC} \
+          -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \
+          -DCMAKE_CXX_COMPILER=${BUILD_CXX} \
+          ..
+    make make-c-interface
+    cd ..
+}
+
+EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir} \
+                 -DIMPORT_EXECUTABLES=build-native/ImportExecutables.cmake"
-- 
1.7.10.4

Re: [meta-multimedia][PATCH 1/1] libmusicbrainz: add

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 4303 bytes --]

On Thu, Jan 31, 2013 at 01:34:14PM +0000, Ross Burton wrote:
> Moved from oe-core.

Merged, thanks

> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  .../musicbrainz/files/allow-libdir-override.patch  |   21 +++++++++++
>  .../musicbrainz/libmusicbrainz_git.bb              |   38 ++++++++++++++++++++
>  2 files changed, 59 insertions(+)
>  create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
>  create mode 100644 meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
> 
> diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch b/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
> new file mode 100644
> index 0000000..d59d12e
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/musicbrainz/files/allow-libdir-override.patch
> @@ -0,0 +1,21 @@
> +Allow LIB_INSTALL_DIR to be set by the the cmake configure invocation.  We dont
> +easily have a way of determining something that patches ${LIB_SUFFIX} so we'll
> +set LIB_INSTALL_DIR.
> +
> +Upstream-Status: Inappropriate [configuration]
> +
> +Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> +
> +Index: libmusicbrainz-3.0.3/CMakeLists.txt
> +===================================================================
> +--- libmusicbrainz-3.0.3.orig/CMakeLists.txt
> ++++ libmusicbrainz-3.0.3/CMakeLists.txt
> +@@ -26,7 +26,7 @@ FIND_PACKAGE(DiscId)
> + SET(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
> + SET(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix for executables and object code libraries" FORCE)
> + SET(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE)
> +-SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH  "Installation prefix for object code libraries" FORCE)
> ++SET(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH  "Installation prefix for object code libraries")
> + SET(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include CACHE PATH "Installation prefix for C header files" FORCE)
> + 
> + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmusicbrainz3.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libmusicbrainz3.pc)
> diff --git a/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
> new file mode 100644
> index 0000000..051db7b
> --- /dev/null
> +++ b/meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
> @@ -0,0 +1,38 @@
> +SUMMARY = "MusicBrainz client library"
> +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"
> +DEPENDS = "expat neon"
> +
> +PV = "5.0.1+git${SRCPV}"
> +PR = "r0"
> +
> +SRCREV = "0749dd0a35b4a54316da064475863a4ac6e28e7e"
> +SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git \
> +           file://allow-libdir-override.patch "
> +
> +S = "${WORKDIR}/git"
> +
> +LDFLAGS_prepend_libc-uclibc = " -lpthread "
> +
> +
> +inherit cmake pkgconfig
> +
> +do_configure_prepend() {
> +    # The native build really doesn't like being rebuilt, so delete
> +    # it if it's already present.
> +    rm -rf build-native
> +    mkdir build-native
> +    cd build-native
> +    cmake -DCMAKE_C_FLAGS=${BUILD_CFLAGS} \
> +          -DCMAKE_C_COMPILER=${BUILD_CC} \
> +          -DCMAKE_CXX_FLAGS=${BUILD_CXXFLAGS} \
> +          -DCMAKE_CXX_COMPILER=${BUILD_CXX} \
> +          ..
> +    make make-c-interface
> +    cd ..
> +}
> +
> +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR:PATH=${libdir} \
> +                 -DIMPORT_EXECUTABLES=build-native/ImportExecutables.cmake"
> -- 
> 1.7.10.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]