7 files changed, 116 insertions, 11 deletions
diff --git a/repo/snes9x/snes9x.xibuild b/repo/snes9x/snes9x.xibuild
index 59487b3..d82f9ec 100644
--- a/repo/snes9x/snes9x.xibuild
+++ b/repo/snes9x/snes9x.xibuild
@@ -3,21 +3,32 @@
 NAME="snes9x"
 DESC="Super NES Emulator"
 
-MAKEDEPS="meson glib sdl2 gtk3 libxrandr libepoxy wayland libxv portaudio alsa-lib libpng minizip zlib"
+MAKEDEPS=" alsa-lib glib gtk+3.0 gtkmm3 libepoxy libpng libxrandr libxv meson minizip portaudio sdl2 wayland zlib"
+
+glslang=bcf6a2430e99e8fc24f9f266e99316905e6d5134
+spirv=1458bae62ec67ea7d12c5a13b740e23ed4bb226c
 
 PKG_VER=1.61
 SOURCE="https://github.com/snes9xgit/snes9x/archive/$PKG_VER.tar.gz"
 
-prepare () {
+ADDITIONAL="https://github.com/KhronosGroup/glslang/archive/$glslang.tar.gz
+            https://github.com/KhronosGroup/SPIRV-Cross/archive/$spirv.tar.gz"
+
+prepare() {
+
+    tar xf $glslang.tar.gz
+    tar xf $spirv.tar.gz
     cd gtk
+
+    rm -r ../shaders/glslang ../shaders/SPIRV-Cross
+	ln -s ../glslang-$glslang ../shaders/glslang
+	ln -s ../SPIRV-Cross-$spirv ../shaders/SPIRV-Cross
 }
 
 build() {
 	meson --prefix=/usr \
-		-Dopengl=true \
-		-Dgtk3=true \
 		-Dpulseaudio=false \
-	. output
+		. output
 	meson compile ${JOBS:+-j ${JOBS}} -C output
 }
 
diff --git a/repo/torsocks/torsocks.xibuild b/repo/torsocks/torsocks.xibuild
new file mode 100644
index 0000000..0a215e1
--- /dev/null
+++ b/repo/torsocks/torsocks.xibuild
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+NAME="torsocks"
+DESC="Wrapper to safely torify applications"
+
+MAKEDEPS=" autoconf automake libtool"
+
+PKG_VER=2.4.0
+SOURCE="https://gitlab.torproject.org/tpo/core/torsocks/-/archive/v$PKG_VER/torsocks-v$PKG_VER.tar.gz"
+
+build() {
+	./autogen.sh
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+check() {
+	make check
+}
+
+package() {
+	make DESTDIR="$PKG_DEST" install
+}
+
diff --git a/repo/zynaddsubfx/.zynaddsubfx.xibuild.swp b/repo/zynaddsubfx/.zynaddsubfx.xibuild.swp
deleted file mode 100644
index bd4f3dd..0000000
--- a/repo/zynaddsubfx/.zynaddsubfx.xibuild.swp
+++ /dev/null
diff --git a/repo/zynaddsubfx/cmake-build-type-none.patch b/repo/zynaddsubfx/cmake-build-type-none.patch
new file mode 100644
index 0000000..b60a428
--- /dev/null
+++ b/repo/zynaddsubfx/cmake-build-type-none.patch
@@ -0,0 +1,12 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -185,7 +185,6 @@ option (BuildForDebug "Include gdb debug
+ option (IncludeWhatYouUse "Check for useless includes" OFF)
+ mark_as_advanced(IncludeWhatYouUse)
+ 
+-set(CMAKE_BUILD_TYPE "Release")
+ 
+ 
+ set (BuildOptions_x86_64AMD
diff --git a/repo/zynaddsubfx/fix-bogus-strstr.patch b/repo/zynaddsubfx/fix-bogus-strstr.patch
new file mode 100644
index 0000000..8588045
--- /dev/null
+++ b/repo/zynaddsubfx/fix-bogus-strstr.patch
@@ -0,0 +1,16 @@
+Source: @pullmoll
+Upstream: no
+Reason: This piece of code is ill-conceived and cannot work. Remove it.
+
+--- a/rtosc/src/dispatch.c	2019-03-10 17:16:45.000000000 +0100
++++ b/rtosc/src/dispatch.c	2020-03-29 09:02:42.916119722 +0200
+@@ -289,8 +289,7 @@
+             return false;
+     } else if(type == 4) {
+         //extract substring
+-        const char *sub=NULL;
+-        return strstr(a,sub);
++        return false;
+     } else if(type == RTOSC_MATCH_OPTIONS || type == 6) {
+         return false;
+     } else if(type == RTOSC_MATCH_ENUMERATED) {
diff --git a/repo/zynaddsubfx/fix-memset.patch b/repo/zynaddsubfx/fix-memset.patch
new file mode 100644
index 0000000..1439804
--- /dev/null
+++ b/repo/zynaddsubfx/fix-memset.patch
@@ -0,0 +1,11 @@
+--- a/src/globals.h	2015-06-28 00:25:59.000000000 +0200
++++ b/src/globals.h	2015-10-03 15:34:18.914712672 +0200
+@@ -25,6 +25,8 @@
+ #ifndef GLOBALS_H
+ #define GLOBALS_H
+ 
++#include <string.h>	/* memset(3) */
++
+ #if defined(__clang__)
+ #define REALTIME __attribute__((annotate("realtime")))
+ #define NONREALTIME __attribute__((annotate("nonrealtime")))
diff --git a/repo/zynaddsubfx/zynaddsubfx.xibuild b/repo/zynaddsubfx/zynaddsubfx.xibuild
index c730c5c..dea9ca1 100644
--- a/repo/zynaddsubfx/zynaddsubfx.xibuild
+++ b/repo/zynaddsubfx/zynaddsubfx.xibuild
@@ -6,18 +6,45 @@ DESC="fully featured open source software synthesizer"
 MAKEDEPS="cmake "
 DEPS="pkg-config zlib mxml ntk libx11 liblo fftw libxpm pulseaudio jack alsa-lib doxygen fltk "
 
-PKG_VER=3.0.5
-SOURCE="http://sourceforge.net/projects/zynaddsubfx/files/zynaddsubfx/$PKG_VER/zynaddsubfx-$PKG_VER.tar.bz2/download"
+PKG_VER=3.0.6
+SOURCE="git://git.code.sf.net/p/zynaddsubfx/code/"
+ADDITIONAL="
+cmake-build-type-none.patch
+fix-bogus-strstr.patch
+fix-memset.patch
+"
+
+prepare () {
+    git submodule init
+    git submodule update
+    apply_patches
+
+    sed -e 's/COMMAND.*lv2-ttl-generator/COMMAND lv2-ttl-generator/g' -i \
+		src/Plugin/AlienWah/CMakeLists.txt \
+		src/Plugin/Chorus/CMakeLists.txt \
+		src/Plugin/Distortion/CMakeLists.txt \
+		src/Plugin/DynamicFilter/CMakeLists.txt \
+		src/Plugin/Echo/CMakeLists.txt \
+		src/Plugin/Phaser/CMakeLists.txt \
+		src/Plugin/Reverb/CMakeLists.txt \
+		src/Plugin/ZynAddSubFX/CMakeLists.txt
+
+    sed -i -e 's;gcc ;${CC} ;' \
+		-e 's;.fltk-config --cflags.;& ${CFLAGS};' \
+		-e 's;.fltk-config --ldflags.;& ${LDFLAGS};' \
+		ExternalPrograms/Spliter/Makefile \
+		ExternalPrograms/Controller/Makefile
+}
 
 build () {
     cmake -B build \
         -DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
-		-DBUILD_SHARED_LIBS=True \
-        -DBUILD_STATIC_LIBS=OFF
-	cmake --build build
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DGuiModule=ntk
+    cmake --build build
 }
 
+
 package () {
 	DESTDIR="$PKG_DEST" cmake --install build
 }