aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-09-04 02:38:04 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-09-04 03:11:16 -0300
commit1f0f5c7aaf83fa11c40fb66451c98cb0570bf7e6 (patch)
treee70a0597d1ef6fa38d05964a9287820ab16d4e83
parent9dea179cbd5aafb9eadef5484b83339689463cd9 (diff)
downloadaports-1f0f5c7aaf83fa11c40fb66451c98cb0570bf7e6.tar.bz2
aports-1f0f5c7aaf83fa11c40fb66451c98cb0570bf7e6.tar.xz
testing/mednafen: upgrade to 1.22.2
-rw-r--r--testing/mednafen/01-fix_textrels.patch11
-rw-r--r--testing/mednafen/02-fix_x86_inline_asm.patch36
-rw-r--r--testing/mednafen/03-sdl_by_default.patch12
-rw-r--r--testing/mednafen/APKBUILD45
-rw-r--r--testing/mednafen/gcc6-fix.patch11
-rw-r--r--testing/mednafen/ppc64.patch17
6 files changed, 30 insertions, 102 deletions
diff --git a/testing/mednafen/01-fix_textrels.patch b/testing/mednafen/01-fix_textrels.patch
deleted file mode 100644
index 0c12b7b61e..0000000000
--- a/testing/mednafen/01-fix_textrels.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- origin/configure
-+++ mednafen/configure
-@@ -26699,7 +26699,7 @@
- fi
-
-
-- CPPFLAGS="-fno-pic -fno-pie -fno-PIC -fno-PIE $CPPFLAGS"
-+ CPPFLAGS="$CPPFLAGS"
-
- MMX_CFLAGS="-mmmx"
- SSE_CFLAGS="-msse"
diff --git a/testing/mednafen/02-fix_x86_inline_asm.patch b/testing/mednafen/02-fix_x86_inline_asm.patch
deleted file mode 100644
index d17fd36303..0000000000
--- a/testing/mednafen/02-fix_x86_inline_asm.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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/03-sdl_by_default.patch b/testing/mednafen/03-sdl_by_default.patch
deleted file mode 100644
index b912af108d..0000000000
--- a/testing/mednafen/03-sdl_by_default.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru mednafen.orig/src/drivers/video.cpp mednafen/src/drivers/video.cpp
---- mednafen.orig/src/drivers/video.cpp 2015-02-23 21:06:16.000000000 +0000
-+++ mednafen/src/drivers/video.cpp 2015-04-10 05:38:20.784481562 +0000
-@@ -147,7 +147,7 @@
-
- static MDFNSetting GlobalVideoSettings[] =
- {
-- { "video.driver", MDFNSF_NOFLAGS, gettext_noop("Video output method/driver."), NULL, MDFNST_ENUM, "opengl", NULL, NULL, NULL, NULL, VDriver_List },
-+ { "video.driver", MDFNSF_NOFLAGS, gettext_noop("Video output method/driver."), NULL, MDFNST_ENUM, "sdl", NULL, NULL, NULL, NULL, VDriver_List },
-
- { "video.fs", MDFNSF_NOFLAGS, gettext_noop("Enable fullscreen mode."), NULL, MDFNST_BOOL, "0", },
- { "video.glvsync", MDFNSF_NOFLAGS, gettext_noop("Attempt to synchronize OpenGL page flips to vertical retrace period."),
diff --git a/testing/mednafen/APKBUILD b/testing/mednafen/APKBUILD
index 8340d93abb..70e267e767 100644
--- a/testing/mednafen/APKBUILD
+++ b/testing/mednafen/APKBUILD
@@ -1,53 +1,34 @@
# Contributor: August Klein <amatcoder@gmail.com>
# Maintainer: August Klein <amatcoder@gmail.com>
pkgname=mednafen
-pkgver=0.9.38.7
+pkgver=1.22.2
pkgrel=0
pkgdesc="A command-line multi-system emulator"
-url="http://mednafen.sourceforge.net"
-arch="all !armv7"
-license="GPL-2.0"
-depends=""
-makedepends="alsa-lib-dev libsndfile-dev mesa-dev glu-dev paxmark sdl-dev zlib-dev"
+url="https://mednafen.github.io/"
+arch="all !s390x"
+license="GPL-2.0-only"
+makedepends="alsa-lib-dev flac-dev libogg-dev libsndfile-dev libvorbis-dev
+ lzo-dev sdl2-dev zlib-dev"
subpackages="$pkgname-lang"
-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
- gcc6-fix.patch
+source="https://mednafen.github.io/releases/files/mednafen-$pkgver.tar.xz
+ ppc64.patch
"
builddir="$srcdir"/$pkgname
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr || return 1
- make || return 1
+ --prefix=/usr
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
rm -rf "$pkgdir"/usr/lib/charset.alias
- paxmark -m "$pkgdir"/usr/bin/mednafen
}
-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
-765829339c1509d8b2fd978857152bbc gcc6-fix.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
-d420e803035eef81453fd16e2a0eedd61c7e7d1f99d3f733280f5fb0435146ed gcc6-fix.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
-9418e09053b2506401fdab8cbd18132f699cb90723551630ecdbeb0fceda4d4fc630bad659aea5f2d15ebe1268c1a52f14c2dbd68ed7a8d02d2258ee8160c517 gcc6-fix.patch"
+sha512sums="e094a9134115344bf857eb7edce67f146fd43b83432db69271d5924ab5ec7dae11cdb7272c0d3c697a654902ce73cb42165f5e1256758f05e41167007e8f3a2d mednafen-1.22.2.tar.xz
+eabdf2fb1b0872b902d2a7107b87a2033cdbbf177156061e086e808699b9a6d95533e32a2be1d9b9b3a714d64e2c79aa16ec0d68690cfd379940fec59c96960d ppc64.patch"
diff --git a/testing/mednafen/gcc6-fix.patch b/testing/mednafen/gcc6-fix.patch
deleted file mode 100644
index ada47196de..0000000000
--- a/testing/mednafen/gcc6-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/cdrom/CDAccess_CCD.cpp.orig
-+++ ./src/cdrom/CDAccess_CCD.cpp
-@@ -346,7 +346,7 @@
- if(prev_lba != INT_MAX && abs(lba - prev_lba) > 100)
- throw MDFN_Error(0, _("Garbage subchannel Q data detected(excessively large jump in AMSF)"));
-
-- if(abs(lba - s) > 100)
-+ if(abs((int)(lba - s)) > 100)
- throw MDFN_Error(0, _("Garbage subchannel Q data detected(AMSF value is out of tolerance)"));
-
- prev_lba = lba;
diff --git a/testing/mednafen/ppc64.patch b/testing/mednafen/ppc64.patch
new file mode 100644
index 0000000000..1097c2ae16
--- /dev/null
+++ b/testing/mednafen/ppc64.patch
@@ -0,0 +1,17 @@
+Taken from Adélie Linux (https://code.foxkit.us/adelie/packages/blob/master/user/mednafen/ppc64.patch)
+===
+
+musl is always ELFv2, no matter endianness.
+
+--- mednafen/src/snes/src/lib/libco/ppc.c.old 2019-01-28 06:52:37.000000000 +0000
++++ mednafen/src/snes/src/lib/libco/ppc.c 2019-03-25 03:42:05.330000000 +0000
+@@ -40,7 +40,7 @@
+ /* Whether function calls are indirect through a descriptor,
+ or are directly to function */
+ #ifndef LIBCO_PPCDESC
+- #if !_CALL_SYSV && (_CALL_AIX || _CALL_AIXDESC || LIBCO_PPC64)
++ #if !_CALL_SYSV && (_CALL_AIX || _CALL_AIXDESC || (LIBCO_PPC64 && _CALL_ELF == 1))
+ #define LIBCO_PPCDESC 1
+ #endif
+ #endif
+