Updated build

2 files changed, 20 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 147a66d77430..11d2acecf4cf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Dec 15 11:04:42 UTC 2020
 pkgbase = hyperrogue
-	pkgdesc = You are a lone outsider in a strange, non-Euclidean hyperbolic world. Optional music.
-	pkgver = 11.3o
+	pkgdesc = You are a lone outsider in a strange, non-Euclidean hyperbolic world
+	pkgver = 12.1q
 	pkgrel = 1
 	url = http://www.roguetemple.com/z/hyper.php
 	arch = i686
@@ -14,8 +12,7 @@ pkgbase = hyperrogue
 	depends = sdl_mixer
 	depends = mesa
 	depends = ttf-dejavu
-	source = hyperrogue-11.3o.tgz::https://github.com/zenorogue/hyperrogue/archive/v11.3o.tar.gz
-	md5sums = 6bf9dc99e905da19ba8a36192545252d
+	source = hyperrogue-12.1q.tgz::https://github.com/zenorogue/hyperrogue/archive/v12.1q.tar.gz
+	sha256sums = 65689881423762cadf6d6b2e22a1ade62a3f6911fdf6d268d84111e1e0f3b6f0
 
 pkgname = hyperrogue
-
diff --git a/PKGBUILD b/PKGBUILD
index 1ed55d15f056..3efd066bb8c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,34 @@
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 pkgname=hyperrogue
-pkgver=11.3o
-_pkgver=113o
-_musicver=113a
+pkgver=12.1q
 pkgrel=1
-pkgdesc="You are a lone outsider in a strange, non-Euclidean hyperbolic world.  Optional music."
+pkgdesc="You are a lone outsider in a strange, non-Euclidean hyperbolic world"
 arch=('i686' 'x86_64')
 url="http://www.roguetemple.com/z/hyper.php"
 license=('GPL2')
 depends=('sdl_gfx' 'sdl_ttf' 'sdl_mixer' 'mesa' 'ttf-dejavu')
 makedepends=('glu')
-
-# set to "" for none or "low" or "full"
-_music=""
-
-#source=("http://www.roguetemple.com/z/hyper/hyperrogue${_pkgver}-src.tgz")
 source=("hyperrogue-$pkgver.tgz::https://github.com/zenorogue/hyperrogue/archive/v${pkgver}.tar.gz")
-md5sums=('6bf9dc99e905da19ba8a36192545252d')
-#echo http://www.roguetemple.com/z/hyper/hyperrogue${_pkgver}-{lq,win}.zip
-if [[ "$_music" == "low" ]]; then
-    source+=("http://www.roguetemple.com/z/hyper/hyperrogue${_musicver}-lq.zip")
-    md5sums+=('589c7d72fa1caae7fdf383a32289387c')
-fi
-if [[ "$_music"  == "full" ]]; then
-    source+=("http://www.roguetemple.com/z/hyper/hyperrogue${_musicver}-win.zip")
-    md5sums+=('eda71cad345933f2cf42830a2eae6b6b')
-fi
-
-prepare() {
-    cd "$srcdir/$pkgname-$pkgver"
-    ./autogen.sh
-    sed -i 's|TTF_OpenFont.*;|TTF_OpenFont("/usr/share/fonts/TTF/DejaVuSans-Bold.ttf", siz);|' basegraph.cpp
-    #sed -i 's|<SDL.h>|"SDL.h"|' /usr/include/SDL/SDL_gfxPrimitives.h  # todo: confirm bug and open
-    sed -i 's|-c hyper.cpp|& -I/usr/include/SDL/|' Makefile  # remove when above bug is fixed
-    sed -i 's|DEFAULT_INCLUDES = -I.$|& -I/usr/include/SDL/|'  Makefile  # ditto
-    sed -i 's|savepng.c|savepng.cpp|' Makefile
-    sed -i 's|savepng.cpppp|savepng.cpp|' Makefile
-    sed -i 's|-Werror||' Makefile
-}
+sha256sums=('65689881423762cadf6d6b2e22a1ade62a3f6911fdf6d268d84111e1e0f3b6f0')
 
 build() {
     cd "$srcdir/$pkgname-$pkgver"
+    export CXXFLAGS=-I/usr/include/SDL 
+    export EXTRA_CXXFLAGS="-DHYPERFONTPATH='\"/usr/share/fonts/TTF/\"'"
+    export HYPERROGUE_USE_GLEW=1
+    export HYPERROGUE_USE_PNG=1
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname-$pkgver"
-    install -Dm755 hyperrogue "$pkgdir/usr/bin/hyperrogue"
-    if [[ -z "$_music" ]]; then
-        return
-    fi
-    install -Dm644 hyperrogue-music.txt "$pkgdir/usr/share/hyperrogue/hyperrogue-music.txt"
-    cd "$srcdir/$pkgname-$pkgver"
-    cp *.ogg "$pkgdir/usr/share/hyperrogue/"
+    install -d "${pkgdir}"/usr/{bin,share/{${pkgname}/sounds,${pkgname}/music,applications}}
+
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    install -Dm755 hyperrogue "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 sounds/* "${pkgdir}/usr/share/${pkgname}/sounds"
+    install -Dm644 music/* "${pkgdir}/usr/share/${pkgname}/music"
+    install -Dm644 {hyperrogue-music.txt,*.dat} "${pkgdir}/usr/share/${pkgname}"
+    install -Dm755 contrib/hyperrogue.desktop "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    install -Dm755 hyperroid/app/src/main/res/drawable-hdpi/icon.png "${pkgdir}/usr/share/pixmaps/hyperrogue.png"
 }