mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-01-27 23:44:04 +00:00
removed communmity/zynaddsubfx
This commit is contained in:
Kevin Mihelich
parent
81c9d7c702
commit
9f99ed420d
7 changed files with 0 additions and 386 deletions
|
|
@ -1,187 +0,0 @@
|
|||
# Maintainer: David Runge <dvzrv@archlinux.org>
|
||||
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
|
||||
# Contributor: SpepS <dreamspepser at yahoo dot it>
|
||||
# Contributor: Ionut Biru <ibiru@archlinux.org>
|
||||
# Contributor: DonVla <donvla@users.sourceforge.net>
|
||||
|
||||
# remove when bumped upstream
|
||||
|
||||
pkgname=zynaddsubfx
|
||||
pkgver=3.0.6
|
||||
pkgrel=2.1
|
||||
_mruby_zest_commit='dd3d45ba333011f2359e86f9a758d9836e53fe5f' # refs/tags/3.0.6
|
||||
pkgdesc="Opensource software synthesizer capable of making a countless number of instruments."
|
||||
arch=(x86_64)
|
||||
url="http://zynaddsubfx.sourceforge.net"
|
||||
license=(GPL2)
|
||||
groups=(lv2-plugins pro-audio vst-plugins)
|
||||
# NOTE: fftw is dlopen()'ed
|
||||
depends=(fftw gcc-libs glibc hicolor-icon-theme libglvnd libuv zlib)
|
||||
makedepends=(alsa-lib asciidoc asciidoctor cmake cxxtest doxygen git jack liblo
|
||||
libxpm mxml portaudio rtosc ruby-rake ttf-roboto)
|
||||
optdepends=(
|
||||
'lv2-host: for using the LV2 plugin'
|
||||
'vst-host: for using the VST plugin'
|
||||
)
|
||||
source=(
|
||||
"https://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
|
||||
"${pkgname}-3.0.6-system_rtosc.patch"
|
||||
"${pkgname}-3.0.6-libzest_location.patch"
|
||||
"${pkgname}-mruby-zest-build::git+https://github.com/mruby-zest/mruby-zest-build#commit=${_mruby_zest_commit}"
|
||||
"${pkgname}-mruby::git+https://github.com/mruby/mruby"
|
||||
"${pkgname}-nanovg::git+https://github.com/memononen/nanovg"
|
||||
"${pkgname}-mruby-sleep::git+https://github.com/matsumoto-r/mruby-sleep"
|
||||
"${pkgname}-mruby-dir-glob::git+https://github.com/gromnitsky/mruby-dir-glob"
|
||||
"${pkgname}-mruby-regexp-pcre::git+https://github.com/iij/mruby-regexp-pcre"
|
||||
"${pkgname}-mruby-set::git+https://github.com/yui-knk/mruby-set"
|
||||
"${pkgname}-mruby-io::git+https://github.com/iij/mruby-io"
|
||||
"${pkgname}-mruby-glew::git+https://github.com/IceDragon200/mruby-glew"
|
||||
"${pkgname}-mruby-glfw3::git+https://github.com/IceDragon200/mruby-glfw3"
|
||||
"${pkgname}-mruby-nanovg::git+https://github.com/mruby-zest/mruby-nanovg"
|
||||
"${pkgname}-mruby-qml-spawn::git+https://github.com/mruby-zest/mruby-qml-spawn"
|
||||
"${pkgname}-mruby-qml-parse::git+https://github.com/mruby-zest/mruby-qml-parse"
|
||||
"${pkgname}-mruby-complex::git+https://github.com/pbosetti/mruby-complex"
|
||||
"${pkgname}-mruby-dir::git+https://github.com/iij/mruby-dir"
|
||||
"${pkgname}-mruby-errno::git+https://github.com/iij/mruby-errno"
|
||||
"${pkgname}-mruby-file-stat::git+https://github.com/ksss/mruby-file-stat"
|
||||
"${pkgname}-mruby-process::git+https://github.com/iij/mruby-process"
|
||||
"${pkgname}-mruby-zest-build-3.0.6-devendor_rtosc.patch"
|
||||
"${pkgname}-mruby-zest-build-3.0.6-libzest_location.patch"
|
||||
"${pkgname}-mruby-zest-build-3.0.6-system_wide_location.patch"
|
||||
"${pkgname}-mruby-zest-build-3.0.6-cflags_ldflags.patch"
|
||||
)
|
||||
sha512sums=('86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea'
|
||||
'c84d185e7bcc3d7b0bd44941999b9b14638e230c5c5d86b487a39d6b793b56649b6aacde8d27b0aef567eaa3d381d3906d7bd31fd5fd74d5a662e21d188fcdc9'
|
||||
'695f5776b07e4ace611f358ea1007e0023f1ba6dcf4ebb85974b461490850c51bb85903abafc07b23236051ab161cc0e538a127a11efd0b1dfd129dc99f37d77'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'0677bf66e5996b09298a3f7e3aabf0d5d8a5bbdca6ed869038e1a35cbef94c2bafcfeb92cd163f43476aadf5c915cde92c75876c5ff3964d5b2049509075a765'
|
||||
'd7ef0b4e8068d1d09d34c913d7b70342eaaa2eb8dae619d223e3e03ac667cf76c6e5615b60efabaf7eae594e3a5d6f40bc0cf10b8e939da1aa349bc27dff4ea8'
|
||||
'2a6b57df3a9ffac669341d37739b281ce32696f82d82ee17220fdc9e426729d40f91cf50e1b58b7be1cc9bc5651d99794ae5e1bbd32f25c14aaf489989e10aab'
|
||||
'a3912a879cb78565934a5cdea97ac1623f65a02d26ded548d851cd271da62390eb3fa9f26dfff153eb2d18c5bf30ba47e19fcbf1985e4b03772d2df936998511')
|
||||
b2sums=('4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7'
|
||||
'd9586ef1dd7866963d342f9be8def639ab4428a173f8abc2e503643d87e2c9087ff8d6af538df7c8f8df8f8facd409e8665735ef905deae8dfe3a840de340ea1'
|
||||
'68a24898a4646c6d84e782c4e31a962de456fa315d5c398c16b013efa684683f80cc411bf51628bb9cff799fc77f669d56e5d44af5938e05d0ec64322ad30ec7'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'SKIP'
|
||||
'70ea96032e5f3f20f4270339f03b508c5a5e5d62859d6771adce452fbcde48f89edb4ef8908255cbf915f1088ce5d3fc5baa1b1e74794db3bc975e48c3425d14'
|
||||
'2f1782fd907fb0e284c16ee0f09e1d93d05984676707da2d9d47038880e723379535f8d3934f97753cc9a6865aed957a1c230840dda3a2cb49a26cb4ff2cd034'
|
||||
'69ccb494e863caf8e47eaa70609940d532cfae6265eeffc626f24ed6a2290511d828d63405a7560fd567b0ab01bdabedd85aa3fe28bec5a638477654f9440f40'
|
||||
'cab9048aede5bd346493ede996752b902f78de95de97310622caa0f7e473eba46159f1ee5fc925cf9ffc3cf1bd3f98c6dac521f354ac1be074346015bf9ded14')
|
||||
|
||||
prepare() {
|
||||
(
|
||||
cd "${pkgname}-${pkgver}"
|
||||
# https://github.com/zynaddsubfx/zynaddsubfx/pull/170
|
||||
# https://github.com/zynaddsubfx/zynaddsubfx/pull/171
|
||||
patch -Np1 -i ../"${pkgname}-3.0.6-system_rtosc.patch"
|
||||
# load libzest.so from custom system location in /usr/lib/zynaddsubfx/
|
||||
patch -Np1 -i ../"${pkgname}-3.0.6-libzest_location.patch"
|
||||
# disable broken PortChecker test
|
||||
sed -e '/add_test(PortChecker/d' -i src/Tests/CMakeLists.txt
|
||||
)
|
||||
|
||||
(
|
||||
cd "${pkgname}-mruby-zest-build"
|
||||
git submodule init
|
||||
git submodule deinit deps/rtosc
|
||||
git submodule deinit deps/libuv
|
||||
git config submodule.mruby.url "${srcdir}/${pkgname}-mruby"
|
||||
git config submodule.deps/nanovg.url "${srcdir}/${pkgname}-nanovg"
|
||||
git config submodule.deps/mruby-sleep.url "${srcdir}/${pkgname}-mruby-sleep"
|
||||
git config submodule.deps/mruby-dir-glob.url "${srcdir}/${pkgname}-mruby-dir-glob"
|
||||
git config submodule.deps/mruby-regexp-pcre.url "${srcdir}/${pkgname}-mruby-regexp-pcre"
|
||||
git config submodule.deps/mruby-set.url "${srcdir}/${pkgname}-mruby-set"
|
||||
git config submodule.deps/mruby-io.url "${srcdir}/${pkgname}-mruby-io"
|
||||
git config submodule.deps/mruby-glew.url "${srcdir}/${pkgname}-mruby-glew"
|
||||
git config submodule.deps/mruby-glfw3.url "${srcdir}/${pkgname}-mruby-glfw3"
|
||||
git config submodule.deps/mruby-nanovg.url "${srcdir}/${pkgname}-mruby-nanovg"
|
||||
git config submodule.deps/mruby-qml-spawn.url "${srcdir}/${pkgname}-mruby-qml-spawn"
|
||||
git config submodule.deps/mruby-qml-parse.url "${srcdir}/${pkgname}-mruby-qml-parse"
|
||||
git config submodule.deps/mruby-complex.url "${srcdir}/${pkgname}-mruby-complex"
|
||||
git config submodule.deps/mruby-dir.url "${srcdir}/${pkgname}-mruby-dir"
|
||||
git config submodule.deps/mruby-errno.url "${srcdir}/${pkgname}-mruby-errno"
|
||||
git config submodule.deps/mruby-file-stat.url "${srcdir}/${pkgname}-mruby-file-stat"
|
||||
git config submodule.deps/mruby-process.url "${srcdir}/${pkgname}-mruby-process"
|
||||
git submodule update
|
||||
# use system provided rtosc
|
||||
patch -Np1 -i ../"${pkgname}-mruby-zest-build-3.0.6-devendor_rtosc.patch"
|
||||
# load libzest.so from custom system location in /usr/lib/zynaddsubfx/
|
||||
patch -Np1 -i ../"${pkgname}-mruby-zest-build-3.0.6-libzest_location.patch"
|
||||
# load qml data from custom system location in /usr/share/zynaddsubfx/qml/
|
||||
# load JSON schema from custom system location in /usr/share/zynaddsubfx/schema/
|
||||
# load fonts from custom system location in /usr/share/fonts/TTF/
|
||||
patch -Np1 -i ../"${pkgname}-mruby-zest-build-3.0.6-system_wide_location.patch"
|
||||
# incorporate LDFLAGS to achieve full RELRO
|
||||
patch -Np1 -i ../"${pkgname}-mruby-zest-build-3.0.6-cflags_ldflags.patch"
|
||||
)
|
||||
}
|
||||
|
||||
build() {
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr \
|
||||
-DCMAKE_BUILD_TYPE=None \
|
||||
-DDefaultOutput=jack \
|
||||
-DDefaultInput=jack \
|
||||
-DGuiModule=zest \
|
||||
-DZYN_SYSTEM_RTOSC=ON \
|
||||
-W no-dev \
|
||||
-B build \
|
||||
-S "${pkgname}-${pkgver}"
|
||||
make VERBOSE=1 -C build
|
||||
make man -C "${pkgname}-${pkgver}/doc"
|
||||
|
||||
# TODO: fix full RELRO
|
||||
make -C "${pkgname}-mruby-zest-build"
|
||||
}
|
||||
|
||||
check() {
|
||||
make -k test ARGS='-VVd' -C build
|
||||
}
|
||||
|
||||
package() {
|
||||
depends+=(libasound.so libjack.so liblo.so libmxml.so libportaudio.so
|
||||
librtosc.so librtosc-cpp.so)
|
||||
|
||||
make DESTDIR="${pkgdir}/" install -C build
|
||||
install -vDm 644 "${pkgname}-${pkgver}/${pkgname}.svg" -t "${pkgdir}/usr/share/icons/hicolor/scalable/apps/"
|
||||
install -vDm 644 "${pkgname}-${pkgver}/doc/${pkgname}.1" -t "${pkgdir}/usr/share/man/man1/"
|
||||
|
||||
cd "${pkgname}-mruby-zest-build"
|
||||
install -vDm 755 zest "${pkgdir}/usr/bin/zyn-fusion"
|
||||
install -vDm 755 libzest.so -t "${pkgdir}/usr/lib/$pkgname/"
|
||||
install -vDm 644 src/mruby-zest/{example,qml}/*.qml -t "${pkgdir}/usr/share/${pkgname}/qml/"
|
||||
install -vDm 644 src/osc-bridge/schema/test.json -t "${pkgdir}/usr/share/${pkgname}/schema/"
|
||||
install -vDm 644 completions/zyn-fusion -t "${pkgdir}/usr/share/bash-completion/completions/"
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
|
||||
index 0829e889..010e1fac 100644
|
||||
--- i/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
|
||||
+++ w/src/Plugin/ZynAddSubFX/ZynAddSubFX-UI-Zest.cpp
|
||||
@@ -68,7 +68,7 @@ public:
|
||||
#else
|
||||
handle = dlopen("./libzest.so", RTLD_LAZY);
|
||||
if(!handle)
|
||||
- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY);
|
||||
+ handle = dlopen("/usr/lib/zynaddsubfx/libzest.so", RTLD_LAZY);
|
||||
if(!handle)
|
||||
handle = dlopen("libzest.so", RTLD_LAZY);
|
||||
#endif
|
||||
|
|
@ -1,92 +0,0 @@
|
|||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 5c708574..ef17dbd3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -10,24 +10,34 @@ if(DEFINED ZYN_DATADIR)
|
||||
add_definitions(-DZYN_DATADIR="${ZYN_DATADIR}")
|
||||
endif()
|
||||
|
||||
+option(ZYN_SYSTEM_RTOSC "Use system provided librtosc and librtosc-cpp" OFF)
|
||||
+
|
||||
#Include RTOSC
|
||||
-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
|
||||
- message(STATUS "RTOSC NOT FOUND")
|
||||
- message(STATUS "Attempting to checkout submodule")
|
||||
- find_package(Git REQUIRED)
|
||||
- execute_process(COMMAND git submodule update --init --recursive)
|
||||
+if(ZYN_SYSTEM_RTOSC)
|
||||
+ include(FindPkgConfig)
|
||||
+ pkg_check_modules(RTOSC REQUIRED librtosc)
|
||||
+ pkg_check_modules(RTOSC_CPP REQUIRED librtosc-cpp)
|
||||
+ include_directories(${RTOSC_INCLUDE_DIR})
|
||||
+ message(STATUS "Found system provided librtosc and librtosc-cpp...")
|
||||
+else()
|
||||
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
|
||||
- message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
|
||||
- "please check file permissions and your network")
|
||||
+ message(STATUS "RTOSC NOT FOUND")
|
||||
+ message(STATUS "Attempting to checkout submodule")
|
||||
+ find_package(Git REQUIRED)
|
||||
+ execute_process(COMMAND git submodule update --init --recursive)
|
||||
+ if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/rtosc/CMakeLists.txt")
|
||||
+ message(FATAL_ERROR "FAILED TO CHECKOUT RTOSC\n"
|
||||
+ "please check file permissions and your network")
|
||||
+ endif()
|
||||
+ else()
|
||||
+ message(STATUS "Found Rtosc Submodule...")
|
||||
endif()
|
||||
-else()
|
||||
- message(STATUS "Found Rtosc Submodule...")
|
||||
-endif()
|
||||
|
||||
-set(RTOSC_NO_INSTALL TRUE)
|
||||
-include("rtosc/cmake/ColorMessage.cmake")
|
||||
-add_subdirectory(rtosc)
|
||||
-include_directories(rtosc/include)
|
||||
+ set(RTOSC_NO_INSTALL TRUE)
|
||||
+ include("rtosc/cmake/ColorMessage.cmake")
|
||||
+ add_subdirectory(rtosc)
|
||||
+ include_directories(rtosc/include)
|
||||
+endif()
|
||||
|
||||
enable_testing()
|
||||
include(CTestConfig.cmake)
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 2900f4b7..8348df70 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -575,13 +575,27 @@ else()
|
||||
set(PTHREAD_LIBRARY pthread)
|
||||
endif()
|
||||
|
||||
-target_link_libraries(zynaddsubfx_core
|
||||
- ${ZLIB_LIBRARIES}
|
||||
- ${FFTW3F_LIBRARIES}
|
||||
- ${MXML_LIBRARIES}
|
||||
- ${OS_LIBRARIES}
|
||||
- ${PTHREAD_LIBRARY}
|
||||
- rtosc rtosc-cpp)
|
||||
+if(ZYN_SYSTEM_RTOSC)
|
||||
+ target_link_libraries(zynaddsubfx_core
|
||||
+ ${ZLIB_LIBRARIES}
|
||||
+ ${FFTW3F_LIBRARIES}
|
||||
+ ${MXML_LIBRARIES}
|
||||
+ ${OS_LIBRARIES}
|
||||
+ ${PTHREAD_LIBRARY}
|
||||
+ ${RTOSC_LIBRARIES}
|
||||
+ ${RTOSC_CPP_LIBRARIES}
|
||||
+ )
|
||||
+else()
|
||||
+ target_link_libraries(zynaddsubfx_core
|
||||
+ ${ZLIB_LIBRARIES}
|
||||
+ ${FFTW3F_LIBRARIES}
|
||||
+ ${MXML_LIBRARIES}
|
||||
+ ${OS_LIBRARIES}
|
||||
+ ${PTHREAD_LIBRARY}
|
||||
+ rtosc
|
||||
+ rtosc-cpp
|
||||
+ )
|
||||
+endif()
|
||||
|
||||
if(IwyuErr)
|
||||
message (STATUS "Include what you use: ${IwyuErr}")
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
diff --git i/Makefile w/Makefile
|
||||
index 7bc3788..3af1cce 100644
|
||||
--- i/Makefile
|
||||
+++ w/Makefile
|
||||
@@ -16,10 +16,14 @@ linux:
|
||||
$(CC) -shared -o libzest.so `find mruby/build/host -type f | grep -v mrbc | grep -e "\.o$$" | grep -v bin` ./deps/libnanovg.a \
|
||||
./deps/libnanovg.a \
|
||||
src/osc-bridge/libosc-bridge.a \
|
||||
- `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread
|
||||
+ $(CFLAGS) \
|
||||
+ `pkg-config --libs libuv` -lm -lX11 -lGL -lpthread \
|
||||
+ $(LDFLAGS)
|
||||
$(CC) test-libversion.c deps/pugl/pugl/pugl_x11.c \
|
||||
+ $(CFLAGS) \
|
||||
-DPUGL_HAVE_GL \
|
||||
- -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs
|
||||
+ -ldl -o zest -lX11 -lGL -lpthread -I deps/pugl -std=gnu99 -Wno-trigraphs \
|
||||
+ $(LDFLAGS)
|
||||
|
||||
osx: deps/libuv.a
|
||||
ruby ./rebuild-fcache.rb
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git i/src/mruby-widget-lib/src/gem.c w/src/mruby-widget-lib/src/gem.c
|
||||
index 8e3d721..7f200e3 100644
|
||||
--- i/src/mruby-widget-lib/src/gem.c
|
||||
+++ w/src/mruby-widget-lib/src/gem.c
|
||||
@@ -11,8 +11,8 @@
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#endif
|
||||
+#include <rtosc/rtosc.h>
|
||||
#include "../../../deps/pugl/pugl/pugl.h"
|
||||
-#include "../../../deps/rtosc/include/rtosc/rtosc.h"
|
||||
#include "../../../src/osc-bridge/src/bridge.h"
|
||||
#include "../../../deps/mruby-nanovg/src/gl_core.3.2.h"
|
||||
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git i/test-libversion.c w/test-libversion.c
|
||||
index 808c01f..a122585 100644
|
||||
--- i/test-libversion.c
|
||||
+++ w/test-libversion.c
|
||||
@@ -660,7 +660,7 @@ int main(int argc, char **argv)
|
||||
if(!handle)
|
||||
handle = dlopen("libzest.so", RTLD_LAZY);
|
||||
if(!handle)
|
||||
- handle = dlopen("/opt/zyn-fusion/libzest.so", RTLD_LAZY);
|
||||
+ handle = dlopen("/usr/lib/zynaddsubfx/libzest.so", RTLD_LAZY);
|
||||
#endif
|
||||
if(!handle) {
|
||||
printf("[ERROR] Cannot Open libzest.so\n");
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
diff --git i/src/mruby-widget-lib/mrblib/script.rb w/src/mruby-widget-lib/mrblib/script.rb
|
||||
index 2d3e7fc..4dbd3c7 100644
|
||||
--- i/src/mruby-widget-lib/mrblib/script.rb
|
||||
+++ w/src/mruby-widget-lib/mrblib/script.rb
|
||||
@@ -160,13 +160,13 @@ class ZRunner
|
||||
search = @search_path
|
||||
search ||= ""
|
||||
font_error = false
|
||||
- sans = [search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"]
|
||||
+ sans = ["/usr/share/fonts/TTF/Roboto-Regular.ttf", search + "font/Roboto-Regular.ttf", "deps/nanovg/example/Roboto-Regular.ttf"]
|
||||
if(@vg.create_font('sans', sans[0]) == -1 && @vg.create_font('sans', sans[1]) == -1)
|
||||
GL::debug "[ERROR] could not find sans font"
|
||||
font_error = true
|
||||
end
|
||||
|
||||
- bold = [search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"]
|
||||
+ bold = ["/usr/share/fonts/TTF/Roboto-Bold.ttf", search + "font/Roboto-Bold.ttf", "deps/nanovg/example/Roboto-Bold.ttf"]
|
||||
if(@vg.create_font('bold', bold[0]) == -1 && @vg.create_font('bold', bold[1]) == -1)
|
||||
GL::debug "[ERROR] could not find bold font"
|
||||
font_error = true
|
||||
diff --git i/src/mruby-widget-lib/src/api.c w/src/mruby-widget-lib/src/api.c
|
||||
index 6949413..1118717 100644
|
||||
--- i/src/mruby-widget-lib/src/api.c
|
||||
+++ w/src/mruby-widget-lib/src/api.c
|
||||
@@ -110,7 +110,7 @@ zest_open(char *address)
|
||||
if(strstr(path, "libzest"))
|
||||
strstr(path, "libzest")[0] = 0;
|
||||
char path2[256];
|
||||
- snprintf(path2, sizeof(path2), "%s%s", path, "./qml/MainWindow.qml");
|
||||
+ snprintf(path2, sizeof(path2), "%s%s", path, "../../share/zynaddsubfx/qml/MainWindow.qml");
|
||||
FILE *f = fopen(path2, "r");
|
||||
if(f) {
|
||||
printf("[INFO:Zyn] Found Assets at %s\n", path);
|
||||
diff --git i/src/osc-bridge/src/bridge.c w/src/osc-bridge/src/bridge.c
|
||||
index f87c849..6405bbb 100644
|
||||
--- i/src/osc-bridge/src/bridge.c
|
||||
+++ w/src/osc-bridge/src/bridge.c
|
||||
@@ -431,7 +431,7 @@ schema_t br_get_schema(bridge_t *br, uri_t uri)
|
||||
schema_t sch;
|
||||
|
||||
//printf("[debug] loading json file\n");
|
||||
- FILE *f = fopen("schema/test.json", "r");
|
||||
+ FILE *f = fopen("/usr/share/zynaddsubfx/schema/test.json", "r");
|
||||
if(!f && br->search_path) {
|
||||
char tmp[256];
|
||||
snprintf(tmp, sizeof(tmp), "%s%s", br->search_path, "schema/test.json");
|
||||
Loading…
Reference in a new issue