testing/mednafen: upgrade to 0.9.38.7

5 files changed, 23 insertions, 76 deletions

diff --git a/testing/mednafen/01-fix_help.patch b/testing/mednafen/01-fix_help.patch
deleted file mode 100644
index 48c35d7cd7..0000000000
--- a/testing/mednafen/01-fix_help.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- origin/src/drivers/main.cpp
-+++ mednafen/src/drivers/main.cpp
-@@ -696,7 +696,7 @@
- 	if(argc <= 1)
- 	{
- 	 printf(_("No command-line arguments specified.\n\n"));
--	 printf(usage_string, argv[0]);
-+	 printf(usage_string, "mednafen");
- 	 printf(_("\tPlease refer to the documentation for option parameters and usage.\n\n"));
- 	 return(0);
- 	}
-@@ -713,11 +713,11 @@
- 
- 	 if(ShowCLHelp)
- 	 {
--          printf(usage_string, argv[0]);
-+          printf(usage_string, "mednafen");
-           ShowArgumentsHelp(MDFNArgs, false);
- 	  printf("\n");
- 	  printf(_("Each setting(listed in the documentation) can also be passed as an argument by prefixing the name with a hyphen,\nand specifying the value to change the setting to as the next argument.\n\n"));
--	  printf(_("For example:\n\t%s -pce.stretch aspect -pce.pixshader autoipsharper \"Hyper Bonk Soldier.pce\"\n\n"), argv[0]);
-+	  printf(_("For example:\n\tmednafen -pce.stretch aspect -pce.pixshader autoipsharper \"Hyper Bonk Soldier.pce\"\n\n"));
- 	  printf(_("Settings specified in this manner are automatically saved to the configuration file, hence they\ndo not need to be passed to future invocations of the Mednafen executable.\n"));
- 	  printf("\n");
- 	  return(0);
diff --git a/testing/mednafen/03-fix_textrels.patch b/testing/mednafen/01-fix_textrels.patch
index 0c12b7b61e..0c12b7b61e 100644
--- a/testing/mednafen/03-fix_textrels.patch
+++ b/testing/mednafen/01-fix_textrels.patch
diff --git a/testing/mednafen/04-fix_x86_inline_asm.patch b/testing/mednafen/02-fix_x86_inline_asm.patch
index d17fd36303..d17fd36303 100644
--- a/testing/mednafen/04-fix_x86_inline_asm.patch
+++ b/testing/mednafen/02-fix_x86_inline_asm.patch
diff --git a/testing/mednafen/02-sdl_by_default.patch b/testing/mednafen/03-sdl_by_default.patch
index b912af108d..b912af108d 100644
--- a/testing/mednafen/02-sdl_by_default.patch
+++ b/testing/mednafen/03-sdl_by_default.patch
diff --git a/testing/mednafen/APKBUILD b/testing/mednafen/APKBUILD
index e5acfabe5c..8a2d1389f8 100644
--- a/testing/mednafen/APKBUILD
+++ b/testing/mednafen/APKBUILD
@@ -1,38 +1,25 @@
 # Contributor: August Klein <amatcoder@gmail.com>
 # Maintainer: August Klein <amatcoder@gmail.com>
 pkgname=mednafen
-pkgver=0.9.38.4
+pkgver=0.9.38.7
 pkgrel=0
 pkgdesc="A command-line multi-system emulator"
 url="http://mednafen.sourceforge.net"
 arch="all"
 license="GPL2"
 depends=""
-depends_dev="alsa-lib-dev libsndfile-dev sdl-dev zlib-dev"
-makedepends="$depends_dev mesa-dev glu-dev paxmark"
-install=""
+makedepends="alsa-lib-dev libsndfile-dev mesa-dev glu-dev paxmark sdl-dev zlib-dev"
 subpackages="$pkgname-lang"
-source="https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
-	01-fix_help.patch
-	02-sdl_by_default.patch
-	03-fix_textrels.patch
-	04-fix_x86_inline_asm.patch
+source="http://mednafen.fobby.net/releases/files/$pkgname-$pkgver.tar.bz2
+	01-fix_textrels.patch
+	02-fix_x86_inline_asm.patch
+	03-sdl_by_default.patch
 	"
 
-_builddir="$srcdir"/$pkgname
-prepare() {
-	local i
-	cd "$_builddir"
-	update_config_sub || return 1
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir"/$pkgname
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -41,37 +28,22 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-
-	mv -f "$pkgdir"/usr/bin/mednafen "$pkgdir"/usr/bin/mednafen-bin || return 1
-	libgl=$(scanelf -qF '#F%S' /usr/lib/libGL.so)
-	cat > "$pkgdir"/usr/bin/mednafen << __EOF__
-#!/bin/sh
 
-# as a workaround for libGL's initial-exec TLS we preload libgl
-# https://bugs.freedesktop.org/show_bug.cgi?id=35268
-
-LD_PRELOAD=$libgl exec /usr/bin/mednafen-bin "\$@"
-__EOF__
-
-	chmod 755 "$pkgdir"/usr/bin/mednafen
-	paxmark -m "$pkgdir"/usr/bin/mednafen-bin
+	rm -rf "$pkgdir"/usr/lib/charset.alias
+	paxmark -m "$pkgdir"/usr/bin/mednafen
 }
 
-md5sums="c7d8539d044466f3884b49fc9a68a099  mednafen-0.9.38.4.tar.bz2
-259d9396e292b0446f3837799c3ff091  01-fix_help.patch
-fe551992f13f1cfe44fde9a96f5fd0b2  02-sdl_by_default.patch
-554494930528cbb4881c85e043e17827  03-fix_textrels.patch
-7c5210fdc196e79b9f73637ec306b5ad  04-fix_x86_inline_asm.patch"
-sha256sums="3298e2d5c03efbe638c2a98bf74435e306768461c65d2bb9b9a95e99dc463105  mednafen-0.9.38.4.tar.bz2
-511509758cd80cb2472bc95a8c790ae69565869a081a6d70acffb5d57c6c4b4a  01-fix_help.patch
-3fd7154caaf00c6f58b912a24d396503d817fbb2cfdea1550f7dd9dea69d4664  02-sdl_by_default.patch
-a9990e59a91f330dc2cc3b069545629b1907dba92bd0760a8e8b89be1a73eed2  03-fix_textrels.patch
-d8524b5afa22ba09f03578c1bc49ea7763bf22492ea6d8670b83bdd96af09cae  04-fix_x86_inline_asm.patch"
-sha512sums="3eb19a10e97cd285387fcf86eae09f550d248ab9c070750b1c0af0f334cce47ea375227df72cf7cdbc2193b311bab5e09108388a15634f694ef398b1a77ac3df  mednafen-0.9.38.4.tar.bz2
-80e549698687fbe61021ccf964979bb83243ba86d5651fb648ca134822b6b0147c79d0491d076cdfbd579236b5e9db314fcda6d0df46b17a4e856e3677314c56  01-fix_help.patch
-856d16f4c044c3787abdd3d65c6b72b6e42c88d7195f097cb6767fde6e0027d756cacc1fd54279a90a6a1bd164cecb8baaf1ff66787ca38d64bdd3eb6583738b  02-sdl_by_default.patch
-797a4e0d5a768a9052b226d9395d9d03d3c59a6faf67958e09169d1e603fc59f468a68e958d60661b03ff4faf0b0275d66559f517efdfd523f07eb03618cb620  03-fix_textrels.patch
-424a6727117f4e0ad022b2fe2726a85c43a8a529770e74dada7e7810a6542741c0a2f7ad767e0d0471c5201c26242ab5380b7c82d25f74aa533c4508ded71811  04-fix_x86_inline_asm.patch"
+md5sums="e49c6b4c0c8278bc01c63cba9b54498c  mednafen-0.9.38.7.tar.bz2
+554494930528cbb4881c85e043e17827  01-fix_textrels.patch
+7c5210fdc196e79b9f73637ec306b5ad  02-fix_x86_inline_asm.patch
+fe551992f13f1cfe44fde9a96f5fd0b2  03-sdl_by_default.patch"
+sha256sums="1bb3beef883a325c35d1a1ce14959c307a4c321f2ea29d4ddb216c6dd03aded8  mednafen-0.9.38.7.tar.bz2
+a9990e59a91f330dc2cc3b069545629b1907dba92bd0760a8e8b89be1a73eed2  01-fix_textrels.patch
+d8524b5afa22ba09f03578c1bc49ea7763bf22492ea6d8670b83bdd96af09cae  02-fix_x86_inline_asm.patch
+3fd7154caaf00c6f58b912a24d396503d817fbb2cfdea1550f7dd9dea69d4664  03-sdl_by_default.patch"
+sha512sums="759c83928ef7a9e856dc7f546542ab1e7cbe944d0184a7693ce3b1466220233eb40c2b215100920920754eb5a93587bd8e2d8150e00ec9c93da1d518107e0d76  mednafen-0.9.38.7.tar.bz2
+797a4e0d5a768a9052b226d9395d9d03d3c59a6faf67958e09169d1e603fc59f468a68e958d60661b03ff4faf0b0275d66559f517efdfd523f07eb03618cb620  01-fix_textrels.patch
+424a6727117f4e0ad022b2fe2726a85c43a8a529770e74dada7e7810a6542741c0a2f7ad767e0d0471c5201c26242ab5380b7c82d25f74aa533c4508ded71811  02-fix_x86_inline_asm.patch
+856d16f4c044c3787abdd3d65c6b72b6e42c88d7195f097cb6767fde6e0027d756cacc1fd54279a90a6a1bd164cecb8baaf1ff66787ca38d64bdd3eb6583738b  03-sdl_by_default.patch"