From nobody Wed Apr 05 18:49:09 2023 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 4PsDF14Bhmz440Tx; Wed, 5 Apr 2023 18:49:09 +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 4PsDF13fr0z49d0; Wed, 5 Apr 2023 18:49:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680720549; 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=wpiVKzeLZ3DC1iwdtyoBScp5eMHAfl6ONuZQtFfN70w=; b=fAjOgXNUVWo/LHUO7zAPzhi1/G59N8PFEN1d0eSQ/JQVli9uRRXXsaExb4ieWnrBi6RYG7 yui5BA3cN/HzUcMebVNzKGtrjc4h4eXewyTCJVy1c5omAYnUhlqHY9Jy/9aOu/mKH5MuLV zsPEFjfKkpMR8FyNpJNQPSSodUiy9Nak5GcbBpztStVvb8C9u30dirC7XUR0OzPAeMZ2QC 4V0Zh5QmkyQ2ox9Hug+nzcHl2+Nt64sDKLtWdRdMu+Xb8g1uGfyVJP+TIteFH8q2vCNDDw HOI7+JOwoBeAIy9qqY+w3HCdGBfBe7NW7LapJ/+8bwC53ikvzACt+Td0ZcZzPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680720549; 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=wpiVKzeLZ3DC1iwdtyoBScp5eMHAfl6ONuZQtFfN70w=; b=vjC7Svdt/LErLgPjfZIZfNRRsQNyRFb5uoTgdtsQVTQQXbOkCDsQBl5+CrBgGrXJfPi+aE uR1iB6rCkmeE/JihzGChpPNO3yGiNvUXrBdTFvL/YfFsvLfQWiM5GKWNpEdPP+atwgFJSC CeBFrggyse40uQa25PW0UzVIB019CjzZZB4wlfLs4mpLU2o51sBA4NBblBIGHvwT6cGu+F IXFQPCxfMrwVBhaQdo1JVr7ZAvwXLcYtb3UidVU9Z8WbF1/lDwHUenlSlHqxB9UWacee8a IPV0aYTD6E8DqwK9FdpZHL7PGU1TgVULd90aKkEEYEPhhGNlcAzaLXbeg27gNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680720549; a=rsa-sha256; cv=none; b=ErogqtBN6viTdTlXPulDhg48NGpt4aH3Zr83WCeTD77cohVksQ1e+EfYIbY/EJxsEKIbqM bbjt+8Pl2fR/uQ0dxBE6I9C/w6aAmH9hpnFkWehWHEJ1DkgYz3zlWLWDxq1TR6YF65PDt9 KU11lfKQ+kRcw6NouVPIjw+lFVVmfxhLe+gEuftvQN7rYNcXPwPrCF4fM09V42lugjRIIv A56VE5qlqLyrOSSLnWyW/MOBsTvwY/y5Cq78BEllIasoo+FhbO4rAgbrZkqA+ICGp3lj9q xeDpNUB9bCcBKrg5cCcWnIEKAaMVZ+joCkhwmkuO1YLGeYP1/Fi8TOYKHbJCgQ== 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 4PsDF127M5zZ1p; Wed, 5 Apr 2023 18:49:09 +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 335In9Ol012275; Wed, 5 Apr 2023 18:49:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335In9DB012274; Wed, 5 Apr 2023 18:49:09 GMT (envelope-from git) Date: Wed, 5 Apr 2023 18:49:09 GMT Message-Id: <202304051849.335In9DB012274@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: dfec9690ef5f - main - =?utf-8?Q?games/freeorion:=20update=200.4.10.2=20=E2=86=92=200.5?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfec9690ef5f049c9fda040a396f09c1a63a7509 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfec9690ef5f049c9fda040a396f09c1a63a7509 commit dfec9690ef5f049c9fda040a396f09c1a63a7509 Author: Dmitry Marakasov AuthorDate: 2023-04-03 20:41:36 +0000 Commit: Dmitry Marakasov CommitDate: 2023-04-05 18:48:43 +0000 games/freeorion: update 0.4.10.2 → 0.5 --- games/freeorion/Makefile | 19 ++++++++-------- games/freeorion/distinfo | 6 ++--- .../files/patch-cmake_make__versioncpp.py | 26 ++++++++++++++-------- games/freeorion/pkg-plist | 21 ++++++++--------- 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/games/freeorion/Makefile b/games/freeorion/Makefile index ee7fa955e44c..b35369573a62 100644 --- a/games/freeorion/Makefile +++ b/games/freeorion/Makefile @@ -1,7 +1,6 @@ PORTNAME= freeorion DISTVERSIONPREFIX= v -DISTVERSION= 0.4.10.2 -PORTREVISION= 3 +DISTVERSION= 0.5 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -16,7 +15,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ USE_GITHUB= yes -USES= cmake compiler:c++14-lang python:3.8+ +USES= cmake compiler:c++17-lang python:3.8+ CMAKE_ARGS= -Wno-dev LDFLAGS_i386= -Wl,-znotext @@ -24,19 +23,19 @@ LDFLAGS_i386= -Wl,-znotext PORTDOCS= ChangeLog.md README.md PORTDATA= * -OPTIONS_DEFINE= DOCS TEST HEADLESS +OPTIONS_DEFINE= DOCS TEST CLIENT_GG +OPTIONS_DEFAULT=DOCS TEST CLIENT_GG OPTIONS_SUB= yes TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= unittest TEST_USES= localbase -HEADLESS_DESC= Build only headless components: server and AI -HEADLESS_CMAKE_BOOL= BUILD_HEADLESS -HEADLESS_USES_OFF= gl openal sdl -HEADLESS_USE_OFF= SDL=sdl2 GL=gl,glu,glew -HEADLESS_LIB_DEPENDS_OFF= \ - libfreetype.so:print/freetype2 \ +CLIENT_GG_DESC= Build GiGi client +CLIENT_GG_CMAKE_BOOL= BUILD_CLIENT_GG +CLIENT_GG_USES= gl openal sdl +CLIENT_GG_USE= SDL=sdl2 GL=gl,glu,glew +CLIENT_GG_LIB_DEPENDS= libfreetype.so:print/freetype2 \ libogg.so:audio/libogg \ libvorbis.so:audio/libvorbis \ libpng.so:graphics/png diff --git a/games/freeorion/distinfo b/games/freeorion/distinfo index f8d71d452ac2..3ac89b0f2932 100644 --- a/games/freeorion/distinfo +++ b/games/freeorion/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629828016 -SHA256 (freeorion-freeorion-v0.4.10.2_GH0.tar.gz) = 8c3bd4dcae7e2b160361b88f9a97cdb62b5c7413675acc15774054878228e709 -SIZE (freeorion-freeorion-v0.4.10.2_GH0.tar.gz) = 124720711 +TIMESTAMP = 1680518770 +SHA256 (freeorion-freeorion-v0.5_GH0.tar.gz) = b95667957047e02cf4bf4b230bf3ad02edbeffff6be600cc38a62cb115adb10c +SIZE (freeorion-freeorion-v0.5_GH0.tar.gz) = 154593192 diff --git a/games/freeorion/files/patch-cmake_make__versioncpp.py b/games/freeorion/files/patch-cmake_make__versioncpp.py index 3a496b0c0c85..c094ae07b028 100644 --- a/games/freeorion/files/patch-cmake_make__versioncpp.py +++ b/games/freeorion/files/patch-cmake_make__versioncpp.py @@ -1,21 +1,29 @@ ---- cmake/make_versioncpp.py.orig 2020-09-25 11:06:39 UTC +--- cmake/make_versioncpp.py.orig 2023-03-21 15:16:58 UTC +++ cmake/make_versioncpp.py -@@ -127,18 +127,6 @@ version = "0.4.10.1" - branch = "" +@@ -136,26 +136,6 @@ branch = "" build_no = INVALID_BUILD_NO + version_file_name = version -try: -- branch = check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], universal_newlines=True).strip() -- if (branch == "master") or (branch[:7] == "release"): +- branch = check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"], text=True).strip() +- if (branch == "master") or (branch == "weekly-test-builds") or (branch[:7] == "release"): - branch = "" - else: - branch += " " -- commit = check_output(["git", "show", "--no-show-signature", "-s", "--format=%h", "--abbrev=7", "HEAD"], universal_newlines=True).strip() -- timestamp = float(check_output(["git", "show", "--no-show-signature", "-s", "--format=%ct", "HEAD"], universal_newlines=True).strip()) +- commit = check_output( +- ["git", "show", "--no-show-signature", "-s", "--format=%h", "--abbrev=7", "HEAD"], text=True +- ).strip() +- timestamp = float( +- check_output(["git", "show", "--no-show-signature", "-s", "--format=%ct", "HEAD"], text=True).strip() +- ) - build_no = ".".join([datetime.utcfromtimestamp(timestamp).strftime("%Y-%m-%d"), commit]) --except (IOError, CalledProcessError): +- if branch[:7] == "release": +- version_file_name = "v" + version +- else: +- version_file_name = build_no + "_Test" +-except (OSError, CalledProcessError): - print("WARNING: git not installed or not setup correctly") - for generator in generators: - generator.execute(version, branch, build_no, build_sys) + generator.execute(version, branch, build_no, build_sys, version_file_name) diff --git a/games/freeorion/pkg-plist b/games/freeorion/pkg-plist index 69ac63fb727f..a08ca241213e 100644 --- a/games/freeorion/pkg-plist +++ b/games/freeorion/pkg-plist @@ -1,17 +1,17 @@ -%%NO_HEADLESS%%bin/freeorion +%%CLIENT_GG%%bin/freeorion bin/freeorionca bin/freeoriond -%%NO_HEADLESS%%lib/freeorion/libGiGi.so +%%CLIENT_GG%%lib/freeorion/libGiGi.so lib/freeorion/libfreeorioncommon.so lib/freeorion/libfreeorionparse.so -%%NO_HEADLESS%%share/applications/org.freeorion.FreeOrion.desktop -%%NO_HEADLESS%%share/icons/hicolor/128x128/apps/freeorion.png -%%NO_HEADLESS%%share/icons/hicolor/16x16/apps/freeorion.png -%%NO_HEADLESS%%share/icons/hicolor/24x24/apps/freeorion.png -%%NO_HEADLESS%%share/icons/hicolor/256x256/apps/freeorion.png -%%NO_HEADLESS%%share/icons/hicolor/32x32/apps/freeorion.png -%%NO_HEADLESS%%share/icons/hicolor/64x64/apps/freeorion.png -%%NO_HEADLESS%%share/metainfo/org.freeorion.FreeOrion.metainfo.xml +%%CLIENT_GG%%share/applications/org.freeorion.FreeOrion.desktop +%%CLIENT_GG%%share/icons/hicolor/128x128/apps/freeorion.png +%%CLIENT_GG%%share/icons/hicolor/16x16/apps/freeorion.png +%%CLIENT_GG%%share/icons/hicolor/24x24/apps/freeorion.png +%%CLIENT_GG%%share/icons/hicolor/256x256/apps/freeorion.png +%%CLIENT_GG%%share/icons/hicolor/32x32/apps/freeorion.png +%%CLIENT_GG%%share/icons/hicolor/64x64/apps/freeorion.png +%%CLIENT_GG%%share/metainfo/org.freeorion.FreeOrion.metainfo.xml @dir %%DATADIR%%/default/data/sound/combat @dir %%DATADIR%%/default/data/art/stars_sidepanel @dir %%DATADIR%%/default/data/art/stars/old_stars @@ -36,6 +36,7 @@ lib/freeorion/libfreeorionparse.so @dir %%DATADIR%%/default/data/art/icons/sitrep @dir %%DATADIR%%/default/data/art/icons/ship_parts @dir %%DATADIR%%/default/data/art/icons/ship_hulls +@dir %%DATADIR%%/default/data/art/icons/policies @dir %%DATADIR%%/default/data/art/icons/planet @dir %%DATADIR%%/default/data/art/icons/monsters @dir %%DATADIR%%/default/data/art/icons/meter