From 869ff7b11d071427364adfe7f84f9ce656e17593 Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 10 Nov 2020 15:13:33 +0100 Subject: [PATCH 1/4] New package: libaudec-0.2.4 --- srcpkgs/libaudec-devel | 1 + srcpkgs/libaudec/template | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 120000 srcpkgs/libaudec-devel create mode 100644 srcpkgs/libaudec/template diff --git a/srcpkgs/libaudec-devel b/srcpkgs/libaudec-devel new file mode 120000 index 00000000000..0310ac0e636 --- /dev/null +++ b/srcpkgs/libaudec-devel @@ -0,0 +1 @@ +libaudec \ No newline at end of file diff --git a/srcpkgs/libaudec/template b/srcpkgs/libaudec/template new file mode 100644 index 00000000000..eced8c9777e --- /dev/null +++ b/srcpkgs/libaudec/template @@ -0,0 +1,27 @@ +# Template file for 'libaudec' +pkgname=libaudec +version=0.2.4 +revision=1 +build_style=meson +hostmakedepends="pkg-config cmake" +makedepends="libsamplerate-devel libsndfile-devel" +short_desc="Read and resample audio files" +maintainer="teldra " +license="AGPL-3.0-or-later" +homepage="https://git.zrythm.org/cgit/libaudec/" +distfiles="https://git.zrythm.org/cgit/libaudec/snapshot/libaudec-${version}.tar.gz" +checksum=eb769bc50f1f2b45cf13159eceff3e302a60bb80617e57023ba3408608860a46 + +post_install() { + vlicense COPYING +} + +libaudec-devel_package() { + short_desc+=" - development files" + depends="${sourcepkg}>=${version}_${revision}" + nostrip=yes + pkg_install() { + vmove "usr/include" + vmove "usr/lib" + } +} From 6c1c6a6949b8af71a02add21ee71b401d5618a03 Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 10 Nov 2020 15:14:00 +0100 Subject: [PATCH 2/4] New package: libcyaml-1.1.0 --- common/shlibs | 1 + srcpkgs/libcyaml/patches/libcyaml.patch | 62 +++++++++++++++++++++++++ srcpkgs/libcyaml/template | 20 ++++++++ 3 files changed, 83 insertions(+) create mode 100644 srcpkgs/libcyaml/patches/libcyaml.patch create mode 100644 srcpkgs/libcyaml/template diff --git a/common/shlibs b/common/shlibs index c9f9bf389e8..121e7df5cd5 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3937,3 +3937,4 @@ libsimavr.so.1 simavr-1.6_2 libsimavrparts.so.1 simavr-1.6_2 libsword-1.8.1.so libsword-1.8.1_6 libtree-sitter.so.0 tree-sitter-0.18.2_1 +libcyaml.so.1 libcyaml-1.1.0_1 diff --git a/srcpkgs/libcyaml/patches/libcyaml.patch b/srcpkgs/libcyaml/patches/libcyaml.patch new file mode 100644 index 00000000000..9f114649a2d --- /dev/null +++ b/srcpkgs/libcyaml/patches/libcyaml.patch @@ -0,0 +1,62 @@ +From 0e947264b947f51f7ea785068637c4bfce5d4171 Mon Sep 17 00:00:00 2001 +From: Michael Drake +Date: Sat, 27 Jun 2020 21:35:40 +0100 +Subject: [PATCH] Tests: Update reference data for libyaml version 0.2.5. + +Libyaml does not emit trailing whitespace now. Since we want +to work with older versions of libyaml too, we check against +reference output with and without trailing whitespace. + +See: https://github.com/yaml/libyaml/pull/186 +--- + test/units/save.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) + +diff --git a/test/units/save.c b/test/units/save.c +index 7866ac3..dc0c5bf 100644 +--- a/test/units/save.c ++++ b/test/units/save.c +@@ -3476,7 +3476,7 @@ static bool test_save_sequence_null_values_int( + ttest_report_ctx_t *report, + const cyaml_config_t *config) + { +- static const unsigned char ref[] = ++ static const unsigned char ref1[] = + "---\n" + "- 7\n" + "- 6\n" +@@ -3487,6 +3487,18 @@ static bool test_save_sequence_null_values_int( + "- \n" + "- 0\n" + "...\n"; ++ /* As of libyaml 0.2.5, trailing spaces are not emitted. */ ++ static const unsigned char ref2[] = ++ "---\n" ++ "- 7\n" ++ "- 6\n" ++ "- 5\n" ++ "-\n" ++ "- 3\n" ++ "- 2\n" ++ "-\n" ++ "- 0\n" ++ "...\n"; + static const int d[] = { 7, 6, 5, 4, 3, 2, 1, 0 }; + static const int *data[] = { d + 0, d + 1, d + 2, NULL, + d + 4, d + 5, NULL, d + 7, }; +@@ -3515,11 +3527,12 @@ static bool test_save_sequence_null_values_int( + return ttest_fail(&tc, cyaml_strerror(err)); + } + +- if (len != YAML_LEN(ref) || memcmp(ref, buffer, len) != 0) { ++ if ((len != YAML_LEN(ref1) || memcmp(ref1, buffer, len) != 0) && ++ (len != YAML_LEN(ref2) || memcmp(ref2, buffer, len) != 0)) { + return ttest_fail(&tc, "Bad data:\n" + "EXPECTED (%zu):\n\n%.*s\n\n" + "GOT (%zu):\n\n%.*s\n", +- YAML_LEN(ref), YAML_LEN(ref), ref, ++ YAML_LEN(ref1), YAML_LEN(ref1), ref1, + len, len, buffer); + } + + diff --git a/srcpkgs/libcyaml/template b/srcpkgs/libcyaml/template new file mode 100644 index 00000000000..54fed5e0b1e --- /dev/null +++ b/srcpkgs/libcyaml/template @@ -0,0 +1,20 @@ +# Template file for 'libcyaml' +pkgname=libcyaml +version=1.1.0 +revision=1 +build_style=gnu-makefile +make_use_env=yes +hostmakedepends="pkg-config" +makedepends="libyaml-devel" +depends="libyaml" +short_desc="C library for reading and writing YAML" +maintainer="teldra " +license="ISC" +homepage="https://github.com/tlsa/libcyaml" +distfiles="${homepage}/archive/v${version}.tar.gz" +checksum=37a00ed8ec206b60a712acfd44196bef063b8f02e376d8e86f61a7007a81daea +patch_args="-Np1" + +post_install() { + vlicense LICENSE +} From 1001d5b1a2fede6780bf7ac5b37e142c31e10347 Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 10 Nov 2020 15:14:27 +0100 Subject: [PATCH 3/4] New package: reproc-14.2.1 --- srcpkgs/reproc/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/reproc/template diff --git a/srcpkgs/reproc/template b/srcpkgs/reproc/template new file mode 100644 index 00000000000..c3cfcf01a0e --- /dev/null +++ b/srcpkgs/reproc/template @@ -0,0 +1,18 @@ +# Template file for 'reproc' +pkgname=reproc +version=14.2.1 +revision=1 +build_style=cmake +short_desc="Simplifies working with external CLI applications from C and C++" +maintainer="teldra " +license="MIT" +homepage="https://github.com/DaanDeMeyer/reproc" +distfiles="https://github.com/DaanDeMeyer/reproc/archive/v${version}.tar.gz" +checksum=f75f0524bdbf03813c126655f83d9c1b6a5b695c8e840bd62cd7aa61a96c66e3 + +export CFLAGS="$CFLAGS -fPIC" +export BUILD_CFLAGS="$BUILD_CFLAGS -fPIC" + +post_install() { + vlicense LICENSE +} From 54526ee3729faee5194e093d31343d2f26c1c13e Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 10 Nov 2020 15:14:50 +0100 Subject: [PATCH 4/4] New package: zrythm-0.8.982 closes https://github.com/void-linux/void-packages/issues/26221 closes https://github.com/void-linux/void-packages/issues/21236 closes https://github.com/void-linux/void-packages/issues/23831 --- srcpkgs/zrythm/template | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 srcpkgs/zrythm/template diff --git a/srcpkgs/zrythm/template b/srcpkgs/zrythm/template new file mode 100644 index 00000000000..bf3c04f460b --- /dev/null +++ b/srcpkgs/zrythm/template @@ -0,0 +1,37 @@ +# Template file for 'zrythm' +pkgname=zrythm +version=0.8.982 +revision=1 +archs="~*-musl" +build_style=meson +build_helper=qemu +hostmakedepends="cmake gettext xdg-utils pkg-config guile glib-devel" +makedepends="libzstd-devel libcyaml reproc guile-devel lilv-devel libaudec-devel + chromaprint-devel rubberband-devel fftw-devel gtk+3-devel gtksourceview4-devel libyaml-devel + jack-devel alsa-lib-devel graphviz-devel SDL2-devel python3-Sphinx" +depends="breeze-icons" +short_desc="Highly automated and intuitive digital audio workstation" +maintainer="teldra " +license="AGPL-3.0-or-later" +homepage="https://www.zrythm.org/" +distfiles="https://git.zrythm.org/cgit/zrythm/snapshot/zrythm-${version}.tar.gz" +checksum=73a63bbc636c780e7ddf86830601ea39546a4c9747d49438b74bc4cae2c4814d + +if [ "$CROSS_BUILD" ]; then + configure_args+=" -Dmanpage=false" +else + hostmakedepends+=" help2man" +fi + +case "$XBPS_TARGET_MACHINE" in + arm*|aarch64) + makedepends+=" libatomic_ops-devel" +esac + +post_install() { + # Move bash-completion to the correct dir. + vmkdir usr/share/bash-completion/completions + mv ${DESTDIR}/etc/bash_completion.d \ + ${DESTDIR}/usr/share/bash-completion/completions + vlicense COPYING +}