From nobody Wed Dec 14 20:23:44 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 4NXRdr4X4Nz4kTpj; Wed, 14 Dec 2022 20:23:44 +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 4NXRdr3V3mz46L6; Wed, 14 Dec 2022 20:23:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671049424; 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=rN0NzrToQ/uyHrbhemCYn1yo3rHDD7wJUOPHAuljtp8=; b=u7qvKJNQLTrO7DjfAAHLnq+ZErI+Mz2P0XzfPWjvLKCdwI5/siQomdfpvGkxnim1L82NUs 5BSTYsSZIOsOXTP22/ElOaEjZi7CrOHNYNRgFJVvb1CDTDeqtli9W/VEhNvgrUSJMauIfN fxzrcv8AZvV6alNR7Fp6dAN0coiZAv8YmwPjMiPOzWGXoUbr9qcPaHBFer8Rc7VpyC4Ud7 LIGYKmincAS9QVSg3Ca/TBVou8kfYONV1reouaWAQ+O6lUn9Z6dA5Mm8yCVYr+HUeSAT5J +NyPcH0tlQbPhlPoIg0TzcZRiMUUatwUW6mLS3QnmN4Uf9+wJ7p6YSF5xcKqWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671049424; 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=rN0NzrToQ/uyHrbhemCYn1yo3rHDD7wJUOPHAuljtp8=; b=wrd5HAz1Cemdh+0WjeDbOKi4O5m2vtU+FWNxrdMAcN2yC5c8DT41CAIpA+aJ2UWXm7Aiat nPgAsGNuCO5z77twZvryRs5gs57DnsCOJCc1IeWJMJu0QXQ12SKlkq4ql43RrmyPWec+3l uNaBhuLXHEwaSF4/FglIo5mMRGBScsUu4RtL64L7oGNSTbZyBkUHIkTbNodSEj8/80K3OR yWOAD70HRV0AyU8pr4asurzv2lW9kxZ0s7/nb6h/dhgJS71ppFntpFWeVf3O5yIYRHVMMh uXJaA0/TAvGbbmBY1qmRwF8HWqgRK8ay+3kmt6LRiGhJMU+FoY7x5id88Q346g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671049424; a=rsa-sha256; cv=none; b=jKIHQRdqTTZU63qZtt6ul1WFq+o6xEoa9zz76Vk14rm/Np6nOQ1zLpmpha17wcE8TjUo3i ndyRfbdO19rVkavbgIUlGSCga+w+7SIMAiKs1n1oacxg4jhm/KPnkUvZ/7ZB6zhewklyfV seGf61AevX/zNQXnuyG25u0kwaHP4rYVSrR5KmtNZQW1u2KgIrdCHJz0dHSFx6n4Lpp6pN 0CWzroUA6U8lF6f3FU1xIBcBECBT5O1ffbuALSMmozrcaVrB6u2DGnzFddVKULUsYxxxcN rerAXgsNBxYTCHoEWEwkbSZUOo5tiuwU2Z7wLcdkmrPUyPHIc26U1Rz1gSJFug== 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 4NXRdr1wsBz16YB; Wed, 14 Dec 2022 20:23:44 +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 2BEKNimX093362; Wed, 14 Dec 2022 20:23:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BEKNiW6093361; Wed, 14 Dec 2022 20:23:44 GMT (envelope-from git) Date: Wed, 14 Dec 2022 20:23:44 GMT Message-Id: <202212142023.2BEKNiW6093361@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: 44d8b6613e68 - main - =?utf-8?Q?games/warzone2100:=20update=204.2.7=20=E2=86=92=204.3.2?= 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: 44d8b6613e6882669382f52432118ed889bbd5d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=44d8b6613e6882669382f52432118ed889bbd5d2 commit 44d8b6613e6882669382f52432118ed889bbd5d2 Author: Dmitry Marakasov AuthorDate: 2022-12-14 16:03:11 +0000 Commit: Dmitry Marakasov CommitDate: 2022-12-14 20:22:14 +0000 games/warzone2100: update 4.2.7 → 4.3.2 --- games/warzone2100/Makefile | 17 ++++++++++++----- games/warzone2100/distinfo | 6 +++--- games/warzone2100/files/patch-lib_sdl_CMakeLists.txt | 6 +++--- games/warzone2100/files/patch-lib_sound_CMakeLists.txt | 11 +++++++++++ games/warzone2100/files/patch-src_CMakeLists.txt | 12 ------------ games/warzone2100/pkg-plist | 6 +++--- 6 files changed, 32 insertions(+), 26 deletions(-) diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 254ce80b3f4f..01db1da6a937 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -1,5 +1,5 @@ PORTNAME= warzone2100 -PORTVERSION= 4.2.7 +PORTVERSION= 4.3.2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}_src @@ -24,7 +24,9 @@ LIB_DEPENDS= libphysfs.so:devel/physfs \ libsodium.so:security/libsodium \ libcurl.so:ftp/curl \ libsqlite3.so:databases/sqlite3 \ - libminiupnpc.so:net/miniupnpc + libminiupnpc.so:net/miniupnpc \ + libopusfile.so:audio/opusfile \ + libopus.so:audio/opus RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu USES= cmake bison compiler:c++11-lib gl openal:al pkgconfig \ @@ -35,15 +37,16 @@ CMAKE_ARGS= -DWZ_DISTRIBUTOR="FreeBSD ports" \ -DCMAKE_DISABLE_FIND_PACKAGE_Asciidoctor=TRUE \ -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \ -DWZ_ENABLE_WARNINGS_AS_ERRORS=FALSE \ - -DFETCHCONTENT_FULLY_DISCONNECTED=TRUE + -DFETCHCONTENT_FULLY_DISCONNECTED=TRUE \ + -DWZ_FORCE_MINIMAL_OPUSFILE=FALSE WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= * PORTDATA= * -OPTIONS_DEFINE= VULKAN DOCS NLS -OPTIONS_DEFAULT=VULKAN +OPTIONS_DEFINE= VULKAN FRIBIDI DOCS NLS +OPTIONS_DEFAULT=VULKAN FRIBIDI OPTIONS_SUB= yes NLS_USES= gettext @@ -55,6 +58,9 @@ VULKAN_BUILD_DEPENDS= vulkan-headers>0:graphics/vulkan-headers \ ${LOCALBASE}/bin/glslc:graphics/shaderc VULKAN_CMAKE_BOOL= WZ_ENABLE_BACKEND_VULKAN +FRIBIDI_LIB_DEPENDS= libfribidi.so:converters/fribidi +FRIBIDI_CMAKE_OFF= -DCMAKE_DISABLE_FIND_PACKAGE_Fribidi=TRUE + post-patch: @${FIND} ${WRKSRC} -type f -iname "*cmake*" -exec \ ${REINPLACE_CMD} -i '' -e '/find_package(Git/d' {} \; @@ -63,5 +69,6 @@ post-extract: .for bundled in miniupnp SQLiteCpp/sqlite3 @${RM} -rf ${WRKSRC}/3rdparty/${bundled} .endfor + @${RM} -rf ${WRKSRC}/lib/sound/3rdparty .include diff --git a/games/warzone2100/distinfo b/games/warzone2100/distinfo index 3023ce14ec9a..562d2b60f2e7 100644 --- a/games/warzone2100/distinfo +++ b/games/warzone2100/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646821447 -SHA256 (warzone2100-4.2.7/warzone2100_src.tar.xz) = 7f527ce00eda44099b1a7e3c303ede276f835f6d6ad945b0600a175ddabb00b0 -SIZE (warzone2100-4.2.7/warzone2100_src.tar.xz) = 338687576 +TIMESTAMP = 1670933579 +SHA256 (warzone2100-4.3.2/warzone2100_src.tar.xz) = 45ca4793ea7d01dbbdce4776279e21b297a8959affc6c06c63c7941cb198d31c +SIZE (warzone2100-4.3.2/warzone2100_src.tar.xz) = 320455376 diff --git a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt index 466265d6a4df..6f307e792659 100644 --- a/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt +++ b/games/warzone2100/files/patch-lib_sdl_CMakeLists.txt @@ -1,13 +1,13 @@ ---- lib/sdl/CMakeLists.txt.orig 2022-11-03 17:44:55 UTC +--- lib/sdl/CMakeLists.txt.orig 2022-11-02 16:53:49 UTC +++ lib/sdl/CMakeLists.txt -@@ -49,14 +49,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2 +@@ -55,14 +55,6 @@ if(NOT DEFINED WZ_FINDSDL2_NOCONFIG OR NOT WZ_FINDSDL2 find_package(SDL2 ${SDL2_MIN_VERSION} CONFIG QUIET) endif() if(SDL2_FOUND) - if (TARGET SDL2::SDL2-static) - # Check for INTERFACE_INCLUDE_DIRECTORIES to ignore the "aliased" target that vcpkg creates - get_target_property(_sdl2_include_dir SDL2::SDL2-static INTERFACE_INCLUDE_DIRECTORIES) -- test_link_to_sdl_target(SDL2::SDL2-static LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) +- test_link_to_sdl_target(SDL2::SDL2-static FALSE LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) - if (_sdl2_include_dir AND LINK_SUCCESS_SDL2_SDL2STATIC_TARGET) - set(_sdl2_library SDL2::SDL2-static) - endif() diff --git a/games/warzone2100/files/patch-lib_sound_CMakeLists.txt b/games/warzone2100/files/patch-lib_sound_CMakeLists.txt new file mode 100644 index 000000000000..28ce3a1b046c --- /dev/null +++ b/games/warzone2100/files/patch-lib_sound_CMakeLists.txt @@ -0,0 +1,11 @@ +--- lib/sound/CMakeLists.txt.orig 2022-11-02 16:53:49 UTC ++++ lib/sound/CMakeLists.txt +@@ -47,7 +47,7 @@ target_link_libraries(sound PRIVATE Ogg::ogg Opus::opu + target_link_libraries(sound PUBLIC optional-lite) + + # Opusfile +-find_package(Opusfile QUIET) ++find_package(Opusfile REQUIRED) + if (NOT WZ_FORCE_MINIMAL_OPUSFILE AND Opusfile_FOUND) + # Link the found Opusfile + message(STATUS "Found Opusfile library: ${OPUSFILE_LIBRARY}") diff --git a/games/warzone2100/files/patch-src_CMakeLists.txt b/games/warzone2100/files/patch-src_CMakeLists.txt deleted file mode 100644 index 6b218103529a..000000000000 --- a/games/warzone2100/files/patch-src_CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ ---- src/CMakeLists.txt.orig 2021-07-12 15:03:29 UTC -+++ src/CMakeLists.txt -@@ -611,9 +611,6 @@ endif() - # Install - install(TARGETS warzone2100 COMPONENT Core DESTINATION "${WZ_APP_INSTALL_DEST}") - --# For Portable packages only, copy the ".portable" file that triggers portable mode (Windows-only) --install(FILES "${CMAKE_SOURCE_DIR}/pkg/portable.in" COMPONENT PortableConfig DESTINATION "${WZ_APP_INSTALL_DEST}" RENAME ".portable") -- - ##################### - # Installing Required Runtime Dependencies - diff --git a/games/warzone2100/pkg-plist b/games/warzone2100/pkg-plist index 2552059831cc..cfb61995ecfe 100644 --- a/games/warzone2100/pkg-plist +++ b/games/warzone2100/pkg-plist @@ -1,7 +1,7 @@ bin/warzone2100 share/man/man6/warzone2100.6.gz -share/applications/warzone2100.desktop -share/icons/warzone2100.png +share/applications/net.wz2100.warzone2100.desktop +share/icons/net.wz2100.warzone2100.png %%NLS%%share/locale/af_ZA/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/ar_SA/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/bg_BG/LC_MESSAGES/warzone2100.mo @@ -43,4 +43,4 @@ share/icons/warzone2100.png %%NLS%%share/locale/uk_UA/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/warzone2100.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/warzone2100.mo -share/metainfo/warzone2100.appdata.xml +share/metainfo/net.wz2100.warzone2100.appdata.xml