11.3o update

2 files changed, 19 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 015fab84df91..147a66d77430 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Mar 13 02:52:10 UTC 2020
+# 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.3a
+	pkgver = 11.3o
 	pkgrel = 1
 	url = http://www.roguetemple.com/z/hyper.php
 	arch = i686
@@ -14,8 +14,8 @@ pkgbase = hyperrogue
 	depends = sdl_mixer
 	depends = mesa
 	depends = ttf-dejavu
-	source = http://www.roguetemple.com/z/hyper/hyperrogue113a-src.tgz
-	md5sums = 633c1dee24895d8d5ee68a4a5af8e586
+	source = hyperrogue-11.3o.tgz::https://github.com/zenorogue/hyperrogue/archive/v11.3o.tar.gz
+	md5sums = 6bf9dc99e905da19ba8a36192545252d
 
 pkgname = hyperrogue
 
diff --git a/PKGBUILD b/PKGBUILD
index af47f0af5140..1ed55d15f056 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 pkgname=hyperrogue
-pkgver=11.3a
-_pkgver=113a
+pkgver=11.3o
+_pkgver=113o
+_musicver=113a
 pkgrel=1
 pkgdesc="You are a lone outsider in a strange, non-Euclidean hyperbolic world.  Optional music."
 arch=('i686' 'x86_64')
@@ -13,40 +14,44 @@ makedepends=('glu')
 # set to "" for none or "low" or "full"
 _music=""
 
-source=("http://www.roguetemple.com/z/hyper/hyperrogue${_pkgver}-src.tgz")
-md5sums=('633c1dee24895d8d5ee68a4a5af8e586')
+#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${_pkgver}-lq.zip")
+    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${_pkgver}-win.zip")
+    source+=("http://www.roguetemple.com/z/hyper/hyperrogue${_musicver}-win.zip")
     md5sums+=('eda71cad345933f2cf42830a2eae6b6b')
 fi
 
 prepare() {
-    cd "$srcdir/$pkgname${_pkgver}-src"
+    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
 }
 
 build() {
-    cd "$srcdir/$pkgname${_pkgver}-src"
+    cd "$srcdir/$pkgname-$pkgver"
     make
 }
 
 package() {
-    cd "$srcdir/$pkgname${_pkgver}-src"
+    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}"
+    cd "$srcdir/$pkgname-$pkgver"
     cp *.ogg "$pkgdir/usr/share/hyperrogue/"
 }