From nobody Tue Mar 28 16:51:56 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 4PmG1T05B1z428rd; Tue, 28 Mar 2023 16:51:57 +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 4PmG1S6kjjz3lCG; Tue, 28 Mar 2023 16:51:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680022316; 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=saicNHW8GzykTS+jhsUFoFON8X1YJmvlJDATrE6Zryw=; b=v7cj/34gnjAvRoL/Is3hvAsSEE+TltdZjUqS0pOa+gBNPH8zdksYKDqPLtTT9J3hAulqEt VmJGrezmQMmlhY2pblT+Kxa0latcMV4h6Jzj9H3vSgfuMA7Jj5GnLzxLin6VxwYYNtoLaD 3NQG1COQ3dfSCkIKYGr6Pfik/+it2VRZs1MH13zPCBMi9RRLW2ISs7iNFxVJSf+ttYsS5G DWSqe8OFzH+i14IeEIiJcFoEqJSZOt4gkyfNkKT3NMjdWjboXY9OQgbk+y8h2lqoFimYRR W0FbqwCa2ULvMyhEBhQayusaW5p6Qn7cWeZPTHHVykf8RO7GLIgNT90TkaDiqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680022316; 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=saicNHW8GzykTS+jhsUFoFON8X1YJmvlJDATrE6Zryw=; b=ZKX2GwEkf/zOYRjgnLrzbBYNQ6m7TbT+AFoma4PCwxyqDkBABGkSAaE4dQQafDZMYbYeEU 8K6kRhERHwL49cKnBJejzYCBc+Y/3ajZKoL80ttB7UE2dsTTZi1jy+bt4IpOgd6ARMbcDv lUOIZ4MeZGDyDNC51IRIEOh8P2SrJWV40XECWNyqSaIFqUHhhWfekE9g3AnsOSk3FSSltK b6yOkkdmmSVzYODpCKvwTB5LKlp+j3mJMs6z2hlwJrnEJgDSSPTpOMpw7EmpeXUyatVUmy dLjhV/rMIFXqnEHCcpAYQ6meUF+H9KRBNPMCbM5yNGP+Zup9bOAB1ztGMVKDcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680022316; a=rsa-sha256; cv=none; b=UoFwQYXYQ43HWO4VFf+TeHl040O5RIsfiUVRehukEl6gsAvvaEWoS07giOWMrZuqdb6eGW 2V/sa8jKZlmHQKhJNitrdFJ7feP7CT8nAbBkL0QvJbLnvgkcryxJvlWJwq0EjiYmpbj9FJ lev3v01ksFKrXjn7WEy8QYaIl5B/AUOi9EM6M5DidG14tZ1krupl9titSoRwCSLvTFZU82 TxKWSqRlu1CWzYtFHFyEZ2keNKIruRLeLAlnQJSNvoO9Cyh3dXJakL7kS5zuZy7JitXEia aQLSIYehwhuKZelTCch2l7oykb7qx1w+Fc3XtBFj2KE8SYFd5ktg1FRVp67+Iw== 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 4PmG1S5XMzz1BQr; Tue, 28 Mar 2023 16:51:56 +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 32SGpuor068475; Tue, 28 Mar 2023 16:51:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32SGpuH0068462; Tue, 28 Mar 2023 16:51:56 GMT (envelope-from git) Date: Tue, 28 Mar 2023 16:51:56 GMT Message-Id: <202303281651.32SGpuH0068462@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: 87815f0c5a17 - main - =?utf-8?Q?games/xmoto:=20update=200.6.1=20=E2=86=92=200.6.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: 87815f0c5a175f3b6be9dc49a6ef31d2cb5d2881 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=87815f0c5a175f3b6be9dc49a6ef31d2cb5d2881 commit 87815f0c5a175f3b6be9dc49a6ef31d2cb5d2881 Author: Dmitry Marakasov AuthorDate: 2023-03-27 21:39:10 +0000 Commit: Dmitry Marakasov CommitDate: 2023-03-28 16:51:00 +0000 games/xmoto: update 0.6.1 → 0.6.2 --- games/xmoto/Makefile | 14 ++--- games/xmoto/distinfo | 6 +- games/xmoto/files/patch-src_CMakeLists.txt | 81 +++++++++++++------------- games/xmoto/files/patch-src_common_Locales.cpp | 25 -------- games/xmoto/pkg-plist | 2 +- 5 files changed, 50 insertions(+), 78 deletions(-) diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index bb0c2ca913f2..d2c774521fee 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -1,6 +1,6 @@ PORTNAME= xmoto -PORTVERSION= 0.6.1 -PORTREVISION= 3 +DISTVERSIONPREFIX= v +DISTVERSION= 0.6.2 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -10,17 +10,15 @@ WWW= https://xmoto.tuxfamily.org/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libode.so:devel/ode \ - libpng.so:graphics/png \ +LIB_DEPENDS= libpng.so:graphics/png \ libcurl.so:ftp/curl \ libxdg-basedir.so:x11/libxdg-basedir USES= compiler:c++11-lang cmake gl gnome jpeg lua:52 pkgconfig sdl sqlite USE_GITHUB= yes USE_GNOME= libxml2 -USE_SDL= sdl mixer ttf net +USE_SDL= sdl2 mixer2 ttf2 net2 USE_GL= gl glu -CMAKE_ARGS= -DOpenGL_GL_PREFERENCE="GLVND" PORTDOCS= README.md ChangeLog PORTDATA= * @@ -38,8 +36,8 @@ NLS_CMAKE_BOOL= USE_GETTEXT # ensure bundled depends are not used post-extract: -.for d in bzip2 lua ode xdgbasedir - @${RM} -r ${WRKSRC}/src/${d} +.for d in bzip2 lua xdgbasedir + @${RM} -r ${WRKSRC}/vendor/${d} .endfor post-patch: diff --git a/games/xmoto/distinfo b/games/xmoto/distinfo index a6e8c0a69834..7b5b7a4dcac4 100644 --- a/games/xmoto/distinfo +++ b/games/xmoto/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647452639 -SHA256 (xmoto-xmoto-0.6.1_GH0.tar.gz) = 209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66 -SIZE (xmoto-xmoto-0.6.1_GH0.tar.gz) = 41623870 +TIMESTAMP = 1678130089 +SHA256 (xmoto-xmoto-v0.6.2_GH0.tar.gz) = 1ba54baaa1511f45497c1aadd6c8fda4917fd4e403466cdc92b5755b05c90de4 +SIZE (xmoto-xmoto-v0.6.2_GH0.tar.gz) = 42115597 diff --git a/games/xmoto/files/patch-src_CMakeLists.txt b/games/xmoto/files/patch-src_CMakeLists.txt index bb012ae49335..9db368ed7de7 100644 --- a/games/xmoto/files/patch-src_CMakeLists.txt +++ b/games/xmoto/files/patch-src_CMakeLists.txt @@ -1,50 +1,49 @@ ---- src/CMakeLists.txt.orig 2020-06-21 19:18:16 UTC +--- src/CMakeLists.txt.orig 2023-03-05 10:10:34 UTC +++ src/CMakeLists.txt -@@ -41,7 +41,7 @@ endif() - find_package(PNG REQUIRED) - - find_package(Lua) --set(USE_SYSTEM_Lua $,$,$>>) -+set(USE_SYSTEM_Lua $,$,$>>) - if (NOT LUA_VERSION_STRING VERSION_LESS 5.2 AND LUA_VERSION_STRING VERSION_LESS 5.3) - add_definitions("-DLUA_COMPAT_ALL") - elseif (LUA_VERSION_STRING VERSION_GREATER_EQUAL "5.3") -@@ -398,14 +398,30 @@ elseif(APPLE AND BUILD_MACOS_BUNDLE) - endif() - - target_include_directories(xmoto -- PRIVATE +@@ -52,15 +52,7 @@ endif() + # Can't disable yet + if(ON OR USE_SDLGFX) + # This is a workaround required on some systems that ship a broken sdl2-config.cmake +- find_library(SDL2_LIBRARIES NAMES SDL2 SDL2main) +- if(NOT SDL2_LIBRARIES) +- find_package(SDL2 REQUIRED) - -- "${PROJECT_SOURCE_DIR}/src" -+ PRIVATE SYSTEM -+ "${Intl_INCLUDE_DIR}" -+ "${JPEG_INCLUDE_DIR}" -+ "${LIBLZMA_INCLUDE_DIR}" - "${LIBXML2_INCLUDE_DIR}" -+ "${OPENGL_INCLUDE_DIR}" -+ "${PNG_PNG_INCLUDE_DIR}" -+ "${SDL_INCLUDE_DIR}" -+ "${SDL_MIXER_INCLUDE_DIR}" -+ "${SDL_NET_INCLUDE_DIR}" -+ "${SQLITE3_INCLUDE_DIRS}" -+ "${ZLIB_INCLUDE_DIR}" -+ "$<${USE_SYSTEM_BZip2}:${BZIP2_INCLUDE_DIR}>" - "$<${USE_SYSTEM_Lua}:${LUA_INCLUDE_DIR}>" -- "$<$:${PROJECT_SOURCE_DIR}/vendor/lua/lua>" -+ "$<${USE_SYSTEM_ODE}:${ODE_INCLUDE_DIR}>" -+ "$<${USE_SYSTEM_XDG}:${XDG_INCLUDE_DIR}>" +- if("${SDL2_LIBRARIES}" STREQUAL "") +- set(SDL2_LIBRARIES SDL2::SDL2) +- endif() +- endif() +- ++ find_package(SDL2 REQUIRED) + find_package(SDL2_mixer REQUIRED) + find_package(SDL2_net REQUIRED) + find_package(SDL2_ttf REQUIRED) +@@ -85,13 +77,10 @@ check_prototype_definition(mkdir + MS_MKDIR ) -+target_include_directories(xmoto -+ PRIVATE -+ "${PROJECT_SOURCE_DIR}/src" -+# "$<$:${PROJECT_SOURCE_DIR}/vendor/lua/lua>" +-add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/bzip2" bzip2) + add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/libccd" libccd) + add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/chipmunk" chipmunk) +-add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/lua" lua) + add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/md5sum" md5sum) + add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/ode" ode) +-add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/xdgbasedir" xdgbasedir) + add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/glad" glad) + + configure_file(common/XMBuildConfig.h.in common/XMBuildConfig.h) +@@ -447,7 +436,11 @@ target_include_directories(xmoto + PRIVATE + + "${PROJECT_SOURCE_DIR}/src" +) -+ - target_link_libraries(xmoto PUBLIC - $<$:userenv> -@@ -463,7 +479,9 @@ target_compile_definitions(xmoto PUBLIC MS_MKDIR=$) target_compile_definitions(xmoto PUBLIC USE_SDLGFX=$) diff --git a/games/xmoto/files/patch-src_common_Locales.cpp b/games/xmoto/files/patch-src_common_Locales.cpp deleted file mode 100644 index 92f912cdde8f..000000000000 --- a/games/xmoto/files/patch-src_common_Locales.cpp +++ /dev/null @@ -1,25 +0,0 @@ ---- src/common/Locales.cpp.orig 2020-06-21 19:18:16 UTC -+++ src/common/Locales.cpp -@@ -25,7 +25,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, - #include "helpers/Log.h" - #include "helpers/VExcept.h" - #include -+#if USE_GETTEXT - #include -+#endif - - #define PACKAGE_LANG "xmoto" - -@@ -68,10 +70,12 @@ std::pair Locales::changeLoc - #endif - - /* Make change known. */ -+#if USE_GETTEXT - { - extern int _nl_msg_cat_cntr; - ++_nl_msg_cat_cntr; - } -+#endif - - std::pair locale_str( - locale.first == NULL ? std::string("") : std::string(locale.first), diff --git a/games/xmoto/pkg-plist b/games/xmoto/pkg-plist index 78f9801d980d..b71f2be5af49 100644 --- a/games/xmoto/pkg-plist +++ b/games/xmoto/pkg-plist @@ -24,4 +24,4 @@ share/applications/xmoto.desktop %%NLS%%share/locale/tr/LC_MESSAGES/xmoto.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xmoto.mo share/man/man6/xmoto.6.gz -share/pixmaps/xmoto.xpm +share/pixmaps/xmoto.png