aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2018-08-10 13:34:34 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2018-08-10 13:34:34 +0200
commit15cb6fddd6d3ad976aac4e15a1939ec1416747c1 (patch)
tree48e122680a333c06f66dfd2f17cc262cf42e4a33
parent7d050262fdee7a19dc854378db732a00f9837868 (diff)
parentb7c1095c2500bb3310a100abb8d6bcbc6ccb701d (diff)
downloadcanvas_display.lv2-15cb6fddd6d3ad976aac4e15a1939ec1416747c1.tar.xz
Merge branch 'master' of /media/sdext/omk/canvas_display.lv2
-rw-r--r--.gitlab-ci.yml15
-rw-r--r--VERSION2
-rw-r--r--canvas.lv2/.gitlab-ci.yml72
-rw-r--r--meson.build16
-rw-r--r--meson/arm-linux-gnueabihf18
-rw-r--r--meson/i686-linux-gnu19
-rw-r--r--meson/i686-w64-mingw3217
-rw-r--r--meson/universal-apple-darwin19
-rw-r--r--meson/x86_64-linux-gnu16
-rw-r--r--meson/x86_64-w64-mingw3217
10 files changed, 16 insertions, 195 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a824c76..9b8467a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,12 @@
stages:
- build
+ - test
- deploy
.variables_template: &variables_definition
variables:
- BASE_NAME: "canvas.lv2"
+ BASE_NAME: "canvas_display.lv2"
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"
.common_template: &common_definition
<<: *variables_definition
@@ -19,12 +19,11 @@ stages:
.build_template: &build_definition
<<: *common_definition
script:
- - mkdir build
- - pushd build
- - cmake -DCAIRO_INCLUDE_DIRS="/opt/${CI_BUILD_NAME}/include" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR} -DPLUGIN_DEST="${BASE_NAME}-$(cat ../VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} ..
- - cmake .. # needed for darwin
- - make
- - make install
+ - meson --prefix="/opt/${CI_BUILD_NAME}" --libdir="lib" --cross-file "${CI_BUILD_NAME}" build
+ - ninja -C build
+ - ninja -C build install
+ - mkdir -p "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/${BASE_NAME}"
+ - cp -r "/opt/${CI_BUILD_NAME}/lib/lv2/${BASE_NAME}/" "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/"
.universal_linux_template: &universal_linux_definition
image: ventosus/universal-linux-gnu
diff --git a/VERSION b/VERSION
index faa7104..5d8b11a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.43
+0.3.45
diff --git a/canvas.lv2/.gitlab-ci.yml b/canvas.lv2/.gitlab-ci.yml
deleted file mode 100644
index a824c76..0000000
--- a/canvas.lv2/.gitlab-ci.yml
+++ /dev/null
@@ -1,72 +0,0 @@
-stages:
- - build
- - deploy
-
-.variables_template: &variables_definition
- variables:
- BASE_NAME: "canvas.lv2"
- 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"
-
-.common_template: &common_definition
- <<: *variables_definition
- stage: build
- artifacts:
- name: "${BASE_NAME}-$(cat VERSION)-${CI_BUILD_NAME}"
- paths:
- - "${BASE_NAME}-$(cat VERSION)/"
-
-.build_template: &build_definition
- <<: *common_definition
- script:
- - mkdir build
- - pushd build
- - cmake -DCAIRO_INCLUDE_DIRS="/opt/${CI_BUILD_NAME}/include" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR} -DPLUGIN_DEST="${BASE_NAME}-$(cat ../VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN_FILE} ..
- - cmake .. # needed for darwin
- - make
- - make install
-
-.universal_linux_template: &universal_linux_definition
- image: ventosus/universal-linux-gnu
- <<: *build_definition
-
-.arm_linux_template: &arm_linux_definition
- image: ventosus/arm-linux-gnueabihf
- <<: *build_definition
-
-.universal_w64_template: &universal_w64_definition
- image: ventosus/universal-w64-mingw32
- <<: *build_definition
-
-.universal_apple_template: &universal_apple_definition
- image: ventosus/universal-apple-darwin
- <<: *build_definition
-
-# building in docker
-x86_64-linux-gnu:
- <<: *universal_linux_definition
-
-i686-linux-gnu:
- <<: *universal_linux_definition
-
-arm-linux-gnueabihf:
- <<: *arm_linux_definition
-
-x86_64-w64-mingw32:
- <<: *universal_w64_definition
-
-i686-w64-mingw32:
- <<: *universal_w64_definition
-
-universal-apple-darwin:
- <<: *universal_apple_definition
-
-pack:
- <<: *variables_definition
- stage: deploy
- script:
- - echo 'packing up...'
- artifacts:
- name: "${BASE_NAME}-$(cat VERSION)"
- paths:
- - "${BASE_NAME}-$(cat VERSION)/"
diff --git a/meson.build b/meson.build
index 1ec946b..c12e1e8 100644
--- a/meson.build
+++ b/meson.build
@@ -10,7 +10,7 @@ cc = meson.get_compiler('c')
m_dep = cc.find_library('m')
lv2_dep = dependency('lv2', version : '>=1.14.0')
cairo_dep = dependency('cairo', version : '>=1.0.0',
- static : meson.is_cross_build())
+ static : meson.is_cross_build() and false) #FIXME
dsp_deps = [m_dep, lv2_dep, cairo_dep]
ui_deps = [m_dep, lv2_dep]
@@ -44,13 +44,7 @@ ui_srcs = ['canvas_ui.c', 'nanovg/src/nanovg.c']
c_args = ['-fvisibility=hidden',
'-ffast-math']
-if host_machine.system() == 'linux'
- conf_data.set('UI_TYPE', 'X11UI')
- ui_deps += dependency('glew')
- ui_deps += dependency('x11', version : '>=1.6.0')
- ui_deps += dependency('xext', version : '>=1.3.0')
- ui_srcs += 'pugl/pugl/pugl_x11.c'
-elif host_machine.system() == 'windows'
+if host_machine.system() == 'windows'
add_languages('cpp')
conf_data.set('UI_TYPE', 'WindowsUI')
ui_deps += cc.find_library('opengl32')
@@ -64,6 +58,12 @@ elif host_machine.system() == 'darwin'
#ui_deps += cc.find_library('gl')
#ui_deps += dependency('appleframeworks', modules : 'cocoa')
#ui_srcs += 'pugl/pugl/pugl_osx.m'
+else
+ conf_data.set('UI_TYPE', 'X11UI')
+ ui_deps += dependency('glew')
+ ui_deps += dependency('x11', version : '>=1.6.0')
+ ui_deps += dependency('xext', version : '>=1.3.0')
+ ui_srcs += 'pugl/pugl/pugl_x11.c'
endif
mod = shared_module('canvas_display', dsp_srcs,
diff --git a/meson/arm-linux-gnueabihf b/meson/arm-linux-gnueabihf
deleted file mode 100644
index 241266e..0000000
--- a/meson/arm-linux-gnueabihf
+++ /dev/null
@@ -1,18 +0,0 @@
-[host_machine]
-system = 'linux'
-cpu_family = 'arm'
-cpu = 'armv7hl'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/arm-linux-gnueabihf-gcc'
-cpp = '/usr/bin/arm-linux-gnueabihf-g++'
-ar = '/usr/bin/arm-linux-gnueabihf-ar'
-strip = '/usr/bin/arm-linux-gnueabihf-strip'
-pkgconfig = '/usr/bin/pkg-config'
-exe_wrapper = '/usr/bin/qemu-arm'
-
-[properties]
-root = '/usr/arm-linux-gnueabihf'
-c_link_args = ['-Wl,-z,defs']
-needs_exe_wrapper = true
diff --git a/meson/i686-linux-gnu b/meson/i686-linux-gnu
deleted file mode 100644
index 17d5a41..0000000
--- a/meson/i686-linux-gnu
+++ /dev/null
@@ -1,19 +0,0 @@
-[host_machine]
-system = 'linux'
-cpu_family = 'x86'
-cpu = 'i686'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/x86_64-linux-gnu-gcc'
-cpp = '/usr/bin/x86_64-linux-gnu-g++'
-ar = '/usr/bin/x86_64-linux-gnu-ar'
-strip = '/usr/bin/x86_64-linux-gnu-strip'
-pkgconfig = '/usr/bin/pkg-config'
-
-[properties]
-c_args = ['-m32']
-cpp_args = ['-m32']
-c_link_args = ['-m32', '-Wl,-z,defs']
-cpp_link_args = ['-m32', '-Wl,-z,defs']
-needs_exe_wrapper = false
diff --git a/meson/i686-w64-mingw32 b/meson/i686-w64-mingw32
deleted file mode 100644
index 4966ba7..0000000
--- a/meson/i686-w64-mingw32
+++ /dev/null
@@ -1,17 +0,0 @@
-[host_machine]
-system = 'windows'
-cpu_family = 'i686'
-cpu = 'i686'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/i686-w64-mingw32-gcc'
-cpp = '/usr/bin/i686-w64-mingw32-g++'
-ar = '/usr/bin/i686-w64-mingw32-ar'
-strip = '/usr/bin/i686-w64-mingw32-strip'
-pkgconfig = '/usr/bin/pkg-config'
-exe_wrapper = '/usr/bin/wine'
-
-[properties]
-root = '/usr/i686-w64-mingw32'
-needs_exe_wrapper = true
diff --git a/meson/universal-apple-darwin b/meson/universal-apple-darwin
deleted file mode 100644
index 0ee2e02..0000000
--- a/meson/universal-apple-darwin
+++ /dev/null
@@ -1,19 +0,0 @@
-[host_machine]
-system = 'darwin'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
-
-[binaries]
-c = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-clang'
-cpp = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-clang++'
-objc = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-clang'
-ar = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-ar'
-strip = '/usr/universal-apple-darwin/bin/x86_64-apple-darwin15-strip'
-pkgconfig = '/usr/bin/pkg-config'
-
-[properties]
-root = '/usr/universal-apple-darwin/SDK/MacOSX10.11.sdk'
-c_args = ['-arch', 'i386', '-arch', 'x86_64']
-c_link_args = ['-arch', 'i386', '-arch', 'x86_64']
-needs_exe_wrapper = true
diff --git a/meson/x86_64-linux-gnu b/meson/x86_64-linux-gnu
deleted file mode 100644
index b09321c..0000000
--- a/meson/x86_64-linux-gnu
+++ /dev/null
@@ -1,16 +0,0 @@
-[host_machine]
-system = 'linux'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/x86_64-linux-gnu-gcc'
-cpp = '/usr/bin/x86_64-linux-gnu-g++'
-ar = '/usr/bin/x86_64-linux-gnu-ar'
-strip = '/usr/bin/x86_64-linux-gnu-strip'
-pkgconfig = '/usr/bin/pkg-config'
-
-[properties]
-c_link_args = ['-Wl,-z,defs']
-needs_exe_wrapper = false
diff --git a/meson/x86_64-w64-mingw32 b/meson/x86_64-w64-mingw32
deleted file mode 100644
index 40c8a32..0000000
--- a/meson/x86_64-w64-mingw32
+++ /dev/null
@@ -1,17 +0,0 @@
-[host_machine]
-system = 'windows'
-cpu_family = 'x86_64'
-cpu = 'x86_64'
-endian = 'little'
-
-[binaries]
-c = '/usr/bin/x86_64-w64-mingw32-gcc'
-cpp = '/usr/bin/x86_64-w64-mingw32-g++'
-ar = '/usr/bin/x86_64-w64-mingw32-ar'
-strip = '/usr/bin/x86_64-w64-mingw32-strip'
-pkgconfig = '/usr/bin/pkg-config'
-exe_wrapper = '/usr/bin/wine64'
-
-[properties]
-root = '/usr/x86_64-w64-mingw32'
-needs_exe_wrapper = true