Update to r41

2 files changed, 33 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fb1e373e3107..c45cc5b72559 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = x16-emulator
 	pkgdesc = An emulator for The 8-Bit Guy's Commander X16
-	pkgver = r38
+	pkgver = r41
 	pkgrel = 1
 	url = http://commanderx16.com/
 	arch = x86_64
 	groups = commander-x16
 	license = BSD
+	makedepends = clang
 	makedepends = pandoc
 	makedepends = gendesk
 	depends = sdl2
 	optdepends = x16-rom: ROMs for the emulator
-	source = x16-emulator-r38.tar.gz::https://github.com/commanderx16/x16-emulator/archive/r38.tar.gz
+	source = x16-emulator-r41.tar.gz::https://github.com/commanderx16/x16-emulator/archive/r41.tar.gz
 	source = modify-base-path.patch
-	md5sums = 06a9be7149764860344771d866b1a196
+	md5sums = 8c0dc1456de728a8c030e8c36085bdd3
 	md5sums = 5cd0550d2af1b4267c9b9f30eed9691e
 
 pkgname = x16-emulator
-
diff --git a/PKGBUILD b/PKGBUILD
index 7e3ec7490d50..1e54d3433b9c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,7 @@
-# Maintainer: Julien Savard <juju@juju2143.ca>
+# Maintainer: Claudia Pellegrino <aur ät cpellegrino.de>
+# Contributor: Julien Savard <juju@juju2143.ca>
 pkgname=x16-emulator
-pkgver=r38
+pkgver=r41
 pkgrel=1
 pkgdesc="An emulator for The 8-Bit Guy's Commander X16"
 arch=('x86_64')
@@ -8,37 +9,39 @@ url="http://commanderx16.com/"
 license=('BSD')
 groups=('commander-x16')
 depends=('sdl2')
-makedepends=('pandoc' 'gendesk')
+makedepends=('clang' 'pandoc' 'gendesk')
 optdepends=('x16-rom: ROMs for the emulator')
-provides=()
-conflicts=()
-replaces=()
-options=()
-install=
-changelog=
-source=("$pkgname-$pkgver.tar.gz::https://github.com/commanderx16/$pkgname/archive/$pkgver.tar.gz"
-	"modify-base-path.patch")
-md5sums=('06a9be7149764860344771d866b1a196'
-         '5cd0550d2af1b4267c9b9f30eed9691e')
+
+source=(
+    "$pkgname-$pkgver.tar.gz::https://github.com/commanderx16/$pkgname/archive/$pkgver.tar.gz"
+    "modify-base-path.patch"
+)
+
+md5sums=(
+    '8c0dc1456de728a8c030e8c36085bdd3'
+    '5cd0550d2af1b4267c9b9f30eed9691e'
+)
 
 prepare() {
-	cd "$pkgname-$pkgver"
-	patch -uN main.c ../modify-base-path.patch
-	gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "X16 Emulator" --icon "$pkgname" --exec "x16emu" --categories "Game;Emulator"
+    cd "$pkgname-$pkgver"
+    patch -uN src/main.c ../modify-base-path.patch
+    sed -i -e 's/^\(LDFLAGS=.*\)/\1 '"${LDFLAGS}/" Makefile
+    gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "X16 Emulator" --icon "$pkgname" --exec "x16emu" --categories "Game;Emulator"
 }
 
 build() {
-	cd "$pkgname-$pkgver"
-	make
-	pandoc --from gfm --to html -c github-pandoc.css --standalone --metadata pagetitle="X16 Emulator" README.md --output README.html
+    cd "$pkgname-$pkgver"
+    # https://aur.archlinux.org/packages/x16-emulator#comment-827725
+    CC="clang ${CFLAGS} -Wno-macro-redefined" make
+    pandoc --from gfm --to html -c github-pandoc.css --standalone --metadata pagetitle="X16 Emulator" README.md --output README.html
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	install -Dm755 x16emu "$pkgdir/usr/bin/x16emu"
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-	install -Dm644 github-pandoc.css "$pkgdir/usr/share/doc/$pkgname/github-pandoc.css"
-	install -Dm644 README.html "$pkgdir/usr/share/doc/$pkgname/README.html"
-	install -Dm644 .gh/logo.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
-	install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    cd "$pkgname-$pkgver"
+    install -Dm755 x16emu "$pkgdir/usr/bin/x16emu"
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 github-pandoc.css "$pkgdir/usr/share/doc/$pkgname/github-pandoc.css"
+    install -Dm644 README.html "$pkgdir/usr/share/doc/$pkgname/README.html"
+    install -Dm644 .gh/logo.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+    install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
 }