Skip to content
Snippets Groups Projects
Commit 1f66fbd2 authored by Zach DeCook's avatar Zach DeCook :keyboard: Committed by alice
Browse files

community/verovio: upgrade to 3.11.0

parent 20ae74f0
No related branches found
No related tags found
2 merge requests!39304[3.16] main/expat: security upgrade to 2.4.9,!36667community/verovio: upgrade to 3.11.0
Pipeline #129225 passed
# Maintainer: Zach DeCook <zachdecook@librem.one>
pkgname=verovio
pkgver=3.10.0
pkgver=3.11.0
pkgrel=0
_commit=845ab54
pkgdesc="Music notation engraving for MEI with MusicXML and Humdrum support"
......@@ -24,7 +24,6 @@ subpackages="
source="
$pkgname-$pkgver.tar.gz::https://github.com/rism-digital/verovio/archive/refs/tags/version-$pkgver.tar.gz
0001-data-change-directory-to-usr-share-verovio.patch
fix-c-wrapper.patch
install-prefix.patch
commit-version.patch
python-data-path.patch
......@@ -111,9 +110,8 @@ py3() {
}
sha512sums="
eb691e7c0fb87b954c0bae716a7ab8968db765c374b81fe321d9cea18676c9d335f2e70586cd82b32f92b90c3cd61482ab8cdf27c217cc8579a56db6be9fc051 verovio-3.10.0.tar.gz
273da318d5d0efcba009275426ca1fc9a055bd484d7e4847e950ee27f8f2017871bb84faf215f7bf0dd74de6939ffe19851347f11d98a3dd0f278b83eaef39ab verovio-3.11.0.tar.gz
89f0d0f797910462ceb1043dee210e74fc00a6c309ef0637173a018224967def5eb1f66c30bfd7499040ccc2f67015d0ec2b37e9e8edc2a5c26c4865ba8c07df 0001-data-change-directory-to-usr-share-verovio.patch
87dd5763a4cdf61dec179659173a1fb207f55f5428ae429f4a5bbe59a997097c5ebc7ca19389974138b446f9837c9a6114625e0869b224fbe6af13a2dfe63c87 fix-c-wrapper.patch
22cf4be4ddd55231980d8cf4740f1152273800811fd78ecc2c82b3ea228b7406d4186a28780146111242c1dc53bfff0e2e264b624ae5871802242bd5ec86eae7 install-prefix.patch
8438687d6b707c08e53fc87598ad74412b530139008bbbd7c4300f83104d2481ebe00923c1681d762445e9eb3c307b0c087c89ab49e2d60b22d7a31ce313063a commit-version.patch
f62560a8a28d13d25e78a1b33c20a7e69662002c30767853e24ca6268775b3ff48792034803f39b5a9398a46f6ff9b18fbc09a5bef9d38539eeebeefaeb0cdc3 python-data-path.patch
......
Patch-Source: https://github.com/rism-digital/verovio/pull/2911
From a2b287c28fc120e682fceb71c8fd46cd617a2f2f Mon Sep 17 00:00:00 2001
From: Zach DeCook <zachdecook@librem.one>
Date: Fri, 3 Jun 2022 12:52:42 -0400
Subject: [PATCH] c wrapper: Remove default values as they aren't supported by
C
See discussion at https://github.com/rism-digital/verovio/commit/c6cfec6b00eb025e8a502209f79cd30301ab2214#r75216422
---
tools/c_wrapper.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/c_wrapper.h b/tools/c_wrapper.h
index 318ece6423..67dc65bd87 100644
--- a/tools/c_wrapper.h
+++ b/tools/c_wrapper.h
@@ -28,7 +28,7 @@ const char *vrvToolkit_convertHumdrumToHumdrum(void *tkPtr, const char *humdrumD
const char *vrvToolkit_convertHumdrumToMIDI(void *tkPtr, const char *humdrumData);
const char *vrvToolkit_convertMEIToHumdrum(void *tkPtr, const char *meiData);
const char *vrvToolkit_getLog(void *tkPtr);
-const char *vrvToolkit_getMEI(void *tkPtr, const char *options = "");
+const char *vrvToolkit_getMEI(void *tkPtr, const char *options);
const char *vrvToolkit_getMIDIValuesForElement(void *tkPtr, const char *xmlId);
const char *vrvToolkit_getNotatedIdForElement(void *tkPtr, const char *xmlId);
const char *vrvToolkit_getOptions(void *tkPtr, bool default_values);
@@ -41,9 +41,9 @@ bool vrvToolkit_loadZipDataBase64(void *tkPtr, const char *data);
bool vrvToolkit_loadZipDataBuffer(void *tkPtr, const unsigned char *data, int length);
const char *vrvToolkit_renderToMIDI(void *tkPtr, const char *c_options);
const char *vrvToolkit_renderToPAE(void *tkPtr);
-const char *vrvToolkit_renderToSVG(void *tkPtr, int page_no = 1, bool xmlDeclaration = false);
-const char *vrvToolkit_renderToTimemap(void *tkPtr, const char *c_options = "");
-void vrvToolkit_redoLayout(void *tkPtr, const char *c_options = "");
+const char *vrvToolkit_renderToSVG(void *tkPtr, int page_no, bool xmlDeclaration);
+const char *vrvToolkit_renderToTimemap(void *tkPtr, const char *c_options);
+void vrvToolkit_redoLayout(void *tkPtr, const char *c_options);
void vrvToolkit_redoPagePitchPosLayout(void *tkPtr);
const char *vrvToolkit_renderData(void *tkPtr, const char *data, const char *options);
void vrvToolkit_resetOptions(void *tkPtr);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment