From nobody Thu Jul 21 19:33:58 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 4LpjRp50TBz4XMZw; Thu, 21 Jul 2022 19:33:58 +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 4LpjRp4WX6z3Ygy; Thu, 21 Jul 2022 19:33:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658432038; 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=dWFNNC1TieQLaKnTzFMDCMT89qXPwijSum4fFwQvkCI=; b=Lx8us+8urM0TPH3Vr+MLg4rsRRvKRUCeg5FJBA37hy8GuAhTRqbYpBPLRzhutqBIwh0cB5 tfwIxe8b1mv3VtDMbyny+o2iIkagIAyqUABrKV0DxLA6buih1P0QCUVkMGSrzLMJmWVTw4 TNgoE6NLj+AE272jhtRaeFBvIjZRcBNxJMi7bbgGkpLXukpGNDBSx/e9Mft4NiiWjwDFj6 Z/vScewpuED/U2Y4ksYJOh5K0Tj4ysug9detjtc+Bg3fKrsGdTWs1q9G+2jJhILqPcPS7S I6z6GcjF9woT2ilo98tvcgd3eWDaHvr7V3tm1amy6dKj3xBz/KGAnpMzOEdGtw== 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 4LpjRp3bMTzYSC; Thu, 21 Jul 2022 19:33:58 +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 26LJXwvD078472; Thu, 21 Jul 2022 19:33:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LJXwUg078471; Thu, 21 Jul 2022 19:33:58 GMT (envelope-from git) Date: Thu, 21 Jul 2022 19:33:58 GMT Message-Id: <202207211933.26LJXwUg078471@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: 519bbdf87289 - main - emulators/libretro-pcsx2: Fix i386 build on 13.1-RELEASE 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: 519bbdf872890996d158a7a4e82e7682ae60bc32 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658432038; 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=dWFNNC1TieQLaKnTzFMDCMT89qXPwijSum4fFwQvkCI=; b=ivCeOx+x8KWkxU4ZHXofKILStOWnefPJzn6UpXZdeb0AtAPz0NPhSKXCHbTwdEsx2BDVM+ 7zMyGvqvZsCXZd17wBu/2LHqpSJB7B6SwaQ8L3teSb5vhpnGf+kuNYyM5xIw3Nlx0PAlIa /hsIqH1enFOKPp0g7vsb9HXh6c0vVQHtYGAxC/PvlfJbyYaMSxJcJRKgVWUfnMUNZ9aeLK Av4BUuo/ZR12okViYcHfWio38eYeK+Lz5x1jzZlJDIt8gJO9B1X0xmUWapowTRp2A1JjJW xJEHn+EweJkW2TNxQBEgn/1P94NJe24opoyMEp7a08Go3c1ShZtQHWa/64bufA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658432038; a=rsa-sha256; cv=none; b=q0Li+oIziYyl7LChkUblzNxAUKp+YqfaIVTU1K1cFWdcy58VfKTeko6yupiuf3gtN7yzH/ SeSIL5Vkws2zElWvvDk4Xx3ZL12zdr+hqjO5eN22njHl3q/uV/VI1XdxusCGTNymvu6FeS wIx8D5tSCdXxKLw/tMveD/Sy549e6vZ6U418a+TEZKqKfEP+3zbKlgbHAEomqHSumw9VAG KMiUA0b6NJUxUJaaCuGvuxSYue5nHeKbjlVNaYy3BFCZ9M0RttA9hz9xzCQI0YGd94fL2p htYL+869vMwLqNkbavZH9UUX0hEv32quqeigqwdJYe5aWiRM49bISnKd77sYNw== 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=519bbdf872890996d158a7a4e82e7682ae60bc32 commit 519bbdf872890996d158a7a4e82e7682ae60bc32 Author: Timothy Beyer AuthorDate: 2022-07-21 19:31:21 +0000 Commit: Li-Wen Hsu CommitDate: 2022-07-21 19:31:21 +0000 emulators/libretro-pcsx2: Fix i386 build on 13.1-RELEASE PR: 265185 --- emulators/libretro-pcsx2/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/emulators/libretro-pcsx2/Makefile b/emulators/libretro-pcsx2/Makefile index aad056700c85..4eed8335cfa2 100644 --- a/emulators/libretro-pcsx2/Makefile +++ b/emulators/libretro-pcsx2/Makefile @@ -1,6 +1,6 @@ PORTNAME= libretro-pcsx2 PORTVERSION= 0.20201030 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators games MAINTAINER= beyert@cs.ucr.edu @@ -22,12 +22,11 @@ USES= cmake compiler:c++11-lib .include CPPFLAGS+= -I${LOCALBASE}/include/wx-3.0 -USE_CXXSTD= c++11 USE_LDCONFIG= yes CMAKE_CPP_FLAGS= ${CPPFLAGS} CMAKE_PREFIX_PATH= ${LOCALBASE}/include/wx-3.0 CMAKE_C_FLAGS= ${CFLAGS} -CMAKE_CXX_FLAGS= ${CFLAGS} +CMAKE_CXX_FLAGS= ${CXXFLAGS} CMAKE_ARGS+= -DLIBRETRO=yes CMAKE_ARGS+= -Dgtk_INCLUDE_DIR="${LOCALBASE}/include/gtk-3.0" \ -DwxWidgets_INCLUDE_DIRS="${LOCALBASE}/include/wx-3.0" @@ -51,6 +50,7 @@ PLIST_FILES= lib/libretro/pcsx2_libretro.so .if ${ARCH} == i386 LDFLAGS+= -Wl,-z,notext +CXXFLAGS+= -fPIC .endif post-patch: @@ -60,7 +60,6 @@ post-patch: @${REINPLACE_CMD} 's|-D_FILE_OFFSET_BITS=64|-D_FILE_OFFSET_BITS=32|' \ ${WRKSRC}/3rdparty/wxwidgets3.0/UsewxWidgets.cmake .endif -# filename.cpp first to have 2u @${REINPLACE_CMD} -e 's|\[0u\]|[0]|' -e 's|\[1u\]|[1]|' \ -e 's|\[2u\]|[2]|' \ ${WRKSRC}/3rdparty/wxwidgets3.0/include/wx/filename.h \