actually use develop branch; if you want stable use the etterna AUR package

3 files changed, 7 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0854d0bb788c..6390fcaf91f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = etterna-git
 	pkgdesc = Etterna: an advanced cross-platform rhythm game focused on keyboard play
-	pkgver = 0.70.1
+	pkgver = 0.70.0.r181.g832d37aa5d
 	pkgrel = 1
 	url = https://etternaonline.com
 	install = etterna-git.install
@@ -17,11 +17,9 @@ pkgbase = etterna-git
 	optdepends = jack: Audio server
 	provides = etterna
 	conflicts = etterna
-	source = git+https://github.com/etternagame/etterna
-	source = mufft.patch
+	source = git+https://github.com/etternagame/etterna#branch=develop
 	source = etterna.desktop
 	sha512sums = SKIP
-	sha512sums = e42ba43a7d41c028b5620814cdfde6110835a34ccd0a6b3193f080cf9226c0012d52e4a21b8900b1be3838deb7bc58c4eb7a08d16a5fa3c0bac56fa2e1e5088b
 	sha512sums = 0a82ae9ac0c9b38db69d742981e1356b960dae3943f19ec03268e1d38d22bfc313b9f8a53f28c7449c4f42b9ec675fb9bd703efe58020748de98386a6010880a
 
 pkgname = etterna-git
diff --git a/PKGBUILD b/PKGBUILD
index 21782b052bf0..6e19fadcf15f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: hexptr <hexptr@protonmail.com>
 
 pkgname=etterna-git
-pkgver=0.70.1
+pkgver=0.70.0.r181.g832d37aa5d
 pkgrel=1
 pkgdesc="Etterna: an advanced cross-platform rhythm game focused on keyboard play"
 arch=('i686' 'x86_64')
@@ -12,28 +12,23 @@ provides=('etterna')
 conflicts=('etterna')
 depends=(libmad gtk2 glu glew curl libpulse cmake)
 optdepends=('jack: Audio server')
-source=('git+https://github.com/etternagame/etterna'
-        mufft.patch
+source=('git+https://github.com/etternagame/etterna#branch=develop'
         etterna.desktop)
 sha512sums=('SKIP'
-            'e42ba43a7d41c028b5620814cdfde6110835a34ccd0a6b3193f080cf9226c0012d52e4a21b8900b1be3838deb7bc58c4eb7a08d16a5fa3c0bac56fa2e1e5088b'
             '0a82ae9ac0c9b38db69d742981e1356b960dae3943f19ec03268e1d38d22bfc313b9f8a53f28c7449c4f42b9ec675fb9bd703efe58020748de98386a6010880a')
 install=etterna-git.install
 
 pkgver() {
-    curl --silent https://api.github.com/repos/etternagame/etterna/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/' | sed 's/^v\(.*\)/\1/'
+    cd "$srcdir/etterna"
+    git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
     cd "$srcdir/etterna"
 
-    git checkout v$(pkgver)
-    git submodule update --init
-
     sed -i CMakeLists.txt -e 's/\(set(OPENSSL_USE_STATIC_LIBS\) ON/\1 OFF/'
-    patch -p1 < "$srcdir/mufft.patch"
 
-    mkdir "build"
+    mkdir -p "build"
     cd "build"
     cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release ..
 
diff --git a/mufft.patch b/mufft.patch
deleted file mode 100644
index a355ada71953..000000000000
--- a/mufft.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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;