fix everything

2 files changed, 30 insertions, 37 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fe0e37fc7ee4..21782b052bf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,23 @@
 # Maintainer: Toby Jones <quoth.the.server@gmail.com>
+# Maintainer: hexptr <hexptr@protonmail.com>
 
 pkgname=etterna-git
-pkgver=0.65.1
+pkgver=0.70.1
 pkgrel=1
 pkgdesc="Etterna: an advanced cross-platform rhythm game focused on keyboard play"
 arch=('i686' 'x86_64')
 url="https://etternaonline.com"
 license=('MIT')
-provides_i686=('etterna')
-conflicts_i686=('etterna')
-provides_x86_64=('etterna')
-conflicts_x86_64=('etterna')
-depends_i686=(libmad gtk2 glu glew curl libpulse cmake)
-depends_x86_64=(libmad gtk2 glu glew curl libpulse cmake)
-optdepends_i686=('jack: Audio server')
-optdepends_x86_64=('jack: Audio server')
-source_i686=('git+https://github.com/etternagame/etterna')
-source_x86_64=('git+https://github.com/etternagame/etterna')
-sha512sums_i686=('SKIP')
-sha512sums_x86_64=('SKIP')
+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
+        etterna.desktop)
+sha512sums=('SKIP'
+            'e42ba43a7d41c028b5620814cdfde6110835a34ccd0a6b3193f080cf9226c0012d52e4a21b8900b1be3838deb7bc58c4eb7a08d16a5fa3c0bac56fa2e1e5088b'
+            '0a82ae9ac0c9b38db69d742981e1356b960dae3943f19ec03268e1d38d22bfc313b9f8a53f28c7449c4f42b9ec675fb9bd703efe58020748de98386a6010880a')
 install=etterna-git.install
 
 pkgver() {
@@ -26,39 +25,43 @@ pkgver() {
 }
 
 build() {
-    cd "etterna"
+    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"
     cd "build"
-    cmake -G 'Unix Makefiles' ..
+    cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release ..
 
     make
 }
 
 package() {
-    mkdir -p "$pkgdir/usr/share/applications"
-    mkdir -p "$pkgdir/opt/etterna-git/Cache"
-    mkdir -p "$pkgdir/usr/share/licenses/etterna-git"
+    cd "$srcdir/etterna/build"
 
-    cp "$srcdir/etterna/etterna" "$pkgdir/opt/etterna-git/"
-    cp "$srcdir/etterna/GtkModule.so" "$pkgdir/opt/etterna-git"
+    install -Dm755 "$srcdir/etterna/Etterna" "$pkgdir/opt/etterna-git/etterna"
 
-    mkdir "$pkgdir/opt/etterna-git/Songs"
-    
+    cp -R "$srcdir/etterna/Announcers/" "$pkgdir/opt/etterna-git"
     cp -R "$srcdir/etterna/Assets/" "$pkgdir/opt/etterna-git"
     cp -R "$srcdir/etterna/BackgroundEffects/" "$pkgdir/opt/etterna-git"
-    cp -R "$srcdir/etterna/Characters/" "$pkgdir/opt/etterna-git"
+    cp -R "$srcdir/etterna/BackgroundTransitions/" "$pkgdir/opt/etterna-git"
+    cp -R "$srcdir/etterna/BGAnimations/" "$pkgdir/opt/etterna-git"
     cp -R "$srcdir/etterna/Data/" "$pkgdir/opt/etterna-git"
     cp -R "$srcdir/etterna/NoteSkins/" "$pkgdir/opt/etterna-git"
     cp -R "$srcdir/etterna/Scripts/" "$pkgdir/opt/etterna-git"
     cp -R "$srcdir/etterna/Songs/" "$pkgdir/opt/etterna-git"
     cp -R "$srcdir/etterna/Themes/" "$pkgdir/opt/etterna-git"
 
-    cp "../etterna.desktop" "$pkgdir/usr/share/applications"
-    cp "../LICENSE" "$pkgdir/usr/share/licenses/etterna-git"
+    mkdir "$pkgdir/opt/etterna-git/Cache"
+
+    cp "$srcdir/etterna/src/archutils/Win32/Etterna.ico" "$pkgdir/opt/etterna-git/icon.ico"
+
+    chmod 777 -R "$pkgdir/opt/etterna-git"
+    chown -R nobody:nobody "$pkgdir/opt/etterna-git"
 
-    cp "$srcdir/etterna/Installer/Install.ico" "$pkgdir/opt/etterna-git/icon.ico"
+    install -Dm644 "$srcdir/etterna.desktop" "$pkgdir/usr/share/applications/etterna.desktop"
 }
diff --git a/etterna-git.install b/etterna-git.install
index ecf11380b2df..3075852b25c2 100644
--- a/etterna-git.install
+++ b/etterna-git.install
@@ -1,17 +1,7 @@
 function post_install {
     desktop-file-install "/usr/share/applications/etterna.desktop"
-
-    chmod 777 -R /opt/etterna-git
-    chown -R nobody:nobody /opt/etterna-git
-
-    echo "All user data is stored in your home directory."
-    echo "However, you should still keep a backup of the data in /opt/etterna if you reinstall/remove Etterna!"
 }
 
-function post_upgrade {s
+function post_upgrade {
     post_install
 }
-
-function post_remove { 
-    echo "Etterna has been uninstalled - all data in /opt/etterna is gone forever!"
-}