From nobody Mon Jun 27 07:10:27 2022 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 2536F869721; Mon, 27 Jun 2022 07:10:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LWf4z3rb5z4VNq; Mon, 27 Jun 2022 07:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656313827; 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=ybQhD/WpNUPMWaxPKacMriPXZmaATLsYbq4hgsw4RuY=; b=QqMd/8aCXPjN91+zSECr/WQrBBFpxgGIa6PYwyqzZbyEMuJ6wluCIgLjbd8HjrQDRai1Wg rb4E9zEQgyx9M2xa64F9Xw7ZIwLEAJXJ0/P3pq/ON1XSOt5IB3uA12WU/QxOXGOp4daN68 7US5Kg0dnbX+VOe/Kp3HL0UuyCdO+L5Is1F7QvaISZfqLN0L71GaErVsNsML9Au3AHi0zh VCzl1VxY/8IIccyjRUtbi2bnz3sBsbVqoA88SGkhWLyPI/5eGCI08sfSP7X6dw3d9KgiuO a0vAFeU3OgxZDORVpcQTNGzEIOqDTH2Z3C5W77Gnu7LjydiowdzA9rbCPBBD4g== 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 4E8052387E; Mon, 27 Jun 2022 07:10:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25R7ARi0006443; Mon, 27 Jun 2022 07:10:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25R7ARE8006442; Mon, 27 Jun 2022 07:10:27 GMT (envelope-from git) Date: Mon, 27 Jun 2022 07:10:27 GMT Message-Id: <202206270710.25R7ARE8006442@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: eb935d1066f6 - main - emulators/libretro-flycast: Fix 32-bit / 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb935d1066f6c36361138dae21cf0ef016b4e97b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656313827; 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=ybQhD/WpNUPMWaxPKacMriPXZmaATLsYbq4hgsw4RuY=; b=o+NTGKC3lAg+mylojGiU9iJGkOnExls4lUUGhL6bpsgExGGqzBahQ5P5HwvYxcfb4Mdp38 bwr+rWApVX8vppz5Zyv0onuLq8JDrYS4LV/MqU7fbCgJuLPvlo0dbs/AFYwZ9BzYMqr1qf NXivgg5UU7mtyWycB1cc88YWJuWbHmbuMrqHcg2rdk5npnHoq1ayk7r3DfBWwHX5Hb0xeD ZOKB/KXHQ7hkjWrooUl/cpAJBh/gZZEgDXUtchR5pDLELDyxRUe44Cc1Xjt6igN16UruFG AJySMXDCcI2I0s1hfxosNQuivORKxNAcji5VXBOOyY55RESqGqjn7fJV+XvDtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656313827; a=rsa-sha256; cv=none; b=VaHe+2yh0/XqSbEsx7Uyd4QkgWNk95GVvcuSsL52YA01XfeuJL1BLx6YETi+m0CQZMRjKo xM2S7pUhfDT7lXWTJ9Hty65Y9EcWoRAxaIQavS+E/h28E5tiHVjgYHgG9VxqFWXb0TbQkQ wX1SVc0ElfWF2x+rYgs27xilX3P35z5Yt4lQtE7iO3XnPG+fKVg5fJG2/xixhc7IppcEO9 6RusQBu/avY+dIEx/hLieAYzLGBMhHP7TVuUKSOmMzz3TNlxX2B+tcKUOr71I/u2pksqUF 3l5dgVYU/V7AEM1uPkkHX7qDcIZe3MhrQp71AA2ErpppsfAeeYcdmUjCRFjZBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb935d1066f6c36361138dae21cf0ef016b4e97b commit eb935d1066f6c36361138dae21cf0ef016b4e97b Author: Timothy Beyer AuthorDate: 2022-06-27 07:08:54 +0000 Commit: Li-Wen Hsu CommitDate: 2022-06-27 07:08:54 +0000 emulators/libretro-flycast: Fix 32-bit / i386 build PR: 264217 --- emulators/libretro-flycast/Makefile | 16 +++++++++++----- .../files/patch-core_rec-x86_rec__x86__driver.cpp | 11 +++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/emulators/libretro-flycast/Makefile b/emulators/libretro-flycast/Makefile index fe5e75d0f23f..6b4a1454ab6c 100644 --- a/emulators/libretro-flycast/Makefile +++ b/emulators/libretro-flycast/Makefile @@ -1,14 +1,14 @@ -# $FreeBSD$ +# Created by: Timothy Beyer PORTNAME= libretro-flycast PORTVERSION= 0.20210608 +PORTREVISION= 1 CATEGORIES= emulators games MAINTAINER= beyert@cs.ucr.edu COMMENT= Standalone port of flycast to libretro LICENSE= GPLv2 -#LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 @@ -21,7 +21,7 @@ LIB_DEPENDS+= libao.so:audio/libao \ libudev.so:devel/libudev-devd \ libvulkan.so:graphics/vulkan-loader -USES= compiler:c++11-lib dos2unix gl gmake xorg +USES= compiler:c++11-lib dos2unix gl gmake pkgconfig xorg USE_LDCONFIG= yes USE_GITHUB= yes @@ -29,7 +29,7 @@ GH_ACCOUNT= libretro GH_PROJECT= flycast GH_TAGNAME= 8e4fa54e -USE_GL+= gl glew glu +USE_GL+= egl gl glew glu CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include @@ -51,12 +51,18 @@ MAKE_ARGS= HAVE_GENERIC_JIT=0 \ MAKE_ARGS+= WITH_DYNAREC=x86_64 .elif ${ARCH} == i386 MAKE_ARGS+= WITH_DYNAREC=x86 +USE_BINUTILS= yes +LDFLAGS+= -Wl,-z,notext .endif PLIST_FILES= lib/libretro/flycast_libretro.so +post-patch: + @${REINPLACE_CMD} 's|/usr/local|${PREFIX}|' \ + ${WRKSRC}/Makefile + do-install: - ${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro; + @${MKDIR} ${STAGEDIR}/${PREFIX}/lib/libretro; ${INSTALL_LIB} ${WRKSRC}/flycast_libretro.so \ ${STAGEDIR}/${PREFIX}/lib/libretro/flycast_libretro.so; diff --git a/emulators/libretro-flycast/files/patch-core_rec-x86_rec__x86__driver.cpp b/emulators/libretro-flycast/files/patch-core_rec-x86_rec__x86__driver.cpp new file mode 100644 index 000000000000..0391177b7edc --- /dev/null +++ b/emulators/libretro-flycast/files/patch-core_rec-x86_rec__x86__driver.cpp @@ -0,0 +1,11 @@ +--- core/rec-x86/rec_x86_driver.cpp.orig 2022-05-20 09:34:27 UTC ++++ core/rec-x86/rec_x86_driver.cpp +@@ -31,7 +31,7 @@ RuntimeBlockInfo* ngen_AllocateBlock(void) + + x86_block* x86e; + +-static int cycle_counter; ++int cycle_counter; + + void* loop_no_update; + void* intc_sched;