Browse Source

add lv2_core_path option, fix passing wrong lv2 core path in tests

master
Alexandros Theodotou 2 years ago
parent
commit
d9c05bcde8
Signed by: alex
GPG Key ID: 022EAE42313D70F3
  1. 5
      .builds/archlinux.yml
  2. 5
      .builds/debian.yml
  3. 5
      .builds/freebsd.yml
  4. 6
      README.md
  5. 1
      meson.build
  6. 4
      meson_options.txt
  7. 16
      plugins/meson.build

5
.builds/archlinux.yml

@ -15,10 +15,13 @@ sources: @@ -15,10 +15,13 @@ sources:
tasks:
- setup: |
cd zplugins
meson build -Dlv2dir=/usr/lib/lv2
meson build -Dlv2_core_path=/usr/lib/lv2
- build: |
cd zplugins
ninja -C build
- test: |
cd zplugins
ninja -C build test
- install: |
cd zplugins
DESTDIR=/tmp/zplugins ninja -C build install

5
.builds/debian.yml

@ -15,10 +15,13 @@ sources: @@ -15,10 +15,13 @@ sources:
tasks:
- setup: |
cd zplugins
../meson/meson.py build -Dlv2dir=/usr/lib/lv2
../meson/meson.py build -Dlv2_core_path=/usr/lib/lv2
- build: |
cd zplugins
ninja -C build
- test: |
cd zplugins
ninja -C build test
- install: |
cd zplugins
DESTDIR=/tmp/zplugins ninja -C build install

5
.builds/freebsd.yml

@ -17,10 +17,13 @@ sources: @@ -17,10 +17,13 @@ sources:
tasks:
- setup: |
cd zplugins
meson build -Dlv2dir=/usr/local/lib/lv2 -Dmake=gmake
meson build -Dlv2_core_path=/usr/local/lib/lv2 -Dmake=gmake
- build: |
cd zplugins
ninja -C build
- test: |
cd zplugins
ninja -C build test
- install: |
cd zplugins
DESTDIR=/tmp/zplugins ninja -C build install

6
README.md

@ -5,8 +5,8 @@ ZPlugins @@ -5,8 +5,8 @@ ZPlugins
[![travis build status](https://img.shields.io/travis/zrythm/ZPlugins?label=travis%20build)](https://travis-ci.org/zrythm/ZPlugins)
[![code coverage](https://img.shields.io/coveralls/github/zrythm/ZPlugins)](https://coveralls.io/github/zrythm/ZPlugins)
Collection of audio DSP plugins to be bundled with the
Zrythm DAW.
Collection of audio DSP plugins inteded to be bundled
with the Zrythm DAW.
Plugins
-------
@ -30,7 +30,7 @@ Building @@ -30,7 +30,7 @@ Building
Build and install all plugins
meson build
ninja -C build
ninja -C build -Dlv2dir=lib/lv2
ninja -C build install
To build specific plugins only, pass their names as below

1
meson.build

@ -73,6 +73,7 @@ endif @@ -73,6 +73,7 @@ endif
prefix = get_option('prefix')
lv2dir = prefix / get_option('lv2dir')
lv2_core_path = get_option('lv2_core_path')
# cflags
common_cflags = cc.get_supported_arguments([

4
meson_options.txt

@ -19,6 +19,10 @@ option ( @@ -19,6 +19,10 @@ option (
'strict_flags', type: 'boolean', value: false,
description: 'Enable strict compilation flags')
option (
'lv2_core_path', type: 'string', value: '/usr/lib/lv2',
description: 'Path to LV2 core spec')
option (
'lv2dir', type: 'string', value: 'lib/lv2',
description: 'LV2 installation dir under the prefix')

16
plugins/meson.build

@ -68,7 +68,7 @@ if get_option ('plugins').contains (pl[0]) @@ -68,7 +68,7 @@ if get_option ('plugins').contains (pl[0])
pl_minor_version = pl_version.split('.')[1]
pl_micro_version = pl_version.split('.')[1]
pl_dir = join_paths(lv2dir, pl_str + '.lv2')
pl_install_dir = lv2dir / pl_str + '.lv2'
project_uri = 'https://www.zrythm.org/plugins'
pl_uri = project_uri + '/' + pl_str
pl_ui_uri = pl_uri + '#UI'
@ -117,7 +117,7 @@ if get_option ('plugins').contains (pl[0]) @@ -117,7 +117,7 @@ if get_option ('plugins').contains (pl[0])
config_h_data.set_quoted (
'PLUGIN_TTL_H', join_paths (pl_lowercase, 'ttl.h'))
config_h_data.set_quoted (
'INSTALL_PATH', pl_dir)
'INSTALL_PATH', pl_install_dir)
if get_option('buildtype') == 'release'
config_h_data.set ('RELEASE', 1)
endif
@ -165,7 +165,7 @@ if get_option ('plugins').contains (pl[0]) @@ -165,7 +165,7 @@ if get_option ('plugins').contains (pl[0])
include_directories: pl_inc_dirs,
link_with: soundpipe_lib,
install: true,
install_dir: pl_dir,
install_dir: pl_install_dir,
c_args: [
common_cflags,
'-DPLUGIN_CONFIG="../' + pl_lowercase + '_config.h"',
@ -191,7 +191,7 @@ if get_option ('plugins').contains (pl[0]) @@ -191,7 +191,7 @@ if get_option ('plugins').contains (pl[0])
],
include_directories: ui_inc_dirs,
install: true,
install_dir: pl_dir,
install_dir: pl_install_dir,
c_args: [
common_cflags,
'-DPLUGIN_CONFIG="../' + pl_lowercase + '_config.h"',
@ -203,7 +203,7 @@ if get_option ('plugins').contains (pl[0]) @@ -203,7 +203,7 @@ if get_option ('plugins').contains (pl[0])
if resources_exist
install_subdir (
join_paths (pl_lowercase, 'resources'),
install_dir: pl_dir)
install_dir: pl_install_dir)
endif
presets_file = 'none'
@ -224,7 +224,7 @@ if get_option ('plugins').contains (pl[0]) @@ -224,7 +224,7 @@ if get_option ('plugins').contains (pl[0])
)
install_data (
manifest_ttl,
install_dir: pl_dir,
install_dir: pl_install_dir,
rename: 'manifest.ttl',
)
@ -250,7 +250,7 @@ if get_option ('plugins').contains (pl[0]) @@ -250,7 +250,7 @@ if get_option ('plugins').contains (pl[0])
command: [
lv2_ttl_gen, '@OUTPUT@' ],
install: true,
install_dir: pl_dir,
install_dir: pl_install_dir,
)
# test
@ -260,7 +260,7 @@ if get_option ('plugins').contains (pl[0]) @@ -260,7 +260,7 @@ if get_option ('plugins').contains (pl[0])
'PL_NAME': pl_str,
'PL_URI': pl_uri,
'LIBEXT': libext,
'LV2_DIR': lv2dir,
'LV2_DIR': lv2_core_path,
})
if lv2lint.found() and (os_linux or os_freebsd)
test (

Loading…
Cancel
Save