aboutsummaryrefslogtreecommitdiffstats
path: root/testing/mednafen
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-04-10 06:30:45 +0000
committerTimo Teräs <timo.teras@iki.fi>2015-04-10 09:30:58 +0300
commit10ff045cfdd080e523b10292926672c7fc375acb (patch)
treee25a55797645c796aa423b1da3e2df5444298c92 /testing/mednafen
parent3eacee041e338bb04cae5ae7ed37a2737e09ae66 (diff)
downloadaports-10ff045cfdd080e523b10292926672c7fc375acb.tar.bz2
aports-10ff045cfdd080e523b10292926672c7fc375acb.tar.xz
testing/mednafen: fix x86 build
don't use ebx in inline asm as it's unavailable in PIC build
Diffstat (limited to 'testing/mednafen')
-rw-r--r--testing/mednafen/04-fix_x86_inline_asm.patch36
-rw-r--r--testing/mednafen/APKBUILD15
2 files changed, 46 insertions, 5 deletions
diff --git a/testing/mednafen/04-fix_x86_inline_asm.patch b/testing/mednafen/04-fix_x86_inline_asm.patch
new file mode 100644
index 0000000000..d17fd36303
--- /dev/null
+++ b/testing/mednafen/04-fix_x86_inline_asm.patch
@@ -0,0 +1,36 @@
+--- mednafen/src/pce_fast/vdc.cpp.orig
++++ mednafen/src/pce_fast/vdc.cpp
+@@ -1027,12 +1027,12 @@
+
+ asm volatile(
+ "testl $15, %%eax\n\t"
+- "bt $15, %%ebx\n\t"
++ "bt $15, %%edx\n\t"
+
+- "cmovbe %%ebx, %%eax\n\t"
++ "cmovbe %%edx, %%eax\n\t"
+ "andl $511, %%eax\n\t"
+ : "=a"(pixel)
+- : "a"(pixel), "b"(spr_pixel)
++ : "a"(pixel), "d"(spr_pixel)
+ : "cc" );
+
+ target[x] = vce.color_table_cache[pixel];
+@@ -1047,14 +1047,14 @@
+
+ asm volatile(
+ "testl $15, %%eax\n\t"
+- "bt $15, %%ebx\n\t"
++ "bt $15, %%edx\n\t"
+
+ "jnbe 1f\n\t"
+- "movl %%ebx, %%eax\n\t"
++ "movl %%edx, %%eax\n\t"
+ "andl $511, %%eax\n\t"
+ "1:\n\t"
+ : "=a"(pixel)
+- : "a"(pixel), "b"(spr_pixel)
++ : "a"(pixel), "d"(spr_pixel)
+ : "cc" );
+
+ target[x] = vce.color_table_cache[pixel];
diff --git a/testing/mednafen/APKBUILD b/testing/mednafen/APKBUILD
index e673a2efe2..2662b4b166 100644
--- a/testing/mednafen/APKBUILD
+++ b/testing/mednafen/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=mednafen
pkgver=0.9.38.3
-pkgrel=0
+pkgrel=1
pkgdesc="A command-line multi-system emulator"
url="http://mednafen.sourceforge.net"
arch="all"
@@ -15,7 +15,9 @@ 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"
+ 03-fix_textrels.patch
+ 04-fix_x86_inline_asm.patch
+ "
_builddir="$srcdir"/$pkgname
prepare() {
@@ -61,12 +63,15 @@ __EOF__
md5sums="34556f552cf128c0ea18c025d675a28c mednafen-0.9.38.3.tar.bz2
259d9396e292b0446f3837799c3ff091 01-fix_help.patch
fe551992f13f1cfe44fde9a96f5fd0b2 02-sdl_by_default.patch
-355403c74108baaa6b65fc5521c87be0 03-fix_textrels.patch"
+355403c74108baaa6b65fc5521c87be0 03-fix_textrels.patch
+7c5210fdc196e79b9f73637ec306b5ad 04-fix_x86_inline_asm.patch"
sha256sums="e64c6ac9de18b3735ed24f797c9e9304cb51ad3467011aae8e6d188b3a49e7d4 mednafen-0.9.38.3.tar.bz2
511509758cd80cb2472bc95a8c790ae69565869a081a6d70acffb5d57c6c4b4a 01-fix_help.patch
3fd7154caaf00c6f58b912a24d396503d817fbb2cfdea1550f7dd9dea69d4664 02-sdl_by_default.patch
-36d96b1e5829a67e7458a338d3c296e56f1cae5f3ba11453949be7e7ef52ed02 03-fix_textrels.patch"
+36d96b1e5829a67e7458a338d3c296e56f1cae5f3ba11453949be7e7ef52ed02 03-fix_textrels.patch
+d8524b5afa22ba09f03578c1bc49ea7763bf22492ea6d8670b83bdd96af09cae 04-fix_x86_inline_asm.patch"
sha512sums="d43d41f9a852cdb20fc56218b0674f36f41318d997b2bdaf9f0141ebd3acdf03f48fbf6f83cd86cf3a09fb7bafbc32384748fb1b4baf4dcc139760bace81a469 mednafen-0.9.38.3.tar.bz2
80e549698687fbe61021ccf964979bb83243ba86d5651fb648ca134822b6b0147c79d0491d076cdfbd579236b5e9db314fcda6d0df46b17a4e856e3677314c56 01-fix_help.patch
856d16f4c044c3787abdd3d65c6b72b6e42c88d7195f097cb6767fde6e0027d756cacc1fd54279a90a6a1bd164cecb8baaf1ff66787ca38d64bdd3eb6583738b 02-sdl_by_default.patch
-361522814a514c7bb21c3d3c3451b80817a6de80c224f839071590ae6469a994e144100b67f7e33d4259e4dd3af6b115fe8e12470aaff143920b8193e54db343 03-fix_textrels.patch"
+361522814a514c7bb21c3d3c3451b80817a6de80c224f839071590ae6469a994e144100b67f7e33d4259e4dd3af6b115fe8e12470aaff143920b8193e54db343 03-fix_textrels.patch
+424a6727117f4e0ad022b2fe2726a85c43a8a529770e74dada7e7810a6542741c0a2f7ad767e0d0471c5201c26242ab5380b7c82d25f74aa533c4508ded71811 04-fix_x86_inline_asm.patch"