update srcinfo and add missing file

2 files changed, 37 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6d9c5ff9570..0854d0bb788c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,28 @@
 pkgbase = etterna-git
 	pkgdesc = Etterna: an advanced cross-platform rhythm game focused on keyboard play
-	pkgver = 0.65.1
+	pkgver = 0.70.1
 	pkgrel = 1
 	url = https://etternaonline.com
 	install = etterna-git.install
 	arch = i686
 	arch = x86_64
 	license = MIT
-	source_i686 = git+https://github.com/etternagame/etterna
-	provides_i686 = etterna
-	conflicts_i686 = etterna
-	depends_i686 = libmad
-	depends_i686 = gtk2
-	depends_i686 = glu
-	depends_i686 = glew
-	depends_i686 = curl
-	depends_i686 = libpulse
-	optdepends_i686 = jack: Audio server
-	sha512sums_i686 = SKIP
-	source_x86_64 = git+https://github.com/etternagame/etterna
-	provides_x86_64 = etterna
-	conflicts_x86_64 = etterna
-	depends_x86_64 = libmad
-	depends_x86_64 = gtk2
-	depends_x86_64 = glu
-	depends_x86_64 = glew
-	depends_x86_64 = curl
-	depends_x86_64 = libpulse
-	optdepends_x86_64 = jack: Audio server
-	sha512sums_x86_64 = SKIP
+	depends = libmad
+	depends = gtk2
+	depends = glu
+	depends = glew
+	depends = curl
+	depends = libpulse
+	depends = cmake
+	optdepends = jack: Audio server
+	provides = etterna
+	conflicts = etterna
+	source = git+https://github.com/etternagame/etterna
+	source = mufft.patch
+	source = etterna.desktop
+	sha512sums = SKIP
+	sha512sums = e42ba43a7d41c028b5620814cdfde6110835a34ccd0a6b3193f080cf9226c0012d52e4a21b8900b1be3838deb7bc58c4eb7a08d16a5fa3c0bac56fa2e1e5088b
+	sha512sums = 0a82ae9ac0c9b38db69d742981e1356b960dae3943f19ec03268e1d38d22bfc313b9f8a53f28c7449c4f42b9ec675fb9bd703efe58020748de98386a6010880a
 
 pkgname = etterna-git
 
diff --git a/mufft.patch b/mufft.patch
new file mode 100644
index 000000000000..a355ada71953
--- /dev/null
+++ b/mufft.patch
@@ -0,0 +1,20 @@
+diff --git a/src/RageUtil/Sound/RageSound.cpp b/src/RageUtil/Sound/RageSound.cpp
+index fd6b955737..7f31cd2cc6 100644
+--- a/src/RageUtil/Sound/RageSound.cpp
++++ b/src/RageUtil/Sound/RageSound.cpp
+@@ -355,11 +355,13 @@ RageSound::GetDataToPlay(float* pBuffer,
+ 			copy(pBuffer, until, back_inserter(recentPCMSamples));
+ 			if (recentPCMSamples.size() >= recentPCMSamplesBufferSize) {
+ 				auto out = static_cast<cfloat*>(fftBuffer);
+-				auto n = recentPCMSamplesBufferSize;
+ 				auto plan = mufft_create_plan_1d_r2c(recentPCMSamplesBufferSize,
+ 													 MUFFT_FLAG_CPU_ANY);
+-				mufft_execute_plan_1d(plan, out, recentPCMSamples.data());
++				auto in = static_cast<float*>(mufft_alloc(recentPCMSamplesBufferSize * sizeof(float)));
++				copy(recentPCMSamples.begin(), recentPCMSamples.begin() + recentPCMSamplesBufferSize, in);
++				mufft_execute_plan_1d(plan, out, in);
+ 				mufft_free_plan_1d(plan);
++				mufft_free(in);
+ 				copy(pBuffer, until, back_inserter(recentPCMSamples));
+ 				recentPCMSamples.clear();
+ 				pendingPlayBackCall = true;