[gnome-build-meta/abderrahim/revert-stuff: 2/3] Revert "elements/core/sushi.bst: It doesn't depend on musicbrainz anymore"
- From: Abderrahim Kitouni <akitouni src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/abderrahim/revert-stuff: 2/3] Revert "elements/core/sushi.bst: It doesn't depend on musicbrainz anymore"
- Date: Wed, 18 Aug 2021 09:22:07 +0000 (UTC)
commit 4da5ee26da560dfa12d124e8194ce85961777207
Author: Abderrahim Kitouni <akitouni gnome org>
Date: Wed Aug 18 10:12:37 2021 +0100
Revert "elements/core/sushi.bst: It doesn't depend on musicbrainz anymore"
This reverts commit ac8f595cf38adc5c1aa894007dc8addd93c48d8d.
elements/core-deps/libmusicbrainz.bst | 16 ++++++++++++++++
elements/core/sushi.bst | 1 +
files/libmusicbrainz/cmake-ninja.patch | 22 ++++++++++++++++++++++
3 files changed, 39 insertions(+)
---
diff --git a/elements/core-deps/libmusicbrainz.bst b/elements/core-deps/libmusicbrainz.bst
new file mode 100644
index 00000000..2630da84
--- /dev/null
+++ b/elements/core-deps/libmusicbrainz.bst
@@ -0,0 +1,16 @@
+kind: cmake
+sources:
+- kind: tar
+ url: github_com:metabrainz/libmusicbrainz/releases/download/release-5.1.0/libmusicbrainz-5.1.0.tar.gz
+# this patch has been merged upstream and can be removed when this is updated
+- kind: patch
+ path: files/libmusicbrainz/cmake-ninja.patch
+build-depends:
+- freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
+depends:
+- core-deps/neon.bst
+- freedesktop-sdk.bst:components/libxml2.bst
+- freedesktop-sdk.bst:bootstrap-import.bst
+variables:
+ cmake-local: >-
+ -DLIB_SUFFIX="/%{gcc_triplet}"
diff --git a/elements/core/sushi.bst b/elements/core/sushi.bst
index 456fb794..e0d7177e 100644
--- a/elements/core/sushi.bst
+++ b/elements/core/sushi.bst
@@ -6,6 +6,7 @@ sources:
build-depends:
- freedesktop-sdk.bst:public-stacks/buildsystem-meson.bst
depends:
+- core-deps/libmusicbrainz.bst
- core/evince.bst
- sdk/gjs.bst
- sdk/gobject-introspection.bst
diff --git a/files/libmusicbrainz/cmake-ninja.patch b/files/libmusicbrainz/cmake-ninja.patch
new file mode 100644
index 00000000..fe59dc6e
--- /dev/null
+++ b/files/libmusicbrainz/cmake-ninja.patch
@@ -0,0 +1,22 @@
+commit 36262d60fe92fe7a2c9bfb40e736bfcd29a6c3bd
+Author: Abderrahim Kitouni <a kitouni gmail com>
+Date: Fri Apr 13 09:56:57 2018 +0100
+
+ src/CMakelists.txt: do not use wildcards for dependencies
+
+ This is discouraged by cmake's documentation and doesn't work with the ninja generator.
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 68c04e3..f7439d3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -37,7 +37,8 @@ ADD_CUSTOM_COMMAND(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.cc ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h
${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+ COMMAND make-c-interface ${CMAKE_CURRENT_SOURCE_DIR} cinterface.xml ${CMAKE_CURRENT_BINARY_DIR}
mb5_c.cc mb5_c.h
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/mb5_c.h
${CMAKE_CURRENT_BINARY_DIR}/../include/musicbrainz5/mb5_c.h
+- DEPENDS make-c-interface cinterface.xml *.inc
++ DEPENDS make-c-interface cinterface.xml c-int-medium-defines.inc c-int-query-source.inc
c-int-source-funcs.inc
++ c-int-medium-source.inc c-int-release-defines.inc c-int-query-defines.inc
c-int-release-source.inc
+ )
+
+ ADD_CUSTOM_TARGET(src_gen DEPENDS mb5_c.h)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]