aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-04-11 19:23:35 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-04-11 19:23:35 +0200
commitb576f2ce43d7b18644077ac08606fbc37a1d06fa (patch)
treebbc2291a8b3b056af9df03f671d93d41006150ce
parent6b777c7417e8d859c5a8bd434d5c465185dca358 (diff)
downloadsynthpod-b576f2ce43d7b18644077ac08606fbc37a1d06fa.zip
synthpod-b576f2ce43d7b18644077ac08606fbc37a1d06fa.tar.gz
synthpod-b576f2ce43d7b18644077ac08606fbc37a1d06fa.tar.bz2
synthpod-b576f2ce43d7b18644077ac08606fbc37a1d06fa.tar.xz
meson: various fixes.
-rw-r--r--.gitlab-ci.yml31
-rw-r--r--README.md4
-rw-r--r--VERSION2
-rw-r--r--bin/meson.build19
-rw-r--r--bin/nsmc.c6
-rw-r--r--bin/synthpod_alsa.desktop.in8
-rw-r--r--bin/synthpod_dummy.desktop.in8
-rw-r--r--bin/synthpod_jack.desktop.in8
-rw-r--r--meson.build64
-rw-r--r--meson_options.txt1
-rw-r--r--plugins/manifest.ttl.in6
-rw-r--r--plugins/meson.build2
-rw-r--r--plugins/synthpod_common_nk.c2
13 files changed, 67 insertions, 94 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa08e5c..6834b82 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,8 @@ stages:
.variables_template: &variables_definition
variables:
BASE_NAME: "synthpod"
- PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
- TOOLCHAIN_FILE: "${CI_PROJECT_DIR}/cmake/${CI_BUILD_NAME}.cmake"
+ PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig"
+ TOOLCHAIN_FILE: "${CI_PROJECT_DIR}/meson/${CI_BUILD_NAME}"
.common_template: &common_definition
<<: *variables_definition
@@ -19,15 +19,9 @@ stages:
.build_template: &build_definition
<<: *common_definition
script:
- - mkdir build
- - pushd build
- - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_ALSA=1 -DBUILD_DUMMY=1 -DBUILD_JACK=1 -DBUILD_UI=1 -DUSE_DYNAMIC_PARALLELIZER=1 -DBUILD_SANDBOX_X11=1 -DBUILD_SANDBOX_SHOW=1 -DBUILD_SANDBOX_KX=1 -DBUILD_SANDBOX_GTK2=0 -DBUILD_SANDBOX_GTK3=0 -DBUILD_SANDBOX_QT4=0 -DBUILD_SANDBOX_QT5=0 -DCMAKE_INSTALL_PREFIX="/opt/${BASE_NAME}" -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} ..
- - cmake .. # needed for darwin
- - make
- - make install
- - popd
- - mkdir -p "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/opt"
- - cp -r "/opt/${BASE_NAME}" "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/opt/${BASE_NAME}"
+ - meson --prefix=/ --cross-file "${TOOLCHAIN_FILE}" build
+ - ninja -C build
+ - DESTDIR="${CI_PROJECT_DIR}/${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" ninja -C build install
.universal_linux_template: &universal_linux_definition
image: ventosus/universal-linux-gnu
@@ -47,23 +41,14 @@ stages:
# building in docker
x86_64-linux-gnu:
- before_script:
- - apt-get update
- - apt-get install -y -q libjack-dev libasound2-dev libzita-alsa-pcmi-dev libxcb-icccm4-dev
<<: *universal_linux_definition
i686-linux-gnu:
- before_script:
- - apt-get update
- - apt-get install -y -q libjack-dev:i386 libasound2-dev:i386 libzita-alsa-pcmi-dev:i386 libxcb-icccm4-dev:i386
<<: *universal_linux_definition
-#arm-linux-gnueabihf:
-# before_script:
-# - apt-get update
-# - apt-get install -y -q libjack-dev:armhf libasound2-dev:armhf libzita-alsa-pcmi-dev:armhf libxcb-icccm4-dev:armhf
-# <<: *arm_linux_definition
-#
+arm-linux-gnueabihf:
+ <<: *arm_linux_definition
+
#x86_64-w64-mingw32:
# <<: *universal_w64_definition
#
diff --git a/README.md b/README.md
index e48cd1b..7f1db35 100644
--- a/README.md
+++ b/README.md
@@ -39,13 +39,13 @@ Get more detailed information at [http://open-music-kontrollers.ch/lv2/synthpod/
cd synthpod
meson build
cd build
- ninja -j8
+ ninja -j4
sudo ninja install
#### ArchLinux
# mandatory build dependencies
- sudo pacman -S meson ninja lv2 lilv libuv
+ sudo pacman -S meson ninja lv2 lilv
# optional build dependencies
sudo pacman -S jack alsa zita-alsa-pcmi libxcb gtk2 gtk3 qt4 qt
diff --git a/VERSION b/VERSION
index cb01d9d..7af7327 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.5611
+0.1.5621
diff --git a/bin/meson.build b/bin/meson.build
index 44d5264..802627f 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -16,11 +16,6 @@ if true
link_with : [bin, app, sbox_master],
install : true)
- configure_file(input : 'synthpod_dummy.desktop.in', output : 'synthpod_dummy.desktop',
- configuration : conf_data,
- install : true,
- install_dir : desk_dir)
-
install_man('synthpod_dummy.1')
endif
@@ -34,11 +29,6 @@ if alsa_dep.found() and zita_dep.found()
link_with : [bin, app, sbox_master],
install : true)
- configure_file(input : 'synthpod_alsa.desktop.in', output : 'synthpod_alsa.desktop',
- configuration : conf_data,
- install : true,
- install_dir : desk_dir)
-
install_man('synthpod_alsa.1')
endif
@@ -52,11 +42,6 @@ if jack_dep.found()
link_with : [bin, app, sbox_master],
install : true)
- configure_file(input : 'synthpod_jack.desktop.in', output : 'synthpod_jack.desktop',
- configuration : conf_data,
- install : true,
- install_dir : desk_dir)
-
install_man('synthpod_jack.1')
endif
@@ -121,7 +106,7 @@ if qt5_dep.found()
install : true)
endif
-if true #FIXME only build with enabled UI
+if true
show_srcs = ['synthpod_sandbox_show.c']
show = executable('synthpod_sandbox_show', show_srcs,
@@ -132,7 +117,7 @@ if true #FIXME only build with enabled UI
install : true)
endif
-if true #FIXME only build with enabled UI
+if true
kx_srcs = ['synthpod_sandbox_kx.c']
kx = executable('synthpod_sandbox_kx', kx_srcs,
diff --git a/bin/nsmc.c b/bin/nsmc.c
index d0ea47f..5560986 100644
--- a/bin/nsmc.c
+++ b/bin/nsmc.c
@@ -370,12 +370,6 @@ nsmc_new(const char *exe, const char *path,
}
return nsm;
-
-fail:
- if(nsm->url)
- free(nsm->url);
-
- return NULL;
}
void
diff --git a/bin/synthpod_alsa.desktop.in b/bin/synthpod_alsa.desktop.in
deleted file mode 100644
index 5a5899f..0000000
--- a/bin/synthpod_alsa.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Synthpod (ALSA)
-Comment=Lightweight, nonlinear LV2 plugin host
-Exec=@CMAKE_INSTALL_PREFIX@/@SYNTHPOD_BIN_DIR@/synthpod_alsa
-Terminal=false
-Icon=@CMAKE_INSTALL_PREFIX@/@SYNTHPOD_ICON_DIR@/synthpod.png
-Type=Application
-Categories=AudioVideo;Audio;
diff --git a/bin/synthpod_dummy.desktop.in b/bin/synthpod_dummy.desktop.in
deleted file mode 100644
index 8467c07..0000000
--- a/bin/synthpod_dummy.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Synthpod (Dummy)
-Comment=Lightweight, nonlinear LV2 plugin host
-Exec=@CMAKE_INSTALL_PREFIX@/@SYNTHPOD_BIN_DIR@/synthpod_dummy
-Terminal=false
-Icon=@CMAKE_INSTALL_PREFIX@/@SYNTHPOD_ICON_DIR@/synthpod.png
-Type=Application
-Categories=AudioVideo;Audio;
diff --git a/bin/synthpod_jack.desktop.in b/bin/synthpod_jack.desktop.in
deleted file mode 100644
index d3fafaf..0000000
--- a/bin/synthpod_jack.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Synthpod (Jack)
-Comment=Lightweight, nonlinear LV2 plugin host
-Exec=@CMAKE_INSTALL_PREFIX@/@SYNTHPOD_BIN_DIR@/synthpod_jack
-Terminal=false
-Icon=@CMAKE_INSTALL_PREFIX@/@SYNTHPOD_ICON_DIR@/synthpod.png
-Type=Application
-Categories=AudioVideo;Audio;
diff --git a/meson.build b/meson.build
index 6151432..7c9377d 100644
--- a/meson.build
+++ b/meson.build
@@ -57,24 +57,55 @@ conf_data.set('MICRO_VERSION', version[2])
prefix = get_option('prefix')
bndl_dir = join_paths(get_option('libdir'), meson.project_name(), 'lv2')
plug_dir = join_paths(get_option('libdir'), 'lv2', meson.project_name()+'.lv2')
-desk_dir = join_paths(get_option('datadir'), 'applications')
-message(prefix)
-message(bndl_dir)
-message(plug_dir)
+if get_option('dynamic-parallelizer')
+ message('using dynamic parallelizer')
+ add_project_arguments('-DUSE_DYNAMIC_PARALLELIZER', language : 'c')
+endif
+
+if gl_dep.found()
+ add_project_arguments('-DPUGL_HAVE_GL', language : 'c')
+endif
+
+if xcb_dep.found() and xcbicccm_dep.found()
+ message('building X11 sandbox')
+ add_project_arguments('-DSANDBOX_X11', language : 'c')
+endif
+
+if gtk2_dep.found()
+ message('building GTK2 sandbox')
+ add_project_arguments('-DSANDBOX_GTK2', language : 'c')
+endif
+
+if gtk3_dep.found()
+ message('building GTK3 sandbox')
+ add_project_arguments('-DSANDBOX_GTK3', language : 'c')
+endif
+
+if qt4_dep.found()
+ message('building QT4 sandbox')
+ add_project_arguments('-DSANDBOX_QT4', language : 'c')
+endif
+
+if qt5_dep.found()
+ message('building QT5 sandbox')
+ add_project_arguments('-DSANDBOX_QT5', language : 'c')
+endif
+
+add_project_arguments('-DSANDBOX_SHOW', language : 'c')
+
+add_project_arguments('-DSANDBOX_KX', language : 'c')
+
+if lilv_dep.version() >= '0.22.0'
+ message('building against recent lilv')
+ add_project_arguments('-DLILV_0_22', language : 'c')
+endif
add_project_arguments('-D_GNU_SOURCE', language : 'c')
-add_project_arguments('-DPUGL_HAVE_GL', language : 'c')
-add_project_arguments('-DSANDBOX_X11', language : 'c') #FIXME
-add_project_arguments('-DSANDBOX_SHOW', language : 'c') #FIXME
-add_project_arguments('-DSANDBOX_KX', language : 'c') #FIXME
-add_project_arguments('-DSANDBOX_GTK2', language : 'c') #FIXME
-add_project_arguments('-DSANDBOX_GTK3', language : 'c') #FIXME
-add_project_arguments('-DSANDBOX_QT4', language : 'c') #FIXME
-add_project_arguments('-DSANDBOX_QT5', language : 'c') #FIXME
+add_project_arguments('-DHAS_BUILTIN_ASSUME_ALIGNED', language : 'c')
add_project_arguments('-DSYNTHPOD_VERSION="'+rawvers+'"', language : 'c')
-add_project_arguments('-DSYNTHPOD_MINOR_VERSION="'+version[1]+'"', language : 'c')
-add_project_arguments('-DSYNTHPOD_MICRO_VERSION="'+version[2]+'"', language : 'c')
+add_project_arguments('-DSYNTHPOD_MINOR_VERSION='+version[1]+'', language : 'c')
+add_project_arguments('-DSYNTHPOD_MICRO_VERSION='+version[2]+'', language : 'c')
add_project_arguments('-DSYNTHPOD_BUNDLE_DIR="'+join_paths(prefix, bndl_dir, '')+'"', language : 'c')
add_project_arguments('-DSYNTHPOD_BIN_DIR="'+join_paths(prefix, get_option('bindir'), '')+'"', language : 'c')
add_project_arguments('-DSYNTHPOD_PLUGIN_DIR="'+join_paths(prefix, plug_dir, '')+'"', language : 'c')
@@ -83,7 +114,10 @@ cp = find_program('cp')
clone = [cp, '@INPUT@', '@OUTPUT@']
c_args = ['-fvisibility=hidden',
- '-ffast-math']
+ '-ffast-math',
+ '-Wno-attributes',
+ '-Wno-unused-function',
+ '-Wno-unused-variable']
subdir('sandbox_ui.lv2')
subdir('app')
diff --git a/meson_options.txt b/meson_options.txt
new file mode 100644
index 0000000..eb2b370
--- /dev/null
+++ b/meson_options.txt
@@ -0,0 +1 @@
+option('dynamic-parallelizer', type : 'boolean', value : true)
diff --git a/plugins/manifest.ttl.in b/plugins/manifest.ttl.in
index e34653e..c6e2484 100644
--- a/plugins/manifest.ttl.in
+++ b/plugins/manifest.ttl.in
@@ -34,8 +34,8 @@ synthpod:stereo
lv2:minorVersion @MINOR_VERSION@ ;
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <synthpod@MODULE_SUFFIX@> ;
- @UI_WRAP@ui:ui synthpod:common_4_nk ;
- @UI_WRAP@ui:ui synthpod:root_4_nk ; #FIXME
+ ui:ui synthpod:common_4_nk ;
+ ui:ui synthpod:root_4_nk ;
rdfs:seeAlso <synthpod.ttl> .
synthpod:common_4_nk
@@ -54,7 +54,7 @@ synthpod:keyboard
lv2:minorVersion @MINOR_VERSION@ ;
lv2:microVersion @MICRO_VERSION@ ;
lv2:binary <synthpod@MODULE_SUFFIX@> ;
- @UI_WRAP@ui:ui synthpod:keyboard_4_nk ;
+ ui:ui synthpod:keyboard_4_nk ;
rdfs:seeAlso <synthpod.ttl> .
synthpod:keyboard_4_nk
diff --git a/plugins/meson.build b/plugins/meson.build
index e2da1ef..7211a7a 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -25,8 +25,6 @@ dsp = shared_module('synthpod', dsp_srcs,
suffix = dsp.full_path().strip().split('.')[-1]
conf_data.set('MODULE_SUFFIX', '.' + suffix)
-conf_data.set('UI_WRAP', '') #FIXME only build with enbaled UI
-
if host_machine.system() == 'linux'
conf_data.set('UI_TYPE', 'X11UI')
ui_deps += gl_dep
diff --git a/plugins/synthpod_common_nk.c b/plugins/synthpod_common_nk.c
index a559ba2..3410ee2 100644
--- a/plugins/synthpod_common_nk.c
+++ b/plugins/synthpod_common_nk.c
@@ -6638,7 +6638,7 @@ _mod_randomize(plughandle_t *handle, mod_t *mod)
{
port_t *port = *port_itr;
- if(port->type == PORT_TYPE_CONTROL)
+ if(port->type == PROPERTY_TYPE_CONTROL)
{
_control_randomize(handle, mod, &port->control);