Date: Mon, 14 Mar 2022 15:07:19 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 881cc0caa076 - main - =?utf-8?Q?games/springlobby: update 0.180 =E2=86=92 0.273?= Message-ID: <202203141507.22EF7JRh079831@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=881cc0caa07645a5996787c2b0d4d2e274b304c9 commit 881cc0caa07645a5996787c2b0d4d2e274b304c9 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2021-05-06 17:12:37 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2022-03-14 15:06:41 +0000 games/springlobby: update 0.180 → 0.273 --- games/springlobby/Makefile | 41 ++++++++++++++-------- games/springlobby/distinfo | 5 +-- .../springlobby/files/patch-cmake_FindAlure.cmake | 32 +++++++++++++++++ .../files/patch-cmake_compat__flags.cmake | 10 ------ .../files/patch-cmake_regen__config_header.sh | 11 ++++++ games/springlobby/files/patch-lsl-fmemopen | 32 ----------------- ...rc-downloader-lib-src-lib-xmlrpc++-src-base64.h | 11 ------ .../patch-src-lsl-src-lslunitsync-unitsync.cpp | 17 --------- .../files/patch-src-lsl-src-lslutils-misc.cpp | 12 ------- games/springlobby/files/patch-src-spring.cpp | 10 ------ games/springlobby/files/patch-src_CMakeLists.txt | 21 ++++++----- games/springlobby/files/patch-src_address.cpp | 11 ++++++ .../springlobby/files/patch-src_sound_alsound.cpp | 11 ++++++ .../files/patch-tools-regen__config__header.sh | 16 --------- games/springlobby/pkg-plist | 2 +- 15 files changed, 107 insertions(+), 135 deletions(-) diff --git a/games/springlobby/Makefile b/games/springlobby/Makefile index 788056d4960e..71bc1e2fcd12 100644 --- a/games/springlobby/Makefile +++ b/games/springlobby/Makefile @@ -1,24 +1,30 @@ PORTNAME= springlobby -PORTVERSION= 0.180 -PORTREVISION= 23 +PORTVERSION= 0.273 CATEGORIES= games net -MASTER_SITES= http://www.springlobby.info/tarballs/ \ - http://mirror.amdmi3.ru/distfiles/ +MASTER_SITES= https://springlobby.springrts.com/dl/stable/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Cross-platform lobby client for the Spring RTS project -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING +IGNORE_FreeBSD_12= not supported by spring engine +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= spring engine only supports amd64 + RUN_DEPENDS= spring:games/spring LIB_DEPENDS= libcurl.so:ftp/curl \ - libboost_thread.so:devel/boost-libs + libboost_thread.so:devel/boost-libs \ + libjsoncpp.so:devel/jsoncpp \ + libminizip.so:archivers/minizip \ + libpng.so:graphics/png -USES= cmake compiler:c++11-lib pkgconfig tar:bzip2 +USES= cmake compiler:c++17-lang pkgconfig ssl tar:bzip2 CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ - -DENABLE_DEBUG_REPORT=FALSE -USE_WX= 2.8+ + -DPRD_JSONCPP_INTERNAL=OFF \ + -Wno-dev +USE_WX= 3.0+ PORTDOCS= * @@ -29,17 +35,22 @@ OPTIONS_SUB= yes SOUND_DESC= Enable sound notifications NOTIFY_DESC= Enable libnotify support for popup status messages -NLS_CMAKE_ON= -DOPTION_TRANSLATION_SUPPORT:BOOL=ON -NLS_CMAKE_OFF= -DOPTION_TRANSLATION_SUPPORT:BOOL=OFF +NLS_CMAKE_BOOL= OPTION_TRANSLATION_SUPPORT NLS_USES= gettext -SOUND_CMAKE_ON= -DOPTION_SOUND:BOOL=ON -SOUND_CMAKE_OFF= -DOPTION_SOUND:BOOL=OFF +SOUND_CMAKE_BOOL= OPTION_SOUND SOUND_LIB_DEPENDS= libalure.so:audio/alure SOUND_USES= openal:al -NOTIFY_CMAKE_ON= -DOPTION_NOTIFY=ON -NOTIFY_CMAKE_OFF= -DOPTION_NOTIFY=OFF +NOTIFY_CMAKE_BOOL= OPTION_NOTIFY NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify +NOTIFY_USES= gnome +NOTIFY_USE= GNOME=glib20 + +# make sure bundled depends are not used +post-patch: +.for lib in minizip jsoncpp libgit2 + @${RM} -r ${WRKSRC}/src/downloader/lib/src/lib/${lib} +.endfor .include <bsd.port.mk> diff --git a/games/springlobby/distinfo b/games/springlobby/distinfo index 06e75ee5f047..faea9391a271 100644 --- a/games/springlobby/distinfo +++ b/games/springlobby/distinfo @@ -1,2 +1,3 @@ -SHA256 (springlobby-0.180.tar.bz2) = ca9612fd4b8beb940169dfdbca76d15a73daee90ceb35c12f5ef451e79e6576c -SIZE (springlobby-0.180.tar.bz2) = 2543659 +TIMESTAMP = 1646942745 +SHA256 (springlobby-0.273.tar.bz2) = 5e453a8ba0010a0c371fdbc9bb4c631d13b506096e7983352f227171974eac39 +SIZE (springlobby-0.273.tar.bz2) = 6586846 diff --git a/games/springlobby/files/patch-cmake_FindAlure.cmake b/games/springlobby/files/patch-cmake_FindAlure.cmake new file mode 100644 index 000000000000..feaf5b03aeb6 --- /dev/null +++ b/games/springlobby/files/patch-cmake_FindAlure.cmake @@ -0,0 +1,32 @@ +--- cmake/FindAlure.cmake.orig 2019-11-24 14:00:54 UTC ++++ cmake/FindAlure.cmake +@@ -14,13 +14,8 @@ + + find_path(ALURE_INCLUDE_DIR + NAMES +- alure.h +- PATH_SUFFIXES AL OpenAL +- PATHS +- /usr/include +- /usr/local/include +- /opt/local/include +- /sw/include ++ AL/alure.h ++ OpenAL/alure.h + ) + + #IF (NOT ALURE_MIN_VERSION) +@@ -42,12 +37,7 @@ find_path(ALURE_INCLUDE_DIR + + find_library(ALURE_LIBRARY + NAMES +- alure alure 32 ALURE32-static ALURE32 +- PATHS +- /usr/lib +- /usr/local/lib +- /opt/local/lib +- /sw/lib ++ alure + ) + + set(ALURE_INCLUDE_DIRS diff --git a/games/springlobby/files/patch-cmake_compat__flags.cmake b/games/springlobby/files/patch-cmake_compat__flags.cmake deleted file mode 100644 index 60fc2c99178c..000000000000 --- a/games/springlobby/files/patch-cmake_compat__flags.cmake +++ /dev/null @@ -1,10 +0,0 @@ ---- cmake/compat_flags.cmake.orig 2013-11-22 21:34:04 UTC -+++ cmake/compat_flags.cmake -@@ -4,7 +4,6 @@ execute_process(COMMAND ${CMAKE_C_COMPIL - - # try to use compiler flag -std=c++11 - MACRO(AddSTDFlag FLAG) -- set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FLAG} ") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG} ") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG} ") - set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ${FLAG} ") diff --git a/games/springlobby/files/patch-cmake_regen__config_header.sh b/games/springlobby/files/patch-cmake_regen__config_header.sh new file mode 100644 index 000000000000..bb2454c7ab00 --- /dev/null +++ b/games/springlobby/files/patch-cmake_regen__config_header.sh @@ -0,0 +1,11 @@ +--- cmake/regen_config_header.sh.orig 2019-12-13 00:25:26 UTC ++++ cmake/regen_config_header.sh +@@ -11,7 +11,7 @@ set -u + SOURCE="$1" + OUTPUT="$2" + +-REV="$(git -C "$SOURCE" describe --tags)" 2>/dev/null ++REV= + + if [ -z "$REV" ]; then + REV="unknown" diff --git a/games/springlobby/files/patch-lsl-fmemopen b/games/springlobby/files/patch-lsl-fmemopen deleted file mode 100644 index 6009d87f5dc8..000000000000 --- a/games/springlobby/files/patch-lsl-fmemopen +++ /dev/null @@ -1,32 +0,0 @@ -diff --git src/CMakeLists.txt src/CMakeLists.txt -index a1d9e3a..d82dac8 100644 ---- src/lsl/src/CMakeLists.txt -+++ src/lsl/src/CMakeLists.txt -@@ -11,6 +11,14 @@ ENDIF ( EXISTS ${libSpringLobby_BINARY_DIR}/libSpringLobby_config.h OR EXISTS - INCLUDE_DIRECTORIES(${libSpringLobby_SOURCE_DIR}/lib) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) - -+INCLUDE (CheckFunctionExists) -+ -+SET(CMAKE_REQUIRED_INCLUDES stdio.h) -+CHECK_FUNCTION_EXISTS(fmemopen HAVE_FMEMOPEN) -+IF(HAVE_FMEMOPEN) -+ ADD_DEFINITIONS(-DHAVE_FMEMOPEN) -+ENDIF(HAVE_FMEMOPEN) -+ - add_subdirectory( lslutils ) - if (LSLSERVER) - add_subdirectory( lsl ) -diff --git src/lslunitsync/image.cpp src/lslunitsync/image.cpp -index fbc4591..e26215c 100644 ---- src/lsl/src/lslunitsync/image.cpp -+++ src/lsl/src/lslunitsync/image.cpp -@@ -14,7 +14,7 @@ - #include <lslutils/logging.h> - - --#ifdef WIN32 -+#if !defined(HAVE_FMEMOPEN) - #include <boost/filesystem.hpp> - //! we need our own fmemopen implementation since its posix only - FILE* fmemopen(void* data, size_t size, const char* mode) diff --git a/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h b/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h deleted file mode 100644 index 165b380e594d..000000000000 --- a/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/downloader/lib/src/lib/xmlrpc++/src/base64.h.orig 2013-02-10 22:02:43.000000000 +0400 -+++ src/downloader/lib/src/lib/xmlrpc++/src/base64.h 2013-12-10 04:19:12.257112752 +0400 -@@ -13,6 +13,8 @@ - # include <iterator> - #endif - -+#include <iostream> -+ - static - int _base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', - 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z', diff --git a/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp b/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp deleted file mode 100644 index 7e75cf3024cb..000000000000 --- a/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- src/lsl/src/lslunitsync/unitsync.cpp.orig 2013-11-23 01:34:07.000000000 +0400 -+++ src/lsl/src/lslunitsync/unitsync.cpp 2013-12-10 04:23:40.875093997 +0400 -@@ -55,13 +55,7 @@ - { - static std::locale l("C"); - static boost::is_iless il(l); -- try { -- //this fails on certain names -- return il(first,second); -- } -- catch(...) { -- return first < second; -- } -+ return first < second; - } - - bool Unitsync::LoadUnitSyncLib( const std::string& unitsyncloc ) diff --git a/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp b/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp deleted file mode 100644 index 08df9faecc59..000000000000 --- a/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- src/lsl/src/lslutils/misc.cpp.orig 2013-08-31 10:17:00 UTC -+++ src/lsl/src/lslutils/misc.cpp -@@ -2,7 +2,9 @@ - #include "conversion.h" - - #include <boost/filesystem.hpp> -+#include <boost/shared_ptr.hpp> - #include <fstream> -+#include <cmath> - - namespace LSL { - namespace Util { diff --git a/games/springlobby/files/patch-src-spring.cpp b/games/springlobby/files/patch-src-spring.cpp deleted file mode 100644 index 367e2b141f83..000000000000 --- a/games/springlobby/files/patch-src-spring.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- src/spring.cpp.orig 2013-11-23 01:34:04.000000000 +0400 -+++ src/spring.cpp 2013-12-10 04:26:29.352082590 +0400 -@@ -28,6 +28,7 @@ - #include <wx/filename.h> - #include <stdexcept> - #include <vector> -+#include <clocale> - #include <fstream> - - #include "spring.h" diff --git a/games/springlobby/files/patch-src_CMakeLists.txt b/games/springlobby/files/patch-src_CMakeLists.txt index d321d0f2e215..fae7f2a7b60a 100644 --- a/games/springlobby/files/patch-src_CMakeLists.txt +++ b/games/springlobby/files/patch-src_CMakeLists.txt @@ -1,11 +1,14 @@ ---- src/CMakeLists.txt.orig 2020-08-14 17:39:26 UTC +--- src/CMakeLists.txt.orig 2021-08-21 18:23:23 UTC +++ src/CMakeLists.txt -@@ -112,7 +112,7 @@ IF( ENABLE_DEBUG_REPORT ) - ENDIF( MINGW ) - ENDIF( ENABLE_DEBUG_REPORT ) +@@ -503,11 +503,6 @@ target_include_directories(springlobby + PRIVATE ${generated_gui_include} + ) + +-IF(UNIX) +- FIND_PACKAGE(X11 REQUIRED) +- TARGET_LINK_LIBRARIES(springlobby ${X11_X11_LIB}) +-ENDIF(UNIX) +- + ENABLE_TESTING() + add_subdirectory(tests) --FIND_PACKAGE( CURL REQUIRED libcurl ) -+FIND_PACKAGE( CURL REQUIRED) - IF( NOT CURL_FOUND ) - MESSAGE( FATAL_ERROR "required library libCURL not found" ) - ENDIF( NOT CURL_FOUND ) diff --git a/games/springlobby/files/patch-src_address.cpp b/games/springlobby/files/patch-src_address.cpp new file mode 100644 index 000000000000..dc92c8cbfd76 --- /dev/null +++ b/games/springlobby/files/patch-src_address.cpp @@ -0,0 +1,11 @@ +--- src/address.cpp.orig 2020-10-31 09:53:52 UTC ++++ src/address.cpp +@@ -49,7 +49,7 @@ bool GetMac(std::vector<unsigned char>& mac) + return (GetMacType(mac, 0)); + } + +-#elif defined(__APPLE__) ++#elif defined(__APPLE__) || defined(__FreeBSD__) + + bool GetMac(std::vector<unsigned char>& mac) + { diff --git a/games/springlobby/files/patch-src_sound_alsound.cpp b/games/springlobby/files/patch-src_sound_alsound.cpp new file mode 100644 index 000000000000..2a8be2f6b4ea --- /dev/null +++ b/games/springlobby/files/patch-src_sound_alsound.cpp @@ -0,0 +1,11 @@ +--- src/sound/alsound.cpp.orig 2020-10-31 09:53:52 UTC ++++ src/sound/alsound.cpp +@@ -13,7 +13,7 @@ + #define ALURE_STATIC_LIBRARY + #endif + +-#include <alure.h> ++#include <AL/alure.h> + #include <assert.h> + #include <lslutils/globalsmanager.h> + #include <wx/log.h> diff --git a/games/springlobby/files/patch-tools-regen__config__header.sh b/games/springlobby/files/patch-tools-regen__config__header.sh deleted file mode 100644 index 3893d72c7a62..000000000000 --- a/games/springlobby/files/patch-tools-regen__config__header.sh +++ /dev/null @@ -1,16 +0,0 @@ ---- tools/regen_config_header.sh.orig 2011-04-25 01:48:12.000000000 +0400 -+++ tools/regen_config_header.sh 2011-05-05 12:03:25.000000000 +0400 -@@ -1,4 +1,4 @@ --#!/usr/bin/env bash -+#!/bin/sh - - #regen on bbot releases would screw with version - if [ "x${BUILDBOT_RELEASE}" != "x" ] ; then -@@ -14,6 +14,7 @@ - REV_TEMPLATE="@SPRINGLOBBY_REV@" - - #don't fail if no .git -+exit 0 - git branch &> /dev/null || exit 0 - - REV="$(git describe --tags)" diff --git a/games/springlobby/pkg-plist b/games/springlobby/pkg-plist index 697473414057..df3de02754e3 100644 --- a/games/springlobby/pkg-plist +++ b/games/springlobby/pkg-plist @@ -1,5 +1,4 @@ bin/springlobby -bin/springsettings share/applications/springlobby.desktop share/icons/hicolor/scalable/apps/springlobby.svg %%NLS%%share/locale/ar/LC_MESSAGES/springlobby.mo @@ -18,3 +17,4 @@ share/icons/hicolor/scalable/apps/springlobby.svg %%NLS%%share/locale/sv/LC_MESSAGES/springlobby.mo %%NLS%%share/locale/uk/LC_MESSAGES/springlobby.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/springlobby.mo +share/metainfo/springlobby.appdata.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203141507.22EF7JRh079831>