diff --git a/meson_options.txt b/meson_options.txt index 5a9834a..ae2ecfc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -52,7 +52,7 @@ option ( option ( 'lsp-dsp-lib-ver', type: 'string', - value: '0.5.12', + value: '0.5.14', description: 'LSP DSP lib version') option ( diff --git a/windows-msys/PKGBUILD-lsp-dsp-lib-mingw b/windows-msys/PKGBUILD-lsp-dsp-lib-mingw.in similarity index 90% rename from windows-msys/PKGBUILD-lsp-dsp-lib-mingw rename to windows-msys/PKGBUILD-lsp-dsp-lib-mingw.in index fa05f85..22c7c5c 100644 --- a/windows-msys/PKGBUILD-lsp-dsp-lib-mingw +++ b/windows-msys/PKGBUILD-lsp-dsp-lib-mingw.in @@ -19,7 +19,7 @@ _realname=lsp-dsp-lib pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=0.5.6 +pkgver="@LSP_DSP_LIB_VER@" pkgrel=1 arch=('any') pkgdesc='lsp dsp lib' @@ -27,8 +27,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('strip' 'staticlibs') license=("LGPL3") -url="https://github.com/sadko4u/lsp-dsp-lib" -source=("https://github.com/sadko4u/$_realname/archive/lsp-dsp-lib-$pkgver.zip") +url="https://github.com/lsp-plugins/lsp-dsp-lib" +source=("https://github.com/lsp-plugins/$_realname/archive/lsp-dsp-lib-$pkgver.zip") sha256sums=('SKIP') prepare() { diff --git a/windows-msys/meson.build b/windows-msys/meson.build index d5842ad..a3ef7fe 100644 --- a/windows-msys/meson.build +++ b/windows-msys/meson.build @@ -46,6 +46,8 @@ windows_msys_conf.set ( 'MINGW_ARCH', mingw_arch) windows_msys_conf.set ( 'MESON_SOURCE_ROOT', meson_src_root) +windows_msys_conf.set ( + 'LSP_DSP_LIB_VER', lsp_dsp_lib_ver) windows_msys_conf.set ('IS_TAG', is_tag ? 'true' : 'false') mingw_zrythm_pkgbuild = configure_file ( @@ -63,6 +65,11 @@ mingw_cairo_pkgbuild = configure_file ( input: 'PKGBUILD-cairo-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', + configuration: windows_msys_conf, + ) # configure scripts make_windows_chroot = configure_file ( @@ -201,7 +208,7 @@ run_target ( depends: carla_pkg_target) endforeach independent_dep_names = [ - 'jack2-bin', 'lsp-dsp-lib' + 'jack2-bin', ] independent_deps = [] foreach dep_name : independent_dep_names @@ -258,16 +265,13 @@ lilv_pkg = custom_target ( depends: sratom_pkg, install: false, ) -# for reference: this is how to apply patches -#cairo_pkg_with_patch = custom_target ( - #'mingw-cairo-with-patch', - #output: 'cairo.pkg.tar.zst', - #input: [ - #make_mingw_pkg, 'PKGBUILD-cairo-mingw', - #'patches/add_assert_to_cairo_surface.patch', ], - #command: make_mingw_pkg_cmd_full, - #install: false, - #) +lsp_dsp_lib_pkg = custom_target ( + 'mingw-lsp-dsp-lib', + output: 'lsp-dsp-lib.pkg.tar.zst', + input: [ make_mingw_pkg, mingw_lsp_dsp_lib_pkgbuild, ], + command: make_mingw_pkg_cmd, + install: false, + ) cairo_pkg = custom_target ( 'mingw-cairo', output: 'cairo.pkg.tar.zst', @@ -294,7 +298,8 @@ mingw_zrythm_pkg = custom_target ( '@INPUT3@', '@PRIVATE_DIR@', ], depends: [ - lilv_pkg, cairo_pkg, independent_deps, + lilv_pkg, cairo_pkg, lsp_dsp_lib_pkg, + independent_deps, ], console: true, install: false, @@ -312,12 +317,11 @@ windows_chroot_target = custom_target ( input: [ make_windows_chroot, zrythm_src_tarball, independent_deps[0], - independent_deps[1], carla_packages[0], carla_packages[1], lv2_pkg, serd_pkg, sord_pkg, sratom_pkg, lilv_pkg, cairo_pkg, - mingw_zrythm_pkg, + lsp_dsp_lib_pkg, mingw_zrythm_pkg, ], command: [ bash, '-c',