Browse Source

add libpanel dependency

master
Alexandros Theodotou 8 months ago
parent
commit
7a049d7aa5
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 2
      arch/PKGBUILD.in
  2. 2
      debian/rules.in
  3. 16
      flatpak/org.zrythm.Zrythm.json
  4. 2
      osx-brew/zrythm.rb.in
  5. 2
      rpm/zrythm.spec.in
  6. 57
      windows-msys/PKGBUILD-libpanel-mingw.in
  7. 5
      windows-msys/PKGBUILD.in
  8. 26
      windows-msys/meson.build

2
arch/PKGBUILD.in

@ -71,7 +71,7 @@ package() { @@ -71,7 +71,7 @@ package() {
cd $_rootdir
install -vDm 644 AUTHORS CONTRIBUTING.md CHANGELOG.md README.md THANKS TRANSLATORS \
-t "${pkgdir}/usr/share/doc/zrythm/"
@MESON_BIN@ install -C build --skip-subprojects=libbacktrace,libaudec,reproc,rtmidi,rtaudio,libcyaml --destdir="${pkgdir}/"
@MESON_BIN@ install -C build --skip-subprojects=libbacktrace,libaudec,reproc,rtmidi,rtaudio,libcyaml,libpanel --destdir="${pkgdir}/"
# copy all subproject libs
if ls "${pkgdir}/usr/lib/"*.so; then
mv ${pkgdir}/usr/lib/*.so* ${pkgdir}/usr/lib/zrythm/

2
debian/rules.in vendored

@ -50,7 +50,7 @@ override_dh_auto_test: @@ -50,7 +50,7 @@ override_dh_auto_test:
override_dh_auto_install:
cd debian/build && \
PATH=$$PATH:/home/build/.local/bin \
@MESON_BIN@ install --skip-subprojects=libaudec,reproc,rtmidi,rtaudio,libcyaml \
@MESON_BIN@ install --skip-subprojects=libaudec,reproc,rtmidi,rtaudio,libcyaml,libpanel \
--destdir="${CURDIR}/debian/zrythm@DASH_TRIAL@"
rm -rf "${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/include"
rm -rf "${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/libbacktrace"*

16
flatpak/org.zrythm.Zrythm.json

@ -398,6 +398,22 @@ @@ -398,6 +398,22 @@
}
]
},
{
"name": "libpanel",
"buildsystem": "meson",
"config-opts": [
"-Dvapi=false",
"-Dinstall-examples=false",
"-Dintrospection=disabled"
],
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/chergert/libpanel",
"commit": "ac8cf86eb402c8877f7766ff13886bdd91519845"
}
]
},
{
"name": "zrythm",
"builddir": true,

2
osx-brew/zrythm.rb.in

@ -88,7 +88,7 @@ class Zrythm@TRIAL_INITIAL_UPPERCASE@ < Formula @@ -88,7 +88,7 @@ class Zrythm@TRIAL_INITIAL_UPPERCASE@ < Formula
system "ninja", "-v"
# install
system "meson", "install", "--skip-subprojects=libaudec,libbacktrace,libcyaml,reproc,rtaudio,rtmidi,zstd"
system "meson", "install", "--skip-subprojects=libaudec,libbacktrace,libcyaml,reproc,rtaudio,rtmidi,zstd,libpanel"
# move back
system "mv", "../VERSION.txt", "../VERSION"

2
rpm/zrythm.spec.in

@ -130,7 +130,7 @@ PKG_CONFIG_PATH=@LIBRARY_PKG_CONFIG_PATH@:@CARLA_PKG_CONFIG_PATH@ \ @@ -130,7 +130,7 @@ PKG_CONFIG_PATH=@LIBRARY_PKG_CONFIG_PATH@:@CARLA_PKG_CONFIG_PATH@ \
ninja -C build
%install
@MESON_BIN@ install -C build --skip-subprojects=libaudec,reproc,rtmidi,rtaudio,libcyaml --destdir="%{buildroot}/"
@MESON_BIN@ install -C build --skip-subprojects=libaudec,reproc,rtmidi,rtaudio,libcyaml,libpanel --destdir="%{buildroot}/"
mkdir -p "%{buildroot}%{_libdir}/lv2"
mkdir -p "%{buildroot}%{_libdir}/zrythm/carla"
rm -rf "%{buildroot}%{_includedir}"

57
windows-msys/PKGBUILD-libpanel-mingw.in

@ -0,0 +1,57 @@ @@ -0,0 +1,57 @@
# Contributor: Alexandros Theodotou <alex at zrythm dot org>
_realname=libpanel
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
_commit='main'
pkgver=0.1
pkgrel=1
pkgdesc="libpanel"
arch=('any')
url="https://cairographics.org/"
license=(LGPL3.0)
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
"${MINGW_PACKAGE_PREFIX}-pkg-config"
"${MINGW_PACKAGE_PREFIX}-gobject-introspection"
"${MINGW_PACKAGE_PREFIX}-meson"
"${MINGW_PACKAGE_PREFIX}-gtk-doc")
depends=("${MINGW_PACKAGE_PREFIX}-libadwaita")
source=("https://gitlab.gnome.org/chergert/libpanel/-/archive/${_commit}/libpanel-${_commit}.tar.gz")
sha256sums=('SKIP')
prepare() {
rm -rf /tmp/${_realname}-${pkgver}
mv "${srcdir}/${_realname}-${_commit}" /tmp/${_realname}-$pkgver
cd /tmp/${_realname}-$pkgver
sed -i "6i add_global_link_arguments ('-lssp', language: [ 'c', 'cpp' ])" meson.build
sed -i "1i subdir_done()" testsuite/meson.build
}
build() {
rm -rf /tmp/${_realname}-build-${MINGW_CHOST}
mkdir -p /tmp/${_realname}-build-${MINGW_CHOST}
cd /tmp/${_realname}-build-${MINGW_CHOST}
MSYS2_ARG_CONV_EXCL="--prefix=" \
${MINGW_PREFIX}/bin/meson \
--prefix=${MINGW_PREFIX} \
--buildtype=debug \
-Dvapi=false \
-Dinstall-examples=false \
-Dintrospection=disabled \
-Ddefault_library=shared \
/tmp/${_realname}-${pkgver}
meson compile
}
package() {
cd /tmp/${_realname}-build-${MINGW_CHOST}
DESTDIR="${pkgdir}" meson install
install -Dm644 "/tmp/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
# reclaim space
rm -rf /tmp/${_realname}-build-${MINGW_CHOST}
}

5
windows-msys/PKGBUILD.in

@ -29,6 +29,7 @@ pkgdesc='a highly automated and intuitive digital audio workstation (mingw-w64)' @@ -29,6 +29,7 @@ pkgdesc='a highly automated and intuitive digital audio workstation (mingw-w64)'
depends=("${MINGW_PACKAGE_PREFIX}-gtk4"
"${MINGW_PACKAGE_PREFIX}-boost"
"${MINGW_PACKAGE_PREFIX}-libadwaita"
"${MINGW_PACKAGE_PREFIX}-libpanel"
"${MINGW_PACKAGE_PREFIX}-cantarell-fonts"
"${MINGW_PACKAGE_PREFIX}-curl-winssl"
"${MINGW_PACKAGE_PREFIX}-rubberband"
@ -81,8 +82,6 @@ build() { @@ -81,8 +82,6 @@ build() {
mv TRANSLATORS2 ${srcdir}/zrythm-${pkgver}/TRANSLATORS
sed -i -e 's|"|'\''|g' ${srcdir}/zrythm-${pkgver}/TRANSLATORS
# FIXME remove fallback for libadwaita when version after
# 1.1.0 is released
echo "using prefix ${MINGW_PREFIX}"
MSYS2_ARG_CONV_EXCL="--prefix=;--buildtype=" \
${MINGW_PREFIX}/bin/meson \
@ -108,7 +107,7 @@ build() { @@ -108,7 +107,7 @@ build() {
-Db_lto=false \
-Dtests=false \
-Dcarla_use_cv32_patchbay_variant=true \
-Dforce_fallback_for=rtmidi,rtaudio,libadwaita \
-Dforce_fallback_for=rtmidi,rtaudio \
"../zrythm-${pkgver}"
${MINGW_PREFIX}/bin/ninja -d explain -v

26
windows-msys/meson.build

@ -75,6 +75,11 @@ mingw_libadwaita_pkgbuild = configure_file ( @@ -75,6 +75,11 @@ mingw_libadwaita_pkgbuild = configure_file (
input: 'PKGBUILD-libadwaita-mingw.in',
configuration: windows_msys_conf,
)
mingw_libpanel_pkgbuild = configure_file (
output: 'PKGBUILD-libpanel-mingw',
input: 'PKGBUILD-libpanel-mingw.in',
configuration: windows_msys_conf,
)
mingw_lsp_dsp_lib_pkgbuild = configure_file (
output: 'PKGBUILD-lsp-dsp-lib-mingw',
input: 'PKGBUILD-lsp-dsp-lib-mingw.in',
@ -304,6 +309,19 @@ run_target ( @@ -304,6 +309,19 @@ run_target (
command: [ 'echo', 'done' ],
depends: libadwaita_pkg)
libpanel_pkg = custom_target (
'mingw-libpanel',
output: 'libpanel.pkg.tar.zst',
input: [ make_mingw_pkg, mingw_libpanel_pkgbuild, ],
command: make_mingw_pkg_cmd,
console: true,
install: false,
)
run_target (
'run-mingw-libpanel',
command: [ 'echo', 'done' ],
depends: libpanel_pkg)
mingw_zrythm_pkg = custom_target (
'mingw-zrythm-pkg',
output: 'zrythm' + dash_trial + '.pkg.tar.zst',
@ -318,7 +336,7 @@ mingw_zrythm_pkg = custom_target ( @@ -318,7 +336,7 @@ mingw_zrythm_pkg = custom_target (
'@INPUT3@', '@PRIVATE_DIR@',
],
depends: [
lilv_pkg, lsp_dsp_lib_pkg,
lilv_pkg, lsp_dsp_lib_pkg, libpanel_pkg,
],
console: true,
install: false,
@ -339,17 +357,17 @@ windows_chroot_target = custom_target ( @@ -339,17 +357,17 @@ windows_chroot_target = custom_target (
carla_packages[1],
serd_pkg, sord_pkg,
sratom_pkg, lilv_pkg,
lsp_dsp_lib_pkg, mingw_zrythm_pkg,
lsp_dsp_lib_pkg, libpanel_pkg, mingw_zrythm_pkg,
],
command: [
bash, '-c',
'@INPUT0@ "$1" "$2" "$3" "$4" "$5" "$6" ' +
'"$7" "$8" "$9" "${10}" "${11}" "${12}" "${13}" ' +
'"${14}" "${15}"',
'"${14}" "${15}" "${16}"',
'_ignored',
'@OUTPUT@', chroot_dir, '@INPUT1@', '@INPUT2@',
'@INPUT3@', '@INPUT4@', '@INPUT5@', '@INPUT6@',
'@INPUT7@', '@INPUT8@', '@INPUT9@',
'@INPUT7@', '@INPUT8@', '@INPUT9@', '@INPUT10@',
],
console: true,
install: false,

Loading…
Cancel
Save