From b7571d93f3fe0be8aeb61cda24281a005e8f1f0d Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Fri, 1 Jul 2022 09:41:58 +0200 Subject: [PATCH] mednafen, bump version, enable for x86_64 (#7013) --- ...n-1.22.1.recipe => mednafen-1.29.0.recipe} | 10 +-- .../mednafen/patches/mednafen-1.22.1.patchset | 72 ------------------- 2 files changed, 5 insertions(+), 77 deletions(-) rename app-emulation/mednafen/{mednafen-1.22.1.recipe => mednafen-1.29.0.recipe} (92%) delete mode 100644 app-emulation/mednafen/patches/mednafen-1.22.1.patchset diff --git a/app-emulation/mednafen/mednafen-1.22.1.recipe b/app-emulation/mednafen/mednafen-1.29.0.recipe similarity index 92% rename from app-emulation/mednafen/mednafen-1.22.1.recipe rename to app-emulation/mednafen/mednafen-1.29.0.recipe index 676cd7b52..9f10a35f0 100644 --- a/app-emulation/mednafen/mednafen-1.22.1.recipe +++ b/app-emulation/mednafen/mednafen-1.29.0.recipe @@ -25,16 +25,15 @@ documentation for more details): \ - Sega Master System - Sony PlayStation" HOMEPAGE="http://mednafen.fobby.net/" -COPYRIGHT="2005-2015 Mednafen Team" +COPYRIGHT="2005-2022 Mednafen Team" LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="http://mednafen.github.io/releases/files/mednafen-$portVersion.tar.xz" -CHECKSUM_SHA256="f5b502e9f2f615c8b69fa1e151da20ab387377c72748cd8e19deb75a432ecfd2" +CHECKSUM_SHA256="da3fbcf02877f9be0f028bfa5d1cb59e953a4049b90fe7e39388a3386d9f362e" SOURCE_DIR="mednafen" -PATCHES="mednafen-$portVersion.patchset" -ARCHITECTURES="?all !x86_gcc2" -SECONDARY_ARCHITECTURES="?x86" +ARCHITECTURES="?all !x86_gcc2 x86_64" +SECONDARY_ARCHITECTURES="!x86" PROVIDES=" mednafen$secondaryArchSuffix = $portVersion @@ -42,6 +41,7 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix + lib:libFLAC$secondaryArchSuffix lib:libGL$secondaryArchSuffix lib:libGLU$secondaryArchSuffix lib:libiconv$secondaryArchSuffix diff --git a/app-emulation/mednafen/patches/mednafen-1.22.1.patchset b/app-emulation/mednafen/patches/mednafen-1.22.1.patchset deleted file mode 100644 index 847168911..000000000 --- a/app-emulation/mednafen/patches/mednafen-1.22.1.patchset +++ /dev/null @@ -1,72 +0,0 @@ -From a026443b62d64cca452b9304c31ce50795399949 Mon Sep 17 00:00:00 2001 -From: miqlas -Date: Sat, 13 Apr 2019 18:55:11 +0200 -Subject: applying patch mednafen-unistd.patch - - -diff --git a/src/mempatcher.cpp b/src/mempatcher.cpp -index 9995db2..fd3306b 100644 ---- a/src/mempatcher.cpp -+++ b/src/mempatcher.cpp -@@ -31,6 +31,7 @@ - #include "mempatcher.h" - #include "FileStream.h" - #include "MemoryStream.h" -+#include - - namespace Mednafen - { --- -2.21.0 - - -From f9adbbe2f8b0a07779fbb9ffd2d6f0efb49a166e Mon Sep 17 00:00:00 2001 -From: miqlas -Date: Sat, 13 Apr 2019 18:55:11 +0200 -Subject: applying patch mednafen-signals.patch - - -diff --git a/src/drivers/main.cpp b/src/drivers/main.cpp -index ff7d59a..1f999ab 100644 ---- a/src/drivers/main.cpp -+++ b/src/drivers/main.cpp -@@ -481,7 +481,7 @@ static void CreateDirs(void) - } - - static bool volatile SignalSafeExitWanted = false; --#if defined(HAVE_SIGNAL) || defined(HAVE_SIGACTION) -+#if 0 - static const char *SiginfoString = NULL; - typedef struct - { --- -2.21.0 - - -From 1a85c7774c56a25761446f108ee6c4713010d6a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Tue, 16 Apr 2019 10:38:48 +0200 -Subject: Enable PIC/PIE - - -diff --git a/configure.ac b/configure.ac -index 10cd75b..ddec364 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,12 +125,7 @@ dnl -mfunction-return=keep, -mindirect-branch=keep, -mno-indirect-branch-registe - dnl - CODEGEN_FLAGS="" - --AX_CFLAGS_GCC_OPTION([-fno-pic], CODEGEN_FLAGS) --AX_CFLAGS_GCC_OPTION([-fno-pie], CODEGEN_FLAGS) --AX_CFLAGS_GCC_OPTION([-fno-PIC], CODEGEN_FLAGS) --AX_CFLAGS_GCC_OPTION([-fno-PIE], CODEGEN_FLAGS) --AX_CFLAGS_GCC_OPTION([-nopie], CODEGEN_FLAGS) --AX_CFLAGS_GCC_OPTION([-no-pie], CODEGEN_FLAGS) -+ - - AX_CFLAGS_GCC_OPTION([-fwrapv], CODEGEN_FLAGS) - AX_CFLAGS_GCC_OPTION([-fjump-tables], CODEGEN_FLAGS) --- -2.21.0 -