From nobody Wed Jan 10 06:01:25 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 4T8xxx72nhz560pq; Wed, 10 Jan 2024 06:01:25 +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 4T8xxx6WRnz4Z7L; Wed, 10 Jan 2024 06:01:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704866485; 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=ZLwUcC30VzLM1ouUs0pLoxd15jEukekSLvGbBtrM5QU=; b=HnNN9yE3anQQxi5ff6TzThKhs6Hgrof+yt6oUZwoCZhP6Cp16EH9REpbrkFo3IAQT+3xos mUi8ZDbnQL8HoFB3M07fKWbQRpGItG1W6SDW4DWZ/kILyT+4lr1ayYrC3KBAQ6phqMIsXF QGN6fWjYiVWYTokY8t3XPTDCjAL2DbuiuHW9PyDfzGSPySV5N7H71Y4brW6NQ3QWkxnePX Yyqvxllju8Q/yZTWEtzcWNZ3UXKIkpoDRXCdCcDVwFt7VaO5XAN0YcS0SjNjwaK1i5gqX1 jq6WBAjzr4jmyR5k5h5BqAHYaIxc8fPKpIxCNh56nHNRJR8wX7e5+U1ZdsMGlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704866485; 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=ZLwUcC30VzLM1ouUs0pLoxd15jEukekSLvGbBtrM5QU=; b=HovJ7puH2rp1bbU6oGuDnLCV3LmYH31Px5ZOon8ln/42mg2cDVJrkrTQEn8zsuxzN625Zy /zJBkYkxQDek7PaXFR9uZbRP2BhuCtZTXl2tvElLhEft3f2RICbwEJpUmGjaqAbsPhSiVt Nll9vpa4oEt7YvgHfO6Mr4n4iuOp48E3IIsdUs0Gw7qdXkVDAgSkTau63PhSjw5sgXM75o b5nT0zmnjRaW0eGehKwoeMv6m0ySvxavn/PauGoEsKTbMK7agJoMuyvnxHI6ru7nwOHYPS pfugW4IDmoWEqLr2/z7KZkLjCQi4AKhSrSu6kL28jjkOvFhKBQ6ImjOQ7BBvuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704866485; a=rsa-sha256; cv=none; b=NLvNmifpAW2QDkeM86HzInn7HqDcWwOJn3VQIfwM+tJzV8IHqh5A8vevkLRAb6485JvABe pZNU8kcm4fxse8gtgX8pXgRgm2As7CtRFAhWLajqSfTiU3csbY655A4v83duJFhUUj6lgj l86ZmD4feAVnbMjCoE9liMw/Zz/g8ffYK9NaAGX00oNbiZU8c0EmvhVzFGzSFKubu0DpmD IFSyDUZwo9mKU5YEImTV3DwoJuMXFBk+wHcgZyX1BM9AaicCvzGzbQv0kWlVRx76iI0Dlu HsiSfqUoSLjsL8VL+zI7VzdGg+fwsz1oDU5k76ZrykLE7RcbYfPdu4HKpka8sA== 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 4T8xxx5c6TzNm6; Wed, 10 Jan 2024 06:01:25 +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 40A61PIo004365; Wed, 10 Jan 2024 06:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40A61PBS004362; Wed, 10 Jan 2024 06:01:25 GMT (envelope-from git) Date: Wed, 10 Jan 2024 06:01:25 GMT Message-Id: <202401100601.40A61PBS004362@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: dfed96fc83a0 - main - games/etlegacy: New port: a second breath of life for Wolfenstein: Enemy Territory 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: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfed96fc83a0cc9274832afa510789ee8cf5ad37 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfed96fc83a0cc9274832afa510789ee8cf5ad37 commit dfed96fc83a0cc9274832afa510789ee8cf5ad37 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-01-10 05:57:46 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-01-10 05:57:46 +0000 games/etlegacy: New port: a second breath of life for Wolfenstein: Enemy Territory ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3. There are two aspects to this project: - An updated game engine, ET: Legacy, which aims to fix bugs and security exploits, remove old dependencies, add useful features and modernize its graphics while still remaining compatible with ET 2.60b and as many of its mods as possible. - A new mod, Legacy, which aims to add many useful features and improvements while staying close to the original gameplay, as well as being lightweight and extensible through Lua scripts. --- games/Makefile | 1 + games/etlegacy/Makefile | 75 ++++++++++++ games/etlegacy/distinfo | 7 ++ .../files/patch-cmake_ETLInstallGeoIP.cmake | 18 +++ .../files/patch-cmake_ETLInstallWolfAdmin.cmake | 18 +++ games/etlegacy/files/patch-cmake_ETLVersion.cmake | 18 +++ .../files/patch-src_renderercommon_tr__font.c | 11 ++ games/etlegacy/files/pkg-message.in | 16 +++ games/etlegacy/pkg-descr | 13 ++ games/etlegacy/pkg-plist | 132 +++++++++++++++++++++ 10 files changed, 309 insertions(+) diff --git a/games/Makefile b/games/Makefile index dc50fd87e107..b6af0d814315 100644 --- a/games/Makefile +++ b/games/Makefile @@ -241,6 +241,7 @@ SUBDIR += entombed SUBDIR += enygma SUBDIR += epiphany-game + SUBDIR += etlegacy SUBDIR += etracer SUBDIR += euchre SUBDIR += eureka diff --git a/games/etlegacy/Makefile b/games/etlegacy/Makefile new file mode 100644 index 000000000000..2a4d2ba35f4a --- /dev/null +++ b/games/etlegacy/Makefile @@ -0,0 +1,75 @@ +PORTNAME= etlegacy +DISTVERSION= 2.81.1 +CATEGORIES= games +MASTER_SITES= https://mirror.etlegacy.com/geoip/:geoip \ + https://mirror.etlegacy.com/wolfadmin/:wolfadmin +DISTFILES= wolfadmin.tar.gz:wolfadmin \ + GeoIP.dat.tar.gz:geoip +DIST_SUBDIR= ${PORTNAME}-${DISTVERSION} +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} + +MAINTAINER= acm@FreeBSD.org +COMMENT= a second breath of life for Wolfenstein: Enemy Territory +WWW= https://www.etlegacy.com/ + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING.txt + +USES= cmake compiler:c++11-lib desktop-file-utils localbase \ + lua pkgconfig sqlite +USE_CXXSTD= c++11 +USE_GITHUB= yes +GH_TAGNAME= 956269f4c13ebe31ba2a0f0b805588383209bd5b + +CMAKE_ARGS+= -DCROSS_COMPILE32=OFF \ + -DBUNDLED_LIBS=OFF \ + -DBUNDLED_LIBS_DEFAULT=OFF \ + -DCLIENT_GLVND=ON \ + -DFEATURE_RENDERER2=OFF \ + -DENABLE_SSE=ON \ + -DFEATURE_AUTOUPDATE=OFF \ + -DINSTALL_DEFAULT_BASEDIR=${PREFIX}/lib/${PORTNAME} + +OPTIONS_DEFAULT= CLIENT DEDICATED +OPTIONS_MULTI= FLAVOR +OPTIONS_MULTI_FLAVOR= CLIENT DEDICATED +OPTIONS_SUB= yes + +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server + +CLIENT_LIB_DEPENDS= libcurl.so:ftp/curl \ + libcjson.so:devel/libcjson \ + libfreetype.so:print/freetype2 \ + libogg.so:audio/libogg \ + libpng.so:graphics/png \ + libvorbis.so:audio/libvorbis \ + libtheora.so:multimedia/libtheora +CLIENT_USES= gl jpeg openal:soft,alut minizip sdl xorg +CLIENT_USE= GL=gl,glu,glew SDL=sdl2 XORG=x11,xxf86dga,xxf86vm + +SUB_FILES= pkg-message + +.include + +.if ${ARCH} == "i386" +PLIST_SUB+= I386="" \ + AMD64="@comment " +.elif ${ARCH} == "amd64" +PLIST_SUB+= I386="@comment " \ + AMD64="" +.endif + +.if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MDEDICATED} +CMAKE_ARGS+= -DBUILD_CLIENT=OFF +.endif + +post-extract: + @${MKDIR} ${WRKDIR}/.build/legacy + @cd ${WRKDIR}/.build/legacy && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/GeoIP.dat.tar.gz ${EXTRACT_AFTER_ARGS} + @cd ${WRKDIR}/.build/legacy && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/wolfadmin.tar.gz ${EXTRACT_AFTER_ARGS} + +post-patch: + ${REINPLACE_CMD} -e 's|AMD64|amd64|g' ${WRKSRC}/cmake/ETLPlatform.cmake + +.include diff --git a/games/etlegacy/distinfo b/games/etlegacy/distinfo new file mode 100644 index 000000000000..b0173022a741 --- /dev/null +++ b/games/etlegacy/distinfo @@ -0,0 +1,7 @@ +TIMESTAMP = 1704840749 +SHA256 (etlegacy-2.81.1/wolfadmin.tar.gz) = 31659b1d99cd5c9884a66317f803109e631a315e1102842e4e4d29b8579397d1 +SIZE (etlegacy-2.81.1/wolfadmin.tar.gz) = 1128868 +SHA256 (etlegacy-2.81.1/GeoIP.dat.tar.gz) = 1aa7023f599d01fce77861ff331d1024cd92918edf527c2f37f4a37732183a2b +SIZE (etlegacy-2.81.1/GeoIP.dat.tar.gz) = 1120171 +SHA256 (etlegacy-2.81.1/etlegacy-etlegacy-2.81.1-956269f4c13ebe31ba2a0f0b805588383209bd5b_GH0.tar.gz) = 1863d4bcc5352be89069189e96a27260a930af09c12765b3499a5d975fa1b31a +SIZE (etlegacy-2.81.1/etlegacy-etlegacy-2.81.1-956269f4c13ebe31ba2a0f0b805588383209bd5b_GH0.tar.gz) = 15548868 diff --git a/games/etlegacy/files/patch-cmake_ETLInstallGeoIP.cmake b/games/etlegacy/files/patch-cmake_ETLInstallGeoIP.cmake new file mode 100644 index 000000000000..b5b51c16f59f --- /dev/null +++ b/games/etlegacy/files/patch-cmake_ETLInstallGeoIP.cmake @@ -0,0 +1,18 @@ +--- cmake/ETLInstallGeoIP.cmake.orig 2024-01-09 22:56:11 UTC ++++ cmake/ETLInstallGeoIP.cmake +@@ -7,6 +7,7 @@ set(ETLEGACY_GEOIP_ARCHIVE_URL "https://mirror.etlegac + set(ETLEGACY_GEOIP_ARCHIVE "GeoIP.dat.tar.gz") + set(ETLEGACY_GEOIP_ARCHIVE_URL "https://mirror.etlegacy.com/geoip/GeoIP.dat.tar.gz") + ++if(NOT CMAKE_SYSTEM MATCHES "FreeBSD") + LEG_DOWNLOAD( + "GeoIP archive" + "${ETLEGACY_GEOIP_ARCHIVE_URL}" +@@ -15,6 +16,7 @@ LEG_DOWNLOAD( + "${CMAKE_CURRENT_BINARY_DIR}/${MODNAME}" + "${CMAKE_CURRENT_BINARY_DIR}/${MODNAME}/GeoIP.dat" + ) ++endif() + + message(STATUS "Adding GeoIP to installer scripts") + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${MODNAME}/GeoIP.dat" diff --git a/games/etlegacy/files/patch-cmake_ETLInstallWolfAdmin.cmake b/games/etlegacy/files/patch-cmake_ETLInstallWolfAdmin.cmake new file mode 100644 index 000000000000..7d06621b7852 --- /dev/null +++ b/games/etlegacy/files/patch-cmake_ETLInstallWolfAdmin.cmake @@ -0,0 +1,18 @@ +--- cmake/ETLInstallWolfAdmin.cmake.orig 2024-01-09 22:56:24 UTC ++++ cmake/ETLInstallWolfAdmin.cmake +@@ -7,6 +7,7 @@ set(ETLEGACY_WOLFADMIN_ARCHIVE_URL "https://mirror.etl + set(ETLEGACY_WOLFADMIN_ARCHIVE "wolfadmin.tar.gz") + set(ETLEGACY_WOLFADMIN_ARCHIVE_URL "https://mirror.etlegacy.com/wolfadmin/wolfadmin.tar.gz") + ++if(NOT CMAKE_SYSTEM MATCHES "FreeBSD") + LEG_DOWNLOAD( + "WolfAdmin archive" + "${ETLEGACY_WOLFADMIN_ARCHIVE_URL}" +@@ -15,6 +16,7 @@ LEG_DOWNLOAD( + "${CMAKE_CURRENT_BINARY_DIR}/${MODNAME}" + "${CMAKE_CURRENT_BINARY_DIR}/${MODNAME}/wolfadmin" + ) ++endif() + + file(COPY "${CMAKE_CURRENT_BINARY_DIR}/${MODNAME}/wolfadmin/luascripts" + DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${MODNAME}" diff --git a/games/etlegacy/files/patch-cmake_ETLVersion.cmake b/games/etlegacy/files/patch-cmake_ETLVersion.cmake new file mode 100644 index 000000000000..f2f61a6e6a39 --- /dev/null +++ b/games/etlegacy/files/patch-cmake_ETLVersion.cmake @@ -0,0 +1,18 @@ +--- cmake/ETLVersion.cmake.orig 2024-01-09 22:59:31 UTC ++++ cmake/ETLVersion.cmake +@@ -97,6 +97,7 @@ endmacro(GENERATENUMBER) + endmacro(GENERATENUMBER) + + ++if(NOT CMAKE_SYSTEM MATCHES "FreeBSD") + execute_process(COMMAND git describe --abbrev=7 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_STRIP_TRAILING_WHITESPACE +@@ -105,6 +106,7 @@ execute_process(COMMAND git describe --abbrev=0 + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + OUTPUT_STRIP_TRAILING_WHITESPACE + OUTPUT_VARIABLE GIT_DESCRIBE_TAG) ++endif() + + if(GIT_DESCRIBE) + set(ETL_CMAKE_VERSION ${GIT_DESCRIBE}) diff --git a/games/etlegacy/files/patch-src_renderercommon_tr__font.c b/games/etlegacy/files/patch-src_renderercommon_tr__font.c new file mode 100644 index 000000000000..aa3e8a2814f8 --- /dev/null +++ b/games/etlegacy/files/patch-src_renderercommon_tr__font.c @@ -0,0 +1,11 @@ +--- src/renderercommon/tr_font.c.orig 2024-01-10 04:52:35 UTC ++++ src/renderercommon/tr_font.c +@@ -202,7 +202,7 @@ static glyphInfo_t *RE_ConstructGlyphInfo(int imageSiz + + rc = FT_Load_Glyph(face, index, flags); + +- if (rc) ++ if (rc != 0) + { + Ren_Warning("RE_ConstructGlyphInfo: cannot load a glyph into the glyph slot of a face object.\n"); + return &glyph; // nothing to render diff --git a/games/etlegacy/files/pkg-message.in b/games/etlegacy/files/pkg-message.in new file mode 100644 index 000000000000..4137a3e7a15c --- /dev/null +++ b/games/etlegacy/files/pkg-message.in @@ -0,0 +1,16 @@ +{ type: install + message: <