Update for switch to python 3

3 files changed, 29 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c93d7ff72b81..759ddd3bca88 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = blastem-hg
 	pkgdesc = Fast and accurate Sega Genesis/Mega Drive emulator
-	pkgver = r2040.a61b47d5489e
+	pkgver = r2241.48f718126099
 	pkgrel = 1
-	url = http://rhope.retrodev.com/files/blastem.html
+	url = https://www.retrodev.com/blastem/
 	arch = x86_64
 	license = GPLv3
 	makedepends = mercurial
-	makedepends = python2-pillow
+	makedepends = python-pillow
 	makedepends = vasm
 	makedepends = xcftools
 	depends = sdl2
@@ -14,8 +14,6 @@ pkgbase = blastem-hg
 	provides = blastem
 	conflicts = blastem
 	source = blastem::hg+http://rhope.retrodev.com/repos/blastem
-	source = menu.patch
 	sha256sums = SKIP
-	sha256sums = 9c5a6b77b20c221bdbd1f274d3ace8ed25bdc5678840c4985acc605d43203af5
 
 pkgname = blastem-hg
diff --git a/PKGBUILD b/PKGBUILD
index 1b7afdabf053..971d54aa1927 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,52 +1,45 @@
 # Maintainer: Vaporeon <vaporeon@vaporeon.io>
 # Contributor: Lukas Sabota <lukas@lwsabota.com>
 pkgname=blastem-hg
-pkgver=r2040.a61b47d5489e
+pkgver=r2241.48f718126099
 pkgrel=1
 pkgdesc="Fast and accurate Sega Genesis/Mega Drive emulator"
 arch=('x86_64')
-url="http://rhope.retrodev.com/files/blastem.html"
+url="https://www.retrodev.com/blastem/"
 license=('GPLv3')
 depends=('sdl2' 'glew')
-makedepends=('mercurial' 'python2-pillow' 'vasm' 'xcftools')
+makedepends=('mercurial' 'python-pillow' 'vasm' 'xcftools')
 provides=('blastem')
 conflicts=('blastem')
-source=(blastem::hg+http://rhope.retrodev.com/repos/blastem
-        'menu.patch')
-sha256sums=('SKIP'
-            '9c5a6b77b20c221bdbd1f274d3ace8ed25bdc5678840c4985acc605d43203af5')
+source=("blastem::hg+http://rhope.retrodev.com/repos/blastem")
+sha256sums=('SKIP')
 
 pkgver() {
-    cd $srcdir/${pkgname%-hg}
-    printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)" | sed s/+//g
-}
-
-prepare() {
-    cd "$srcdir/${pkgname%-hg}"
-    patch -Np1 -i "${srcdir}/menu.patch"
+  cd $srcdir/${pkgname%-hg}
+  printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)" | sed s/+//g
 }
 
 build() {
-    cd "$srcdir/${pkgname%-hg}"
-    make blastem
-    make menu.bin
+  cd "$srcdir/${pkgname%-hg}"
+  make blastem
+  make menu.bin
 }
 
 package() {
-    cd "$srcdir/${pkgname%-hg}"
-    mkdir -p "$pkgdir/opt/blastem"
-    install -d -g games "$pkgdir/opt/blastem"
-    install -m 755 -g games -D blastem "$pkgdir/opt/blastem"
-    install -m 666 -g games -D default.cfg "$pkgdir/opt/blastem"
-    install -m 666 -g games -D systems.cfg "$pkgdir/opt/blastem"
-    install -m 666 -g games rom.db gamecontrollerdb.txt "$pkgdir/opt/blastem"
-    install -m 644 -g games -d "$pkgdir/opt/blastem/shaders"
-    install -m 644 -g games -D shaders/* "$pkgdir/opt/blastem/shaders"
-    install -m 644 -g games -D menu.bin "$pkgdir/opt/blastem"
-    chmod 755 "$pkgdir/opt/blastem/blastem"
-    chown root:games "$pkgdir/opt/blastem"
-    chown root:games "$pkgdir/opt/blastem/shaders"
-    chmod 755 "$pkgdir/opt/blastem/shaders"
-    mkdir -p "$pkgdir/usr/bin"
-    ln -s "/opt/blastem/blastem" "$pkgdir/usr/bin/blastem"
+  cd "$srcdir/${pkgname%-hg}"
+  mkdir -p "$pkgdir/opt/blastem"
+  install -d -g games "$pkgdir/opt/blastem"
+  install -m 755 -g games -D blastem "$pkgdir/opt/blastem"
+  install -m 666 -g games -D default.cfg "$pkgdir/opt/blastem"
+  install -m 666 -g games -D systems.cfg "$pkgdir/opt/blastem"
+  install -m 666 -g games rom.db gamecontrollerdb.txt "$pkgdir/opt/blastem"
+  install -m 644 -g games -d "$pkgdir/opt/blastem/shaders"
+  install -m 644 -g games -D shaders/* "$pkgdir/opt/blastem/shaders"
+  install -m 644 -g games -D menu.bin "$pkgdir/opt/blastem"
+  chmod 755 "$pkgdir/opt/blastem/blastem"
+  chown root:games "$pkgdir/opt/blastem"
+  chown root:games "$pkgdir/opt/blastem/shaders"
+  chmod 755 "$pkgdir/opt/blastem/shaders"
+  mkdir -p "$pkgdir/usr/bin"
+  ln -s "/opt/blastem/blastem" "$pkgdir/usr/bin/blastem"
 }
diff --git a/menu.patch b/menu.patch
deleted file mode 100644
index 20eb86e0c62e..000000000000
--- a/menu.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -Nura blastem.old/img2tiles.py blastem.new/img2tiles.py
---- blastem.old/img2tiles.py	2017-06-02 05:44:36.000000000 -0300
-+++ blastem.new/img2tiles.py	2017-06-08 00:50:40.400366258 -0300
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from PIL import Image
- 
- def gchannel(Val):