From 05d004dfe0c9a9d898fac8a4a0292ca2a74ca391 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Mon, 19 Dec 2022 23:07:05 +0000
Subject: Making things work

---
 skip/zynaddsubfx/cmake-build-type-none.patch | 35 ----------------------------
 skip/zynaddsubfx/zynaddsubfx.xibuild         | 24 +++++++++----------
 2 files changed, 11 insertions(+), 48 deletions(-)

(limited to 'skip/zynaddsubfx')

diff --git a/skip/zynaddsubfx/cmake-build-type-none.patch b/skip/zynaddsubfx/cmake-build-type-none.patch
index 74e64a7..b60a428 100644
--- a/skip/zynaddsubfx/cmake-build-type-none.patch
+++ b/skip/zynaddsubfx/cmake-build-type-none.patch
@@ -10,38 +10,3 @@ Index: src/CMakeLists.txt
  
  
  set (BuildOptions_x86_64AMD
-@@ -321,34 +320,6 @@ if(NOT AVOID_ASM)
-     add_definitions(-DASM_F2I_YES)
- endif()
- 
--if (BuildForDebug)
--	set (CMAKE_BUILD_TYPE "Debug")
--	set (CMAKE_CXX_FLAGS_DEBUG ${BuildOptionsDebug})
--	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_DEBUG}")
--else (BuildForDebug)
--	set (CMAKE_BUILD_TYPE "Release")
--	
--	set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsBasic})
--	
--	if (BuildForAMD_X86_64)
--		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_x86_64AMD}")
--	endif (BuildForAMD_X86_64)
--	
--	if (BuildForCore2_X86_64)
--			set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_X86_64Core2}")
--	endif (BuildForCore2_X86_64)
--				
--	if (SUPPORT_SSE)
--		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_SSE}")
--	endif (SUPPORT_SSE)
--	
--    if (SUPPORT_NEON AND NOT NoNeonPlease)
--		set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${BuildOptions_NEON}")
--	endif (SUPPORT_NEON AND NOT NoNeonPlease)
--	
--	message (STATUS "Building for ${CMAKE_BUILD_TYPE}, flags: ${CMAKE_CXX_FLAGS_RELEASE}")
--endif (BuildForDebug)
--
- if(NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Windows"))
-     add_definitions(-fPIC)
- endif()
diff --git a/skip/zynaddsubfx/zynaddsubfx.xibuild b/skip/zynaddsubfx/zynaddsubfx.xibuild
index 228806b..61b3324 100644
--- a/skip/zynaddsubfx/zynaddsubfx.xibuild
+++ b/skip/zynaddsubfx/zynaddsubfx.xibuild
@@ -1,21 +1,22 @@
 #!/bin/sh
 
 NAME="zynaddsubfx"
-DESC="Opensource software synthesizer capable of making a countless number of instruments."
+DESC="fully featured open source software synthesizer"
 
-MAKEDEPS="cmake jack fltk portaudio mxml sndio bash-completion liblo libxpm"
-DEPS="less "
+MAKEDEPS="cmake pkg-config zlib mxml ntk libx11 liblo fftw libxpm pulseaudio jack alsa-lib doxygen fltk "
 
-PKG_VER=3.0.5
-SOURCE="https://downloads.sourceforge.net/project/zynaddsubfx/zynaddsubfx/$PKG_VER/zynaddsubfx-$PKG_VER.tar.bz2"
+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 '/-DASM_F2I_YES/d' -i src/CMakeLists.txt
 
     sed -e 's/COMMAND.*lv2-ttl-generator/COMMAND lv2-ttl-generator/g' -i \
 		src/Plugin/AlienWah/CMakeLists.txt \
@@ -37,15 +38,12 @@ prepare () {
 build () {
     cmake -B build \
         -DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=/usr/lib  \
-        -DDefaultOutput=jack \
-        -DDefaultInput=jack \
-        -DGuiModule=fltk
-	cmake --build build &&
-    make -C ExternalPrograms/Spliter &&
-	make -C ExternalPrograms/Controller
+        -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+        -DGuiModule=ntk
+    cmake --build build
 }
 
+
 package () {
 	DESTDIR="$PKG_DEST" cmake --install build
 }
-- 
cgit v1.2.1