Attachment 252781 Details for Bug 280826 – unbreak i386 build

[patch] unbreak i386 build

0001-emulators-ares-unbreak-i386-build.patch (text/plain), 2.90 KB, created by Stefan Schlosser on 2024-08-15 17:19:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Schlosser

Created: 2024-08-15 17:19:21 UTC

Size: 2.90 KB

patch

obsolete

>From 6454a920448193e31b82b41896459e4aa584a797 Mon Sep 17 00:00:00 2001
>From: Stefan Schlosser <bsdcode@disroot.org>
>Date: Thu, 15 Aug 2024 10:49:44 +0200
>Subject: [PATCH] emulators/ares: unbreak i386 build
>
>port changes:
>- recognize i386 architecture in upstream GNUmakefile
>- use LLD_UNSAFE with OPENAL option
>- change WWW to homepage
>- fix typo in pkg-descr
>---
> emulators/ares/Makefile                     |  9 ++++++++-
> emulators/ares/files/patch-nall_GNUmakefile | 13 ++++++++++++-
> emulators/ares/pkg-descr                    |  2 +-
> 3 files changed, 21 insertions(+), 3 deletions(-)
>
>diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile
>index cd82a846f62d..a3c37e28d0a8 100644
>--- a/emulators/ares/Makefile
>+++ b/emulators/ares/Makefile
>@@ -1,10 +1,11 @@
> PORTNAME=	ares
> DISTVERSION=	139.20240809
>+PORTREVISION=	1
> CATEGORIES=	emulators
> 
> MAINTAINER=	bsdcode@disroot.org
> COMMENT=	Multi-system emulator
>-WWW=		https://github.com/ares-emulator/ares
>+WWW=		https://ares-emu.net
> 
> LICENSE=	ISCL
> LICENSE_FILE=	${WRKSRC}/LICENSE
>@@ -174,6 +175,12 @@ XVIDEO_MAKE_ARGS=	ruby+=video.xvideo
> 
> _SHADERS=		share/libretro/shaders/shaders_slang
> 
>+.include <bsd.port.options.mk>
>+
>+.if ${PORT_OPTIONS:MOPENAL} && ${ARCH} == "i386"
>+LLD_UNSAFE=	yes
>+.endif
>+
> post-patch-SHADER-on:
> 	${REINPLACE_CMD} 's|@@SHADERS@@|${LOCALBASE}/${_SHADERS}/|g' \
> 		${WRKSRC}/desktop-ui/desktop-ui.cpp
>diff --git a/emulators/ares/files/patch-nall_GNUmakefile b/emulators/ares/files/patch-nall_GNUmakefile
>index 2f3d96d9db09..d2cdcc5f9c06 100644
>--- a/emulators/ares/files/patch-nall_GNUmakefile
>+++ b/emulators/ares/files/patch-nall_GNUmakefile
>@@ -1,5 +1,16 @@
>---- nall/GNUmakefile.orig	2024-08-14 12:07:36 UTC
>+https://github.com/ares-emulator/ares/pull/1600
>+
>+--- nall/GNUmakefile.orig	2024-08-09 17:39:54 UTC
> +++ nall/GNUmakefile
>+@@ -102,7 +102,7 @@ else
>+ else
>+   machine_opt := $(if $(findstring clang,$(compiler)),-print-target-triple,-dumpmachine)
>+   machine_str := $(shell $(compiler) $(machine_opt))
>+-  ifneq ($(filter i686-%,$(machine_str)),)
>++  ifneq ($(filter i386-% i486-% i586-% i686-%,$(machine_str)),)
>+     machine := x86
>+   else ifneq ($(filter amd64-% x86_64-%,$(machine_str)),)
>+     machine := amd64
> @@ -169,8 +169,6 @@ ifeq ($(build),debug)
>    lto = false
>    ifeq ($(cl),true)
>diff --git a/emulators/ares/pkg-descr b/emulators/ares/pkg-descr
>index b01a978f7b90..1d1df5876394 100644
>--- a/emulators/ares/pkg-descr
>+++ b/emulators/ares/pkg-descr
>@@ -16,5 +16,5 @@ ares has all the features one would expect from a great emulator system: native
> multi-platform UI, dynamic rate control, save states, run-ahead, rewind and
> fast-forward, pixel shaders, color correction, input multi-mapping, debugger
> 
>-ares uses librashader for it's pixel shader engine. This means it is highly
>+ares uses librashader for its pixel shader engine. This means it is highly
> compatible with existing slang shaders, e.g. the slang-shaders from libretro.
>-- 
>2.46.0
>

Flags:

bsdcode: maintainer-approval+

Actions: View | Diff

Attachments on bug 280826: 252772 | 252780 | 252781