From nobody Thu Aug 15 17:36:52 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlC3n1n95z5SY83; Thu, 15 Aug 2024 17:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlC3n0phBz4h6t; Thu, 15 Aug 2024 17:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723743413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fumqPIIcTc2HtYacCWY6dTtRZ6IOoymBKIXujyMnKbI=; b=ynH+Wp/68CdDRQ98mQMYSBLLnKDDn8cP3TZ3qVTEh25VqGf1P2yyV3PHXfbcpYahZsPHui lUikOG5J3Si1ff2n451mz66hoXI+zQ4P89SGwArEDWHHnz6D1TYreWGyaDEYjWeuXxeVb+ ksELk4YymKja/Tadr8QXViJCKZfZc4U+H+tK5ktnumksBB+tA2dsk392M3QUxSPeRj9Lpt GChwY0Csj4SqVA2iF/EYn8TbIFOfZSnpT9p5Ildzw8gfqdNnNKZ/9yXvxa8fAHsYtN3aoM dG0JVTrTG3GViEy8J5IxHi73yDmHILpo9FPtwQvOmbjMSV/aqJ43pcB2r6jmxQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723743413; a=rsa-sha256; cv=none; b=DQicPz2ZzJQroUfHL9j7DAEfubTg1nsNpYZ3iI25TrN/fqS9u0nip+KD31MMqYnJqdVmKY 5EC5tFjS17eujNn2dslHFT1HYBP7GB0414XT4dY1dcVIqdJ2mAwWRzo7jVPEblGp+0TTg+ Mzp1frw4GmYZfaYHuK7UcoVmfj7XbsTK8aQ0rSMmhvkhVdKBY07CDczrGyc4RsUfG+ojwf ctrrApDJH964QSKA0SpLM/5Z9PPb3HK9sFx5bD2dEHUq1E+L8SCuPEAY6CbnohVfQD8Y5H UiuSqqCq5aPM+i3mu6GZr221ilY/hWXPO+5jolv8PFXzyDBHhZpA5Go0nSgwig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723743413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fumqPIIcTc2HtYacCWY6dTtRZ6IOoymBKIXujyMnKbI=; b=Mnb1Cx7EjBspI3WrrPgdKhP6P/gZFDEanOSoPYFvZSVBZxWeXZPjooY4C/dz02yuyDZMty 5EdrBOWHdD8ExPp17fnMa+FusUtNCnw4BrBAT4azifzCqAsw1GfBtGZ3EJ3mLLoSSEgCgJ L9OSymEyJIPOVlfq12aRmVdMqU7FKZH2IEko2zXQ16JArGibo9He5WrV+nLYNmV30a8xJr Qa7nZ8VovwEVN7kjDEm8FxdNGO5hvoWupZ6mmS+0iENCzejL5ku5n98WYTgl8URevIENo0 tyUQCivXs6dCmLkMDBHtc/vBvUaLiSkxOOP9cqHPxWf9rLdIzcJ2cYNLEaAGKw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlC3n0C6gzXtD; Thu, 15 Aug 2024 17:36:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FHaqgA039324; Thu, 15 Aug 2024 17:36:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FHaq1x039321; Thu, 15 Aug 2024 17:36:52 GMT (envelope-from git) Date: Thu, 15 Aug 2024 17:36:52 GMT Message-Id: <202408151736.47FHaq1x039321@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 5e2e6a2f8e5d - main - emulators/ares: unbreak i386 build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e2e6a2f8e5d14fd4322863cbae3a779c83c3278 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=5e2e6a2f8e5d14fd4322863cbae3a779c83c3278 commit 5e2e6a2f8e5d14fd4322863cbae3a779c83c3278 Author: Stefan Schlosser AuthorDate: 2024-08-15 17:31:25 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-15 17:35:42 +0000 emulators/ares: unbreak i386 build - recognize i386 architecture in upstream GNUmakefile (upstream pool request: https://github.com/ares-emulator/ares/pull/1600) - use LLD_UNSAFE with OPENAL option - change WWW to homepage - fix typo in pkg-descr PR: 280826 --- emulators/ares/Makefile | 9 ++++++++- emulators/ares/files/patch-nall_GNUmakefile | 9 +++++++++ emulators/ares/pkg-descr | 2 +- 3 files changed, 18 insertions(+), 2 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 + +.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..1d1551df60f3 100644 --- a/emulators/ares/files/patch-nall_GNUmakefile +++ b/emulators/ares/files/patch-nall_GNUmakefile @@ -1,5 +1,14 @@ --- nall/GNUmakefile.orig 2024-08-14 12:07:36 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.