From 006d6df39d97c75af8eb9d9b6b0a062b7e81cdaa Mon Sep 17 00:00:00 2001 From: Datanoise Date: Tue, 24 Aug 2021 14:33:42 +0200 Subject: [PATCH 1/8] Update .gitmodule paths to use https instead of ssh. --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index d084bd233..4147f0482 100644 --- a/.gitmodules +++ b/.gitmodules @@ -12,7 +12,7 @@ url = https://github.com/monocasual/rtaudio.git [submodule "src/deps/geompp"] path = src/deps/geompp - url = git@github.com:monocasual/geompp.git + url = https://github.com/monocasual/geompp.git [submodule "src/deps/mcl-audio-buffer"] path = src/deps/mcl-audio-buffer - url = git@github.com:monocasual/mcl-audio-buffer.git + url = https://github.com/monocasual/mcl-audio-buffer.git From 61c8a491a1772866555811624c048566eccd2665 Mon Sep 17 00:00:00 2001 From: Datanoise Date: Tue, 24 Aug 2021 18:51:42 +0200 Subject: [PATCH 2/8] Add -latomic flag for -DRASPBERRYPI --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 84555d021..e94455acd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -506,6 +506,10 @@ if(WITH_VST2 OR WITH_VST3) list(APPEND LIBRARIES ${FREETYPE_LIBRARIES}) list(APPEND INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) endif() + + if(DEFINED RASPBERRYPI) + set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -latomic") + ) list(APPEND PREPROCESSOR_DEFS WITH_VST @@ -575,4 +579,4 @@ elseif(DEFINED OS_MACOS) set_target_properties(giada PROPERTIES XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES) -endif() \ No newline at end of file +endif() From b2726cbc8ce10d5c9b05359857acf37c0484d4a4 Mon Sep 17 00:00:00 2001 From: Datanoise Date: Tue, 24 Aug 2021 19:10:04 +0200 Subject: [PATCH 3/8] Fix ifdef. --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index e94455acd..834744e48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -510,6 +510,7 @@ if(WITH_VST2 OR WITH_VST3) if(DEFINED RASPBERRYPI) set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -latomic") ) + endif() list(APPEND PREPROCESSOR_DEFS WITH_VST From 57a63bbe41f4498462c77aafad2897207759e52e Mon Sep 17 00:00:00 2001 From: Datanoise Date: Tue, 24 Aug 2021 19:45:20 +0200 Subject: [PATCH 4/8] Fix typo again. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 834744e48..69d3576c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -509,7 +509,6 @@ if(WITH_VST2 OR WITH_VST3) if(DEFINED RASPBERRYPI) set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -latomic") - ) endif() list(APPEND PREPROCESSOR_DEFS From d6c00b5269b48514869a1bb05f0a52ce48a72126 Mon Sep 17 00:00:00 2001 From: Datanoise Date: Tue, 24 Aug 2021 19:47:59 +0200 Subject: [PATCH 5/8] Create .gitlab-ci.yml --- .gitlab-ci.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..928e15397 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,23 @@ +image: syso/giada-builder:latest + +stages: + - build + +build-job: + stage: build + variables: + GIT_SUBMODULE_STRATEGY: recursive + script: + - wget https://archive.org/download/VST2SDK/vst_sdk2_4_rev2.zip + - unzip vst_sdk2_4_rev2.zip + - mkdir src/deps/vst3sdk/plugininterfaces || exit 0 + - cp -r vstsdk2.4/pluginterfaces/vst2.x/ src/deps/vst3sdk/pluginterfaces/ + - cp -r vstsdk2.4/pluginterfaces/vst2.x src/deps/vst3sdk/pluginterfaces/ + - cmake -B build/ -S . -DWITH_VST3=ON -DWITH_VST2=ON -DCMAKE_BUILD_TYPE=Release -DRASPBERRYPI=ON + - cd build && make -j6 + cache: + paths: + - build + artifacts: + paths: + - build From d5ee5584238f3fad17473c25ed94127b2f7b7d37 Mon Sep 17 00:00:00 2001 From: Datanoise Date: Tue, 24 Aug 2021 20:06:12 +0200 Subject: [PATCH 6/8] Only include giada binary in build artifacts. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 928e15397..2c4c06fc9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,4 +20,4 @@ build-job: - build artifacts: paths: - - build + - build/giada From d175c8b5d0d5769a60524c8da78eaa84cd8e4c3b Mon Sep 17 00:00:00 2001 From: Datanoise Date: Tue, 24 Aug 2021 22:46:08 +0200 Subject: [PATCH 7/8] Update .gitlab-ci.yml Disable PulseAudio and Alsa by default. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c4c06fc9..618aa7818 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build-job: - mkdir src/deps/vst3sdk/plugininterfaces || exit 0 - cp -r vstsdk2.4/pluginterfaces/vst2.x/ src/deps/vst3sdk/pluginterfaces/ - cp -r vstsdk2.4/pluginterfaces/vst2.x src/deps/vst3sdk/pluginterfaces/ - - cmake -B build/ -S . -DWITH_VST3=ON -DWITH_VST2=ON -DCMAKE_BUILD_TYPE=Release -DRASPBERRYPI=ON + - cmake -B build/ -S . -DWITH_VST3=ON -DWITH_VST2=ON -DCMAKE_BUILD_TYPE=Release -DRASPBERRYPI=ON -DWITH_PULSE=OFF -DWITH_ALSA=OFF - cd build && make -j6 cache: paths: From 923980d952d5bc5d4469d954cd3abce202ecc52d Mon Sep 17 00:00:00 2001 From: Datanoise Date: Thu, 26 Aug 2021 10:01:44 +0200 Subject: [PATCH 8/8] Change option -DRASPBERRYPI to -DARM. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69d3576c0..fe9c42b3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -507,7 +507,7 @@ if(WITH_VST2 OR WITH_VST3) list(APPEND INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS}) endif() - if(DEFINED RASPBERRYPI) + if(DEFINED ARM) set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -latomic") endif()