From nobody Mon Oct 23 01:56:05 2023 X-Original-To: dev-commits-ports-all@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 4SDJFK6tZkz4y7Mx; Mon, 23 Oct 2023 01:56:05 +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 4SDJFK65SSz4FHw; Mon, 23 Oct 2023 01:56:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698026165; 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=YvYDdx6sbAeXNqdRuEDnNLvSStkOgi7zz9tDzxIpOLw=; b=VuGMXRuIvHpWm4yiy1X/vFIq8nmvgvcsdAHL4b6Orh7zPBaWC37FeS9dwLVZeZInuwipPo X07WJ12bWQpaxeoZzFnV/WVjVdGbPpoRCMNJA+jjY2NRv+1FeXmZBXYDYAHeeEC1NYCzgk CBjNSVeEqVq+9hf2v0tWUWjVXoAHG5VQtcFP0xXwrz/B9rdiKP8Tw5S1BEIj5AWb63Ab99 CHzWPdWorOHjVQ/G6DIzPdSVErc69P6txQ+Jdqgf8oY9lyjAjViqhAUn2/Jz3e2X+WKZw2 ugToHAHHRiyc/1wk4EJJ0NeVVvtH+8wQ7WERfm8dn4UcqbQP7/NhY1XDaSAo+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698026165; a=rsa-sha256; cv=none; b=LaPEMRlzDqhEZp/QlHcXdHuBlUwI5K4IggOCrhtwR18WSmEEFpDlddzqnhw2Qu861/zOTy /sroUv2UxQjUq3q6tR94W6snl4RMPBYC4TTVMEt+QIjLUhrY8XDg6KuZaxQ2CACGUpkuVH NJNkXbzXe6EWNOJNVCsUaQ2RzdpXmY6Vcp9NllEhOC06Y5dqXpjgAMktJ6Yw9Qd6KQ6UJB cyn2ONjg6+kyNgf8sQlUmpFvHuQU9LwT725bpmkIMEKTIMowcVzFOqt5ZCnNC2hBeXMfpY L8OSPjGjCJk/BQiyUzOidVQia53j2ydq48QHuiFMWGgjZGqTssTrYykCRMuXmA== 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=1698026165; 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=YvYDdx6sbAeXNqdRuEDnNLvSStkOgi7zz9tDzxIpOLw=; b=Et9BGSIRqTA42DX5wIJiFI0SKg8GWnHigr/5yG7y6dYdc3BU317E8ZeA7Ww9YsJAzQhlqA YfnnQm86NwwP/XqzOtaribHFQOrWCuDgpkkXMzApNhSambO+H4urUDz4hiigTuqK1NQPOO weoVXilT/Y9ayt4SY+gpb4GhFGYEdFORCN06e8ER6KIlmXMTq6LHhUlAelg/2wfisj9JNf 9cBNXZA3KnhLhhGZalAOg6hcprJULUuZ46cwtQ7eiGSAxWbVnXWF4DmtnQ4DYyqWlF3Jrt S8u2xOrEE5P6gqK50Bq5C9l/tq1ei2WclGLPczx0Mv7V0IecB1mKGA9tzgZePA== 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 4SDJFK55Yjz6V1; Mon, 23 Oct 2023 01:56:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39N1u5nE014315; Mon, 23 Oct 2023 01:56:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39N1u54v014312; Mon, 23 Oct 2023 01:56:05 GMT (envelope-from git) Date: Mon, 23 Oct 2023 01:56:05 GMT Message-Id: <202310230156.39N1u54v014312@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 9ed3ba96d38f - 2023Q4 - games/jaggedalliance2: unbreak i386 build on fbsd 14+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 9ed3ba96d38f41419700c1e19534523256020610 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ed3ba96d38f41419700c1e19534523256020610 commit 9ed3ba96d38f41419700c1e19534523256020610 Author: Pavel Timofeev AuthorDate: 2023-10-19 20:45:54 +0000 Commit: Robert Clausecker CommitDate: 2023-10-23 01:55:42 +0000 games/jaggedalliance2: unbreak i386 build on fbsd 14+ - unbreak i386 build on fbsd 14+ - remove unnecessary lua version hardcode - bump port revision PR: 274601 MFH: 2023Q4 (cherry picked from commit 79f74ed60e1aa1a08f983af1f72204d7c8929d8a) --- games/jaggedalliance2/Makefile | 17 ++++------------- .../files/patch-dependencies_lib-lua_CMakeLists.txt | 11 ----------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile index 2900c48ee3c2..c0d021a4616f 100644 --- a/games/jaggedalliance2/Makefile +++ b/games/jaggedalliance2/Makefile @@ -1,7 +1,7 @@ PORTNAME= ja2 DISTVERSIONPREFIX= v DISTVERSION= 0.20.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MAINTAINER= timp87@gmail.com @@ -25,7 +25,7 @@ BUILD_DEPENDS= string_theory>=3.1:devel/string_theory \ miniaudio>=0.11.9:audio/miniaudio LIB_DEPENDS= libfltk.so:x11-toolkits/fltk -USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53 +USES= cargo cmake compiler:c++17-lang pkgconfig sdl xorg gl lua:53+ USE_GITHUB= yes GH_ACCOUNT= ja2-stracciatella GH_PROJECT= ja2-stracciatella @@ -176,17 +176,8 @@ post-install: .include -# Compilation with clang's broken in 14-CURRENT -.if ${OSVERSION} >= 1400000 -# See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=236344 -# Copy-pasted gcc-c++11-lib from Mk/Uses/compiler.mk -USE_GCC= yes -CHOSEN_COMPILER_TYPE= gcc -CXXFLAGS+= -nostdinc++ -isystem /usr/include/c++/v1 -LDFLAGS+= -L${WRKDIR} -_USES_configure+= 200:gcc-libc++-configure -gcc-libc++-configure: - @${LN} -fs /usr/lib/libc++.so ${WRKDIR}/libstdc++.so +.if ${OSVERSION} >= 1400000 && ${ARCH} == "i386" +CXXFLAGS+= -Wno-error=enum-constexpr-conversion .endif .include diff --git a/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt b/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt deleted file mode 100644 index 6f12a6ce12ba..000000000000 --- a/games/jaggedalliance2/files/patch-dependencies_lib-lua_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- dependencies/lib-lua/CMakeLists.txt.orig 2023-01-25 17:13:43 UTC -+++ dependencies/lib-lua/CMakeLists.txt -@@ -3,7 +3,7 @@ - option(LOCAL_LUA_LIB "Download and build Lua instead of searching the system" ON) - if (NOT LOCAL_LUA_LIB) - message(STATUS "Using system Lua") -- find_package(Lua "5.3" REQUIRED) -+ find_package(Lua "5.3" REQUIRED EXACT) - if (NOT LUA_FOUND) - message(FATAL_ERROR "Lua 5.3 not found") - endif()