From nobody Thu Aug 04 15:20:11 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 4LzC8W715wz4Y5xH; Thu, 4 Aug 2022 15:20:11 +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 4LzC8W6VL9z3NFL; Thu, 4 Aug 2022 15:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659626411; 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=8XuyRhf0sXGNuMlqKYEHqzNKivhVqnvYQO5y1rEqpuE=; b=uL6U6FKKAEt7zEsWXaFyBMLcwcvQhFlIrR49T0fp9U3Tk0RWJKmAo67vPrPjrptFv1zOAI uHyVvkxwSsSt6B2gYLLqwqyBYOAMxdidNdGVSPTYeJXf77bFqhTzmtbr7Q9tICvqAgCTRN wknuFDki2qzxDrst7D3e5oSJ9AJosGdRKnbkRrHexa1Yt0ixeoZKg5yHwqA6iFy3eSGmfF lF8NOXXpLQjAKBu0BZbDctMDJQo1CTkZipX2gKRJPTFu7HUcKOfLyL9x8UhsHF+aii17fZ sKQ6F1nvqYgonPBOAi+RN637gDWj68J2m32KZKr8J7j49+FVBbeGDTYWCWZt4w== 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 4LzC8W5XyKzJv2; Thu, 4 Aug 2022 15:20:11 +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 274FKBon068845; Thu, 4 Aug 2022 15:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 274FKBmj068837; Thu, 4 Aug 2022 15:20:11 GMT (envelope-from git) Date: Thu, 4 Aug 2022 15:20:11 GMT Message-Id: <202208041520.274FKBmj068837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 86981fc16ddf - main - games/vanilla-conquer: new port had been added (+) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86981fc16ddf963a064beccc9bc553af092c9cb5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659626411; 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=8XuyRhf0sXGNuMlqKYEHqzNKivhVqnvYQO5y1rEqpuE=; b=GATl5XopJS2O82x+P5MtBF9oe1v2PAaonJdBP177P+A3gw1moPZv/uDqP8/D/RTakcs3wx UO+T4bVuD12Vr3zyF8sIm6tfGT3vY7Bicqj3zSTfadv8B8q6RqVK4/0rY0W6TVtFhvB/ae hffVBlAehE/yU3fVUkF0sqQ140eBvft8xbSjqkYv99uTjTtE8MC1EL51Fyy82E3UmMsRUD 1IW6FnZptkoeR+pO0EmaRlGzXpHFDXgUiuGXbEvFt6hfMm3Rfi13zthBpQvQu7jrpGnmOB kcxno67ruyPf8vgj2T61LOmYUj0jK78TC4gUOu30M/RzO5sxsEMzmyl6kVsZfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659626411; a=rsa-sha256; cv=none; b=tek6xvgRhPuJTE4Bkvng58khrOQbaLmkZ7oR9F1zef6VKFPdM0yQ0mJ76lp8wm49dPSmA5 zBC9VMv52iaE6WKk4ImSUT+CcoMUhcaX7oUwTtj0j53YPkzGueDFVxyyMVmTAvuuSkk786 12/d9fM44+3X/5wq8iDQMClWgzIcSu11Q8a5LOU8s5opn/F5Ozw4WFo5WQ8wUaMdIwmAcX bmSrB5k489tnQAt8yO3w3mvWDHegKQDXHtBuDUvDJ0mlVIIvFwGy7KWSJEHrOgyipfeJRS Aq0NBt9vKuab8WM7+EM+CbMRbLzkBMX5sXRhUGWyh56m+ANLrW1dpzXTKhpadQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=86981fc16ddf963a064beccc9bc553af092c9cb5 commit 86981fc16ddf963a064beccc9bc553af092c9cb5 Author: Alexey Dokuchaev AuthorDate: 2022-08-04 15:18:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-08-04 15:18:52 +0000 games/vanilla-conquer: new port had been added (+) Vanilla Conquer is a fully portable version of the first generation C&C engine and is capable of running both Tiberian Dawn and Red Alert on multiple platforms. WWW: https://github.com/TheAssemblyArmada/Vanilla-Conquer --- games/Makefile | 1 + games/vanilla-conquer/Makefile | 54 ++++++++++++++++++++++ games/vanilla-conquer/distinfo | 5 ++ .../files/patch-cmake_GitWatcher.cmake | 26 +++++++++++ .../files/patch-common_CMakeLists.txt | 15 ++++++ .../vanilla-conquer/files/patch-common_wspudp.cpp | 10 ++++ games/vanilla-conquer/pkg-descr | 11 +++++ 7 files changed, 122 insertions(+) diff --git a/games/Makefile b/games/Makefile index 57d259eb174f..b347c8342d44 100644 --- a/games/Makefile +++ b/games/Makefile @@ -1009,6 +1009,7 @@ SUBDIR += urbanterror-data SUBDIR += valyriatear SUBDIR += vamos + SUBDIR += vanilla-conquer SUBDIR += vavoom SUBDIR += vavoom-extras SUBDIR += vectoroids diff --git a/games/vanilla-conquer/Makefile b/games/vanilla-conquer/Makefile new file mode 100644 index 000000000000..bd45f56d7c41 --- /dev/null +++ b/games/vanilla-conquer/Makefile @@ -0,0 +1,54 @@ +PORTNAME= ${GH_PROJECT:tl} +PORTVERSION= g20220804 +CATEGORIES= games + +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES= f1a415ebe08c01ccf317.patch:-p1 + +MAINTAINER= danfe@FreeBSD.org +COMMENT= Portable version of the original C&C engine + +LICENSE= GPLv3+ + +USE_GITHUB= yes +GH_ACCOUNT= TheAssemblyArmada +GH_PROJECT= Vanilla-Conquer +GH_TAGNAME= 8fb1a09 + +USES= cmake openal sdl +USE_SDL= sdl2 +CMAKE_ON= BUILD_TOOLS +CONFIGURE_ENV= GIT_HEAD_SHA1=8fb1a09c91bd64fe599d4f15bd7fe3cdffd00707 \ + GIT_HEAD_SHORT_SHA1=${GH_TAGNAME} \ + GIT_COMMIT_DATE_ISO8601=${_GET_DATE:sh} \ + GIT_AUTHOR_NAME=\ GIT_TAG=latest \ + GIT_COMMIT_TSTAMP=${_GET_TSTAMP:sh} GIT_IS_DIRTY=true \ + GIT_RETRIEVED_STATE=true GIT_REV_LIST_COUNT=802 +LDFLAGS_i386= -fuse-ld=bfd + +PLIST_FILES= bin/vanillamix bin/vanillara bin/vanillatd \ + share/icons/hicolor/scalable/apps/vanillara_icon.svg \ + share/icons/hicolor/scalable/apps/vanillatd_icon.svg + +.include + +.if ${ARCH} == i386 +BUILD_DEPENDS+= ld.bfd:devel/binutils +.endif + +post-patch: + @${REINPLACE_CMD} -e '/Obfuscate/s,long,unsigned,' \ + ${WRKSRC}/tiberiandawn/function.h \ + ${WRKSRC}/tiberiandawn/init.cpp + +do-install: + ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/vanilla* \ + ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + ${INSTALL_DATA} ${WRKSRC}/resources/*.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps + +.include + +_GET_DATE= TZ= ${STAT} -f %Sm -t %FT%TZ ${WRKSRC}/.gitignore +_GET_TSTAMP= TZ= ${STAT} -f %m ${WRKSRC}/.gitignore diff --git a/games/vanilla-conquer/distinfo b/games/vanilla-conquer/distinfo new file mode 100644 index 000000000000..0f953e88d6b1 --- /dev/null +++ b/games/vanilla-conquer/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1659612087 +SHA256 (TheAssemblyArmada-Vanilla-Conquer-g20220804-8fb1a09_GH0.tar.gz) = a3d56190973b18f87863f2f15e732040dac24d7391d0d6306cd1c9eeb1362787 +SIZE (TheAssemblyArmada-Vanilla-Conquer-g20220804-8fb1a09_GH0.tar.gz) = 3883264 +SHA256 (f1a415ebe08c01ccf317.patch) = f9063a3b558b6f04c253d0415efcdbbd7859155c5d096127f89db1711106d417 +SIZE (f1a415ebe08c01ccf317.patch) = 19376 diff --git a/games/vanilla-conquer/files/patch-cmake_GitWatcher.cmake b/games/vanilla-conquer/files/patch-cmake_GitWatcher.cmake new file mode 100644 index 000000000000..f4755f9e5a88 --- /dev/null +++ b/games/vanilla-conquer/files/patch-cmake_GitWatcher.cmake @@ -0,0 +1,26 @@ +--- cmake/GitWatcher.cmake.orig 2022-08-04 11:21:27 UTC ++++ cmake/GitWatcher.cmake +@@ -72,7 +72,7 @@ if(NOT DEFINED GIT_EXECUTABLE) + # Check the optional git variable. + # If it's not set, we'll try to find it using the CMake packaging system. + if(NOT DEFINED GIT_EXECUTABLE) +- find_package(Git QUIET REQUIRED) ++ find_package(Git) + endif() + CHECK_REQUIRED_VARIABLE(GIT_EXECUTABLE) + +@@ -326,5 +326,13 @@ endfunction() + endif() + endfunction() + ++# Archives fetched from GitHub lack Git metadata, just fill in the values ++# from the environment. ++function(NoGitBuild) ++ if(NOT EXISTS "${GIT_POST_CONFIGURE_FILE}") ++ GitStateChangedAction() ++ endif() ++endfunction() ++ + # And off we go... +-Main() ++NoGitBuild() diff --git a/games/vanilla-conquer/files/patch-common_CMakeLists.txt b/games/vanilla-conquer/files/patch-common_CMakeLists.txt new file mode 100644 index 000000000000..39b57004d2f0 --- /dev/null +++ b/games/vanilla-conquer/files/patch-common_CMakeLists.txt @@ -0,0 +1,15 @@ +--- common/CMakeLists.txt.orig 2022-08-04 11:21:27 UTC ++++ common/CMakeLists.txt +@@ -164,11 +164,9 @@ add_library(common STATIC ${COMMON_SRC} ${COMMON_HEADE + file(GLOB_RECURSE COMMON_HEADERS "*.h") + + add_library(common STATIC ${COMMON_SRC} ${COMMON_HEADERS}) +-target_link_libraries(common PUBLIC ${COMMON_LIBS}) ++target_link_libraries(common PUBLIC ${COMMON_LIBS} compat) + target_include_directories(common PUBLIC .) + target_compile_definitions(common PRIVATE FIXIT_FAST_LOAD $<$:_DEBUG>) +-# Make build check state of git to check for uncommitted changes. +-add_dependencies(common check_git) + + if(BUILD_REMASTERTD OR BUILD_REMASTERRA) + add_library(commonr STATIC ${COMMONR_SRC}) diff --git a/games/vanilla-conquer/files/patch-common_wspudp.cpp b/games/vanilla-conquer/files/patch-common_wspudp.cpp new file mode 100644 index 000000000000..6726b7d4e136 --- /dev/null +++ b/games/vanilla-conquer/files/patch-common_wspudp.cpp @@ -0,0 +1,10 @@ +--- common/wspudp.cpp.orig 2022-08-04 11:21:27 UTC ++++ common/wspudp.cpp +@@ -54,6 +54,7 @@ extern WWKeyboardClass* Keyboard; + #include + + #ifndef _WIN32 ++#include + #include + #endif + diff --git a/games/vanilla-conquer/pkg-descr b/games/vanilla-conquer/pkg-descr new file mode 100644 index 000000000000..70d464a94dbd --- /dev/null +++ b/games/vanilla-conquer/pkg-descr @@ -0,0 +1,11 @@ +Vanilla Conquer is a fully portable version of the first generation C&C +engine and is capable of running both Tiberian Dawn and Red Alert on +multiple platforms. It can also be used for mod development for the +Remastered Collection. + +The main focus of Vanilla Conquer is to keep the default out-of-box +experience faithful to what the games were back when they were released +and work as a drop-in replacement for the original executables while +also providing bug fixes, compatibility and quality of life improvements. + +WWW: https://github.com/TheAssemblyArmada/Vanilla-Conquer