aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-19 20:05:25 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-19 20:05:25 +0200
commit1dc53df2233b23d125d62a822cc7030652894775 (patch)
tree9ca9d88b078733c61f45e93075c98ddcce935a48
parent31cfd2219dbc7627b241abbbbd4c6ff33c0473f4 (diff)
parentbcd609fe1577b9ca92b074f21699be2262af1b0c (diff)
downloadchim.lv2-1dc53df2233b23d125d62a822cc7030652894775.zip
chim.lv2-1dc53df2233b23d125d62a822cc7030652894775.tar.gz
chim.lv2-1dc53df2233b23d125d62a822cc7030652894775.tar.bz2
chim.lv2-1dc53df2233b23d125d62a822cc7030652894775.tar.xz
Merge commit 'bcd609fe1577b9ca92b074f21699be2262af1b0c'
-rw-r--r--props.lv2/.gitlab-ci.yml3
-rw-r--r--props.lv2/VERSION2
-rw-r--r--props.lv2/meson/arm-linux-gnueabihf18
-rw-r--r--props.lv2/meson/i686-linux-gnu17
-rw-r--r--props.lv2/meson/i686-w64-mingw3217
-rw-r--r--props.lv2/meson/universal-apple-darwin19
-rw-r--r--props.lv2/meson/x86_64-linux-gnu16
-rw-r--r--props.lv2/meson/x86_64-w64-mingw3217
8 files changed, 2 insertions, 107 deletions
diff --git a/props.lv2/.gitlab-ci.yml b/props.lv2/.gitlab-ci.yml
index b11a1bb..c027e92 100644
--- a/props.lv2/.gitlab-ci.yml
+++ b/props.lv2/.gitlab-ci.yml
@@ -7,7 +7,6 @@ stages:
variables:
BASE_NAME: "props.lv2"
PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig"
- TOOLCHAIN_FILE: "${CI_PROJECT_DIR}/cmake/${CI_BUILD_NAME}.cmake"
.common_template: &common_definition
<<: *variables_definition
@@ -22,7 +21,7 @@ stages:
script:
- mkdir build
- pushd build
- - cmake -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 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR} -DPLUGIN_DEST="${BASE_NAME}-$(cat ../VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" -DCMAKE_CI_BUILD_NAME=${CI_BUILD_NAME} ..
- cmake .. # needed for darwin
- make
- make install
diff --git a/props.lv2/VERSION b/props.lv2/VERSION
index 17e51c3..496a825 100644
--- a/props.lv2/VERSION
+++ b/props.lv2/VERSION
@@ -1 +1 @@
-0.1.1
+0.1.91
diff --git a/props.lv2/meson/arm-linux-gnueabihf b/props.lv2/meson/arm-linux-gnueabihf
deleted file mode 100644
index 241266e..0000000
--- a/props.lv2/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/props.lv2/meson/i686-linux-gnu b/props.lv2/meson/i686-linux-gnu
deleted file mode 100644
index ff653c6..0000000
--- a/props.lv2/meson/i686-linux-gnu
+++ /dev/null
@@ -1,17 +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']
-c_link_args = ['-m32', '-Wl,-z,defs']
-needs_exe_wrapper = false
diff --git a/props.lv2/meson/i686-w64-mingw32 b/props.lv2/meson/i686-w64-mingw32
deleted file mode 100644
index 4966ba7..0000000
--- a/props.lv2/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/props.lv2/meson/universal-apple-darwin b/props.lv2/meson/universal-apple-darwin
deleted file mode 100644
index 0ee2e02..0000000
--- a/props.lv2/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/props.lv2/meson/x86_64-linux-gnu b/props.lv2/meson/x86_64-linux-gnu
deleted file mode 100644
index b09321c..0000000
--- a/props.lv2/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/props.lv2/meson/x86_64-w64-mingw32 b/props.lv2/meson/x86_64-w64-mingw32
deleted file mode 100644
index 40c8a32..0000000
--- a/props.lv2/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