v2, but doesn’t work yet …

3 files changed, 75 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f85f923c807..1585a2182150 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,38 +1,35 @@
 pkgbase = vcvrack
-	pkgdesc = Open-source virtual modular synthesizer
-	pkgver = 1.1.6
-	pkgrel = 3
+	pkgdesc = Open-source Eurorack modular synthesizer simulator
+	pkgver = 2.0.6
+	pkgrel = 1
 	url = https://vcvrack.com/
 	arch = x86_64
 	license = custom
 	license = CCPL
 	license = GPL3
-	makedepends = cmake
-	makedepends = gendesk
 	makedepends = git
-	makedepends = unzip
 	makedepends = wget
-	depends = curl
+	makedepends = cmake
+	makedepends = unzip
+	makedepends = gendesk
 	depends = glew
 	depends = glfw
-	depends = gtk3
 	depends = jack
-	depends = jansson
 	depends = libpulse
 	depends = libx11
-	depends = libzip
-	depends = openssl
-	depends = rtaudio
-	depends = rtmidi
-	depends = speexdsp
-	source = vcvrack-1.1.6::git+https://github.com/vcvrack/Rack.git#tag=v1.1.6
-	source = git+https://github.com/glfw/glfw.git#commit=0fb001c
-	source = git+https://github.com/memononen/nanosvg.git#commit=25241c5
-	source = git+https://github.com/memononen/nanovg.git#commit=1f9c886
-	source = git+https://github.com/AndrewBelt/osdialog.git#commit=e5db5de
-	source = git+https://github.com/AndrewBelt/oui-blendish.git#commit=79ec59e
-	source = git+https://github.com/thestk/rtaudio.git#commit=d27f257
-	source = vcvrack-use_system_libs.patch::https://github.com/flying-sheep/Rack/commit/c74ada5fa42de4947eb0d65886f21528b8e65be7.patch
+	depends = libxcursor
+	depends = libxinerama
+	depends = libxrandr
+	source = vcvrack-2.0.6::git+https://github.com/vcvrack/Rack.git#tag=v2.0.6
+	source = git+https://github.com/VCVRack/nanovg.git#commit=0bebdb314aff9cfa28fde4744bcb037a2b3fd756
+	source = git+https://github.com/memononen/nanosvg.git#commit=25241c5a8f8451d41ab1b02ab2d865b01600d949
+	source = git+https://github.com/AndrewBelt/osdialog.git#commit=21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9
+	source = git+https://github.com/VCVRack/oui-blendish.git#commit=2fc6405883f8451944ed080547d073c8f9f31898
+	source = git+https://github.com/VCVRack/rtaudio.git#commit=8128053f4bd83463c7c901d9f5d40b272c2f4e4e
+	source = git+https://github.com/VCVRack/glfw.git#commit=0e18076016f4ba57c314eeebd85654c70644abe3
+	source = git+https://bitbucket.org/j_norberg/fuzzysearchdatabase.git#commit=fe62479811e503ef3c091f5a859d27bfcf0a44da
+	source = git+https://github.com/gulrak/filesystem.git#commit=7e37433f318488ae4bc80f80e12df12a01579874
+	source = git+https://bitbucket.org/jpommier/pffft.git#commit=74d7261be17cf659d5930d4830609406bd7553e3
 	source = vcvrack.sh
 	sha512sums = SKIP
 	sha512sums = SKIP
@@ -41,8 +38,9 @@ pkgbase = vcvrack
 	sha512sums = SKIP
 	sha512sums = SKIP
 	sha512sums = SKIP
-	sha512sums = b31b3a3fa2b568dc875312144191dae07ef5df99e4e2a3e1faea9e2ad2f3c898c11e25c922cb99a80971cec4f8129a69928148e4fdf09351bdf0411e20e9e1a1
+	sha512sums = SKIP
+	sha512sums = SKIP
+	sha512sums = SKIP
 	sha512sums = 8ca3fbc790fa5d311ce41b5b9e84a79fe51db73cbf0f56f04d0429b28f0c4c0646e2d0c081b584161356ec24b06cc0181b115b865d564ff1452c64a57135acf6
 
 pkgname = vcvrack
-
diff --git a/.gitignore b/.gitignore
index 4433cb81a9e2..a1f97ab1a580 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,5 @@
-/src/
-/pkg/
-
-/vcvrack-*/
-/glfw/
-/nanosvg/
-/nanovg/
-/osdialog/
-/oui-blendish/
-/rtaudio/
-
-/*.pkg.tar.xz
-/*.patch
+*
+!/.gitignore
+!/PKGBUILD
+!/SRCINFO
+!/vcvrack.sh
diff --git a/PKGBUILD b/PKGBUILD
index 8382bb88a882..43e7555c2302 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +1,68 @@
-# Maintainer: David Runge <dave@sleepmap.de>
+# Maintainer: Phil A. <flying-sheep@web.de>
+# Contributor: David Runge <dave@sleepmap.de>
 # Contributor: Adrain Sinclair <adrian at adrusi dot com>
 # Contributor: Miroslav Koškár <http://mkoskar.com/>
 
 _name=Rack
 pkgname=vcvrack
-pkgver=1.1.6
-pkgrel=3
-pkgdesc='Open-source virtual modular synthesizer'
-url="https://vcvrack.com/"
-license=('custom' 'CCPL' 'GPL3')
-arch=('x86_64')
-# TODO: devendor fonts
-depends=('curl' 'glew' 'glfw' 'gtk3' 'jack' 'jansson' 'libpulse' 'libx11'
-'libzip' 'openssl' 'rtaudio' 'rtmidi' 'speexdsp')
-makedepends=('cmake' 'gendesk' 'git' 'unzip' 'wget')
+pkgver=2.0.6
+pkgrel=1
+pkgdesc='Open-source Eurorack modular synthesizer simulator'
+url='https://vcvrack.com/'
+license=(custom CCPL GPL3)
+arch=(x86_64)
+# TODO: devendor fonts and commented out libs
+depends=(
+	#curl
+	glew
+	glfw
+	#gtk3
+	jack
+	#jansson
+	libpulse
+	libx11
+	libxcursor
+	libxinerama
+	libxrandr
+	#libzip
+	#openssl
+	#rtaudio
+	#rtmidi
+	#speexdsp
+)
+makedepends=(git wget cmake unzip gendesk)
 source=(
 	"$pkgname-$pkgver::git+https://github.com/$pkgname/$_name.git#tag=v$pkgver"
-	'git+https://github.com/glfw/glfw.git#commit=0fb001c'
-	'git+https://github.com/memononen/nanosvg.git#commit=25241c5'
-	'git+https://github.com/memononen/nanovg.git#commit=1f9c886'
-	'git+https://github.com/AndrewBelt/osdialog.git#commit=e5db5de'
-	'git+https://github.com/AndrewBelt/oui-blendish.git#commit=79ec59e'
-	'git+https://github.com/thestk/rtaudio.git#commit=d27f257'
-	"$pkgname-use_system_libs.patch::https://github.com/flying-sheep/Rack/commit/c74ada5fa42de4947eb0d65886f21528b8e65be7.patch"
+	'git+https://github.com/VCVRack/nanovg.git#commit=0bebdb314aff9cfa28fde4744bcb037a2b3fd756'
+	'git+https://github.com/memononen/nanosvg.git#commit=25241c5a8f8451d41ab1b02ab2d865b01600d949'
+	'git+https://github.com/AndrewBelt/osdialog.git#commit=21b9dcc2a1bbdacb9b46da477ffd82a4ce9204b9'
+	'git+https://github.com/VCVRack/oui-blendish.git#commit=2fc6405883f8451944ed080547d073c8f9f31898'
+	'git+https://github.com/VCVRack/rtaudio.git#commit=8128053f4bd83463c7c901d9f5d40b272c2f4e4e'
+	'git+https://github.com/VCVRack/glfw.git#commit=0e18076016f4ba57c314eeebd85654c70644abe3'
+	'git+https://bitbucket.org/j_norberg/fuzzysearchdatabase.git#commit=fe62479811e503ef3c091f5a859d27bfcf0a44da'
+	'git+https://github.com/gulrak/filesystem.git#commit=7e37433f318488ae4bc80f80e12df12a01579874'
+	'git+https://bitbucket.org/jpommier/pffft.git#commit=74d7261be17cf659d5930d4830609406bd7553e3'
 	"$pkgname.sh"
 )
 sha512sums=(
-	'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP'
-	'b31b3a3fa2b568dc875312144191dae07ef5df99e4e2a3e1faea9e2ad2f3c898c11e25c922cb99a80971cec4f8129a69928148e4fdf09351bdf0411e20e9e1a1'
+	SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP SKIP
 	'8ca3fbc790fa5d311ce41b5b9e84a79fe51db73cbf0f56f04d0429b28f0c4c0646e2d0c081b584161356ec24b06cc0181b115b865d564ff1452c64a57135acf6'
 )
 
 prepare() {
 	cd "$pkgname-$pkgver"
 	git submodule init
-	git config submodule.dep/glfw.url "$srcdir/glfw"
-	git config submodule.dep/nanosvg.url "$srcdir/nanosvg"
 	git config submodule.dep/nanovg.url "$srcdir/nanovg"
+	git config submodule.dep/nanosvg.url "$srcdir/nanosvg"
 	git config submodule.dep/osdialog.url "$srcdir/osdialog"
 	git config submodule.dep/oui-blendish.url "$srcdir/oui-blendish"
 	git config submodule.dep/rtaudio.url "$srcdir/rtaudio"
+	git config submodule.dep/glfw.url "$srcdir/glfw"
+	git config submodule.dep/fuzzysearchdatabase.url "$srcdir/fuzzysearchdatabase"
+	git config submodule.dep/filesystem.url "$srcdir/filesystem"
+	git config submodule.dep/pffft.url "$srcdir/pffft"
 	git submodule update
 
-	# devendor everything that can be devendored
-	patch -Np1 -i "../$pkgname-use_system_libs.patch"
-
-	# GTK 3
-	sed -e 's/osdialog_gtk2/osdialog_gtk3/' \
-		-e 's/gtk+-2\.0/gtk+-3.0/' \
-		-i Makefile
-
 	# fix plugin.mk’s use of jq, if SLUG/VERSION are unset
 	sed -e 's/SLUG :=/SLUG ?=/' \
 		-e 's/VERSION :=/VERSION ?=/' \
@@ -66,13 +79,14 @@ prepare() {
 
 build() {
 	cd "$pkgname-$pkgver"
-	USE_SYSTEM_LIBS=true VERSION=$pkgver make dep
-	USE_SYSTEM_LIBS=true VERSION=$pkgver make
+	VERSION=$pkgver make dep
+	ERSION=$pkgver make
 }
 
 package() {
 	cd "$pkgname-$pkgver"
 	install -vDm 755 "$_name" -t "$pkgdir/opt/$pkgname"
+	install -vDm 755 "lib$_name.so" -t "$pkgdir/opt/$pkgname"
 	install -vDm 755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$_name"
 	install -vDm 644 -t "$pkgdir/opt/$pkgname" template.vcv
 	install -vDm 644 -t "$pkgdir/opt/$pkgname" Core.json
@@ -82,7 +96,7 @@ package() {
 	cp -dr --preserve=mode res -t "$pkgdir/opt/$pkgname"
 
 	# headers (required for plugins)
-	for _path in {app,dsp,engine,plugin,simd,ui,widget}; do
+	for _path in {app,dsp,engine,plugin,simd,ui,widget,window}; do
 		install -vDm 644 "include/$_path/"* \
 			-t "$pkgdir/usr/include/$pkgname/$_path/"
 	done
@@ -92,8 +106,7 @@ package() {
 	install -vDm 644 {arch,compile,dep,plugin}.mk -t "$pkgdir/usr/share/$pkgname"
 
 	# xdg desktop integration
-	install -vDm 644 "$pkgname.desktop" \
-		-t "$pkgdir/usr/share/applications/"
+	install -vDm 644 "$pkgname.desktop" -t "$pkgdir/usr/share/applications/"
 	install -vDm 644 'res/icon.png' "$pkgdir/usr/share/pixmaps/$pkgname.png"
 	# licenses
 	install -vDm 644 LICENSE.md -t "$pkgdir/usr/share/licenses/$pkgname"