From nobody Fri Apr 01 14:40:47 2022 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 A04691A47BAD; Fri, 1 Apr 2022 14:40:47 +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 4KVNBl3ghfz3JFY; Fri, 1 Apr 2022 14:40:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648824047; 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=B1s3VsmsCQzjXABMy57yLyJqNaQWmGUk0b228hnF8+0=; b=VcxlSudnuA9ScjZu6V/EuUY0r26ZxzXHQizgaHtz3oHV+wGldMwiI4z35kxu5qSdJ7axK7 XVDwgslq+maTZuH1LRm4zglWOyzDFOsGjIIpVnN/aix7bFKeM990zkFdREw801F2MPjTjw hdsmXQS/gGVYCpk49ovXB/U1h/QSWUpmavoKOaGdtbfDsoqlNyKHAvbgUR1CxprPi2ybo1 cXZxjj0sEWUMrp44nGjr/3GVLvbrXAFLdcfy6X9MA9dcISTR2uqpSoMT4aeh3++0iDh1S0 qDMjgH9jfRGJXz4rKLPPKpAu/aYBqjFXIIEvCgSDDzEJzB5GWyl5uDci9mymPw== 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 59A6A162DC; Fri, 1 Apr 2022 14:40:47 +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 231Eeliv031851; Fri, 1 Apr 2022 14:40:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 231EeliX031850; Fri, 1 Apr 2022 14:40:47 GMT (envelope-from git) Date: Fri, 1 Apr 2022 14:40:47 GMT Message-Id: <202204011440.231EeliX031850@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: 022937601db4 - main - =?utf-8?Q?games/stuntrally: update 2.6.1 =E2=86=92 2.6.2?= 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 022937601db49e8bcc95d2e0637a4d6ca3d4d234 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648824047; 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=B1s3VsmsCQzjXABMy57yLyJqNaQWmGUk0b228hnF8+0=; b=KUKC8Vi4+CLCuGgHqUT7rvS6G2K3ZYLqEJ91jWnFitPRaswdE+FmuKyhfTNEN6QkFpz4Qu 5/4eMMvFBjvikkIkPQm6QtAc1x9vS9FXojD9zwXJq3tWXbqiXQr8iKPWDlE7gobI+Wbc50 RP7lCmi0pJcy5OVua5wssqxQEpY6oIgx2K2d2gFjyUVQCgLjiWHMmHzLwameOpR1yMG4t/ Bl8cfGL3nXWxxd8jKmjgzcyZ53S9Od8+PwSTt9J3kJKGpv0przZW/dg5Zh6D1OiaqkwqK6 unTm1bZ//Wif/hXkrFDDUnKnWpYk5gYsWFtkwnwDzRCEL5ylqzdibTBl9Vcvdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648824047; a=rsa-sha256; cv=none; b=pfN6lbAfwvtGXWQuY27hWVEkl4CGhhNziyGGEkOD82GJ+dzOGI7yRffioiMEv2mQ3KAnzo Xp/ahgyPzdFYnjjZiuuhuUbi63sm1B1QxwEIEMsMfXfyZHSeHeQhAOlyU4zQ9d1xE9lpaH /Hwu7S5IRX+lZbuyJLb2K8n2/UYeVdX8LuX623MuVZYMyF1+LnYEr5Td8Es7vRXC1WeOuF xiusBaEFBYu5zDo7jrHGXQTjASL3NHxvjj8rCM03DsmO/WMk1qiBPblWyIydPONpdRakDQ QLlT2ypMju52gX0D7z3UWaeaYaJHK2R0ek2PCtAqVN4Lve60mqdTrOotlGE13g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=022937601db49e8bcc95d2e0637a4d6ca3d4d234 commit 022937601db49e8bcc95d2e0637a4d6ca3d4d234 Author: Dmitry Marakasov AuthorDate: 2022-03-31 15:28:58 +0000 Commit: Dmitry Marakasov CommitDate: 2022-04-01 14:37:33 +0000 games/stuntrally: update 2.6.1 → 2.6.2 - Add missing USES=sdl for some options combinations Notes: - It still requires ogre3d9 (builds with recent ogre3d but doesn't run properly) - It still doesn't build with mygui 3.4.1 --- games/stuntrally/Makefile | 9 ++++----- games/stuntrally/distinfo | 10 +++++----- games/stuntrally/files/patch-source_editor_CApp.h | 11 ----------- games/stuntrally/files/patch-source_vdrift_cartire.cpp | 11 ----------- games/stuntrally/pkg-plist | 2 +- 5 files changed, 10 insertions(+), 33 deletions(-) diff --git a/games/stuntrally/Makefile b/games/stuntrally/Makefile index 798dfe0f214e..c30ef677be33 100644 --- a/games/stuntrally/Makefile +++ b/games/stuntrally/Makefile @@ -1,6 +1,5 @@ PORTNAME= stuntrally -PORTVERSION= 2.6.1 -PORTREVISION= 4 +PORTVERSION= 2.6.2 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -14,8 +13,7 @@ LIB_DEPENDS= libboost_thread.so:devel/boost-libs USE_GITHUB= yes GH_TUPLE= stuntrally:tracks:${PORTVERSION}:tracks/data/tracks -USES= compiler:c++11-lib cmake dos2unix pkgconfig sdl -USE_CXXSTD= gnu++11 +USES= compiler:c++14-lang cmake dos2unix pkgconfig DOS2UNIX_FILES= source/ogre/BaseApp_Create.cpp CMAKE_ARGS= -DSHARE_INSTALL="${DATADIR_REL}" \ -DBULLET_ROOT="${LOCALBASE}" @@ -39,7 +37,7 @@ GAME_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 \ libenet.so:net/enet GAME_BUILD_DEPENDS= ${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre GAME_USE= SDL=sdl2 -GAME_USES= openal +GAME_USES= openal sdl EDITOR_DESC= Build the track editor EDITOR_CMAKE_BOOL= BUILD_EDITOR @@ -49,6 +47,7 @@ EDITOR_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 \ libogg.so:audio/libogg \ libvorbisfile.so:audio/libvorbis EDITOR_USE= SDL=sdl2 +EDITOR_USES= sdl EDITOR_BUILD_DEPENDS= ${LOCALBASE}/include/MYGUI/MyGUI_OgreTexture.h:x11-toolkits/mygui-ogre MASTER_SERVER_CMAKE_BOOL= BUILD_MASTER_SERVER diff --git a/games/stuntrally/distinfo b/games/stuntrally/distinfo index 914b5fc98d81..3f2f7f68a533 100644 --- a/games/stuntrally/distinfo +++ b/games/stuntrally/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1555952779 -SHA256 (stuntrally-stuntrally-2.6.1_GH0.tar.gz) = 9bf0507c4235ffaeee019a852124b6cffc311afe3275ae8472eadff4441fb8ff -SIZE (stuntrally-stuntrally-2.6.1_GH0.tar.gz) = 651581700 -SHA256 (stuntrally-tracks-2.6.1_GH0.tar.gz) = fa83ecf6dcc6e906542f3bd07677ad4369cfe4d12c639837a0f90946d47dd474 -SIZE (stuntrally-tracks-2.6.1_GH0.tar.gz) = 355800929 +TIMESTAMP = 1648667237 +SHA256 (stuntrally-stuntrally-2.6.2_GH0.tar.gz) = a63550d5d13d20dca678c2cd8e30332cd41ca5380d14720c15549e6b0387bd55 +SIZE (stuntrally-stuntrally-2.6.2_GH0.tar.gz) = 651633552 +SHA256 (stuntrally-tracks-2.6.2_GH0.tar.gz) = 4fd587cf6cfe72e78530bb051bd423f9d0d0e38ca258e8254a4fdd6e60db5bcc +SIZE (stuntrally-tracks-2.6.2_GH0.tar.gz) = 357438076 diff --git a/games/stuntrally/files/patch-source_editor_CApp.h b/games/stuntrally/files/patch-source_editor_CApp.h deleted file mode 100644 index 529a0d3ea207..000000000000 --- a/games/stuntrally/files/patch-source_editor_CApp.h +++ /dev/null @@ -1,11 +0,0 @@ ---- source/editor/CApp.h.orig 2019-11-27 17:44:26 UTC -+++ source/editor/CApp.h -@@ -137,7 +137,7 @@ class App : public BaseApp, (public) - float Size,Intens,Pow,Fq,NOf; - int Oct; EBrShape shape; - float Filter,HSet; -- char newLine; Ogre::String name; -+ signed char newLine; Ogre::String name; - }; - - const static int brSetsNum = 87; diff --git a/games/stuntrally/files/patch-source_vdrift_cartire.cpp b/games/stuntrally/files/patch-source_vdrift_cartire.cpp deleted file mode 100644 index f9e31db234d9..000000000000 --- a/games/stuntrally/files/patch-source_vdrift_cartire.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- source/vdrift/cartire.cpp.orig 2019-03-16 14:58:09 UTC -+++ source/vdrift/cartire.cpp -@@ -280,7 +280,7 @@ Dbl CARTIRE::Pacejka_Fx (Dbl sigma, Dbl Fz, Dbl fricti - - maxforce_output = D; - -- assert(!std::isnan(Fx)); -+ assert(!isnan(Fx)); - return Fx; - } - diff --git a/games/stuntrally/pkg-plist b/games/stuntrally/pkg-plist index 10d5b81b7691..bc7cbb99e7db 100644 --- a/games/stuntrally/pkg-plist +++ b/games/stuntrally/pkg-plist @@ -4,4 +4,4 @@ %%EDITOR%%share/applications/sr-editor.desktop %%GAME%%share/applications/stuntrally.desktop %%EDITOR%%share/icons/hicolor/64x64/apps/sr-editor.png -%%GAME%%share/icons/hicolor/64x64/apps/stuntrally.png +%%GAME%%share/icons/hicolor/256x256/apps/stuntrally.png