From c07a2b3d81f21f18988b77e25d1a545085393424 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sat, 26 Jun 2021 20:34:11 -0700 Subject: [PATCH] games/emptyepsilon: Update 2021.03.31 -> 2021.06.23; Add licence for the AngryFly pack The AngryFly pack license is not open source, but it doesn't prevent packaging. --- games/emptyepsilon/Makefile | 19 +++-- games/emptyepsilon/distinfo | 10 +-- games/emptyepsilon/files/patch-CMakeLists.txt | 77 +++++++++++++------ .../files/patch-src_packResourceProvider.cpp | 6 +- games/emptyepsilon/pkg-plist | 70 ++++++++++++----- 5 files changed, 124 insertions(+), 58 deletions(-) diff --git a/games/emptyepsilon/Makefile b/games/emptyepsilon/Makefile index 99567c6c32f7..b5f078a73f53 100644 --- a/games/emptyepsilon/Makefile +++ b/games/emptyepsilon/Makefile @@ -2,19 +2,24 @@ PORTNAME= emptyepsilon DISTVERSIONPREFIX= EE- -DISTVERSION= 2021.03.31 -PORTREVISION= 1 +DISTVERSION= 2021.06.23 CATEGORIES= games MAINTAINER= yuri@FreeBSD.org COMMENT= Spaceship bridge simulator game -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= GPLv2 AngryFly-Royalty-Free-License +LICENSE_COMB= multi +LICENSE_NAME_AngryFly-Royalty-Free-License= AngryFly Royalty-Free-License +LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE +LICENSE_FILE_AngryFly-Royalty-Free-License= ${WRKSRC}/packs/License.txt +LICENSE_PERMS_AngryFly-Royalty-Free-License= auto-accept dist-mirror pkg-mirror +BUILD_DEPENDS= glm>0:math/glm LIB_DEPENDS= libsfml-system.so:devel/sfml +RUN_DEPENDS= xclip:x11/xclip -USES= cmake compiler:c++11-lib gl xorg +USES= cmake compiler:c++11-lib gl localbase xorg USE_GL= gl glu USE_GITHUB= yes @@ -26,10 +31,10 @@ CMAKE_ARGS= -DSERIOUS_PROTON_DIR="${WRKSRC_sproton}/" post-patch: @${REINPLACE_CMD} -e 's|basepath + |"${DATADIR}/" + basepath + |' \ ${WRKSRC_sproton}/src/resources.cpp - @${REINPLACE_CMD} -e 's|loadFromFile("resources/"|loadFromFile("${DATADIR}/resources/"|' \ - ${WRKSRC_sproton}/src/postProcessManager.cpp @${REINPLACE_CMD} -e 's|uint32_t bswap32(uint32_t value)|uint32_t bswap32_(uint32_t value)|' \ ${WRKSRC_sproton}/src/i18n.cpp + # app uses xclip to read clipboard, ifdef and path need to be corrected + @${REINPLACE_CMD} -e 's,defined(__APPLE__),& || defined(__FreeBSD__), ; s,"/usr/bin/xclip ,"${PREFIX}/bin/xclip ,' ${WRKSRC_sproton}/src/clipboard.cpp post-install: @${MV} ${STAGEDIR}${PREFIX}/bin/EmptyEpsilon ${STAGEDIR}${PREFIX}/bin/emptyepsilon diff --git a/games/emptyepsilon/distinfo b/games/emptyepsilon/distinfo index 3b1e69db5b5f..67ba27d1759e 100644 --- a/games/emptyepsilon/distinfo +++ b/games/emptyepsilon/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1619211293 -SHA256 (daid-EmptyEpsilon-EE-2021.03.31_GH0.tar.gz) = c1c4f11fefe1afac6076c795e8785c7507a297ba3f7f2be9ed30c97b1e93cb24 -SIZE (daid-EmptyEpsilon-EE-2021.03.31_GH0.tar.gz) = 281047976 -SHA256 (daid-SeriousProton-EE-2021.03.31_GH0.tar.gz) = 62ab03dc904bd10f017fff338e55ec97c86f0bc3903a18d6c44285b86776a2d7 -SIZE (daid-SeriousProton-EE-2021.03.31_GH0.tar.gz) = 1175190 +TIMESTAMP = 1624569629 +SHA256 (daid-EmptyEpsilon-EE-2021.06.23_GH0.tar.gz) = 878f36330a95a76039671a980a2fd680e7ddbdc5e22ff6ca046010b03d3efd01 +SIZE (daid-EmptyEpsilon-EE-2021.06.23_GH0.tar.gz) = 285211647 +SHA256 (daid-SeriousProton-EE-2021.06.23_GH0.tar.gz) = 4c79b358ad310c773dd0db265393fba829df10a6f284240acbb383288d4f33d5 +SIZE (daid-SeriousProton-EE-2021.06.23_GH0.tar.gz) = 1181117 diff --git a/games/emptyepsilon/files/patch-CMakeLists.txt b/games/emptyepsilon/files/patch-CMakeLists.txt index a3773917c061..99a499e8de10 100644 --- a/games/emptyepsilon/files/patch-CMakeLists.txt +++ b/games/emptyepsilon/files/patch-CMakeLists.txt @@ -1,47 +1,80 @@ ---- CMakeLists.txt.orig 2021-03-16 13:36:34 UTC +--- CMakeLists.txt.orig 2021-06-23 12:12:02 UTC +++ CMakeLists.txt -@@ -536,25 +536,25 @@ else() - install(TARGETS ${EXECUTABLE_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR}) +@@ -106,18 +106,20 @@ if(WITH_DISCORD) + endif() + + # GLM +-set(GLM_BASE_PATH "${EXTERNALS_DIR}") ++#set(GLM_BASE_PATH "${EXTERNALS_DIR}") ++# ++#if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt") ++# set(GLM_ZIP "${DOWNLOADS_DIR}/glm.zip") ++# file(DOWNLOAD "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip" "${GLM_ZIP}" TIMEOUT 60 TLS_VERIFY ON) ++# ++# file(MAKE_DIRECTORY "${GLM_BASE_PATH}/glm") ++# execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${GLM_ZIP}" WORKING_DIRECTORY "${GLM_BASE_PATH}") ++#endif() ++# ++#add_subdirectory("${GLM_BASE_PATH}/glm" "${PROJECT_BINARY_DIR}/glm" EXCLUDE_FROM_ALL) + +-if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt") +- set(GLM_ZIP "${DOWNLOADS_DIR}/glm.zip") +- file(DOWNLOAD "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip" "${GLM_ZIP}" TIMEOUT 60 TLS_VERIFY ON) ++find_package(glm REQUIRED) + +- file(MAKE_DIRECTORY "${GLM_BASE_PATH}/glm") +- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${GLM_ZIP}" WORKING_DIRECTORY "${GLM_BASE_PATH}") +-endif() +- +-add_subdirectory("${GLM_BASE_PATH}/glm" "${PROJECT_BINARY_DIR}/glm" EXCLUDE_FROM_ALL) +- + set(SOURCES + src/main.cpp + src/threatLevelEstimate.cpp +@@ -400,26 +402,26 @@ if(WITH_DISCORD) + install(PROGRAMS "$" DESTINATION "${discord_install_prefix}/plugins") endif() -find_package(PythonInterp) -if(PYTHONINTERP_FOUND) -- add_custom_command( -- OUTPUT ${CMAKE_BINARY_DIR}/script_reference.html -- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/compile_script_docs.py ${CMAKE_BINARY_DIR}/script_reference.html -- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} +- set(SCRIPT_REFERENCE_HTML "${PROJECT_BINARY_DIR}/script_reference.html") +- add_custom_command( +- OUTPUT "${SCRIPT_REFERENCE_HTML}" +- COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/compile_script_docs.py "${SCRIPT_REFERENCE_HTML}" +- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - COMMENT "Building script reference documentation.") -- add_custom_target(script_reference ALL DEPENDS ${CMAKE_BINARY_DIR}/script_reference.html) +- add_custom_target(script_reference ALL DEPENDS "${SCRIPT_REFERENCE_HTML}") - - # Matches install logic above. - if(WIN32) -- install(FILES ${CMAKE_BINARY_DIR}/script_reference.html DESTINATION .) +- install(FILES "${SCRIPT_REFERENCE_HTML}" DESTINATION . OPTIONAL) - elseif(APPLE) -- install(FILES ${CMAKE_BINARY_DIR}/script_reference.html DESTINATION "EmptyEpsilon.app/Contents/Resources") +- install(FILES "${SCRIPT_REFERENCE_HTML}" DESTINATION "$/Resources" OPTIONAL) - elseif(NOT ANDROID) -- # DOCDIR already has PROJECT_NAME (EmptyEpsilon) appended (from CMake docs) -- install(FILES ${CMAKE_BINARY_DIR}/script_reference.html DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}") +- # DOCDIR already has PROJECT_NAME (EmptyEpsilon) appended (from CMake docs) +- install(FILES "${SCRIPT_REFERENCE_HTML}" DESTINATION "${CMAKE_INSTALL_DOCDIR}" OPTIONAL) - endif() -endif() +#find_package(PythonInterp) +#if(PYTHONINTERP_FOUND) -+# add_custom_command( -+# OUTPUT ${CMAKE_BINARY_DIR}/script_reference.html -+# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/compile_script_docs.py ${CMAKE_BINARY_DIR}/script_reference.html -+# WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ++# set(SCRIPT_REFERENCE_HTML "${PROJECT_BINARY_DIR}/script_reference.html") ++# add_custom_command( ++# OUTPUT "${SCRIPT_REFERENCE_HTML}" ++# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/compile_script_docs.py "${SCRIPT_REFERENCE_HTML}" ++# WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} +# COMMENT "Building script reference documentation.") -+# add_custom_target(script_reference ALL DEPENDS ${CMAKE_BINARY_DIR}/script_reference.html) ++# add_custom_target(script_reference ALL DEPENDS "${SCRIPT_REFERENCE_HTML}") +# +# # Matches install logic above. +# if(WIN32) -+# install(FILES ${CMAKE_BINARY_DIR}/script_reference.html DESTINATION .) ++# install(FILES "${SCRIPT_REFERENCE_HTML}" DESTINATION . OPTIONAL) +# elseif(APPLE) -+# install(FILES ${CMAKE_BINARY_DIR}/script_reference.html DESTINATION "EmptyEpsilon.app/Contents/Resources") ++# install(FILES "${SCRIPT_REFERENCE_HTML}" DESTINATION "$/Resources" OPTIONAL) +# elseif(NOT ANDROID) -+# # DOCDIR already has PROJECT_NAME (EmptyEpsilon) appended (from CMake docs) -+# install(FILES ${CMAKE_BINARY_DIR}/script_reference.html DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}") ++# # DOCDIR already has PROJECT_NAME (EmptyEpsilon) appended (from CMake docs) ++# install(FILES "${SCRIPT_REFERENCE_HTML}" DESTINATION "${CMAKE_INSTALL_DOCDIR}" OPTIONAL) +# endif() +#endif() add_custom_target(update_locale - COMMAND sed -i "/^#: /d" resources/locale/en.po + COMMAND xgettext --keyword=tr:1c,2 --keyword=tr:1 --keyword=trMark:1c,2 --keyword=trMark:1 --omit-header -d resources/locale/main.en ${SOURCES} diff --git a/games/emptyepsilon/files/patch-src_packResourceProvider.cpp b/games/emptyepsilon/files/patch-src_packResourceProvider.cpp index 05f793f15f22..c9f98967aa97 100644 --- a/games/emptyepsilon/files/patch-src_packResourceProvider.cpp +++ b/games/emptyepsilon/files/patch-src_packResourceProvider.cpp @@ -1,11 +1,11 @@ ---- src/packResourceProvider.cpp.orig 2016-08-31 19:10:48 UTC +--- src/packResourceProvider.cpp.orig 2021-06-23 12:12:02 UTC +++ src/packResourceProvider.cpp @@ -5,7 +5,7 @@ - #ifdef __WIN32__ + #ifdef _WIN32 #include #else -#include +#include #endif - static inline int readInt(FILE* f) + #ifdef _MSC_VER diff --git a/games/emptyepsilon/pkg-plist b/games/emptyepsilon/pkg-plist index b99ed151b3bc..3060d51a14e9 100644 --- a/games/emptyepsilon/pkg-plist +++ b/games/emptyepsilon/pkg-plist @@ -127,11 +127,11 @@ bin/emptyepsilon %%DATADIR%%/resources/gui/icons/weapon-nuke.png %%DATADIR%%/resources/half_sphere.obj %%DATADIR%%/resources/laser.wav -%%DATADIR%%/resources/locale/cz.po -%%DATADIR%%/resources/locale/de.po -%%DATADIR%%/resources/locale/en.po -%%DATADIR%%/resources/locale/fr.po -%%DATADIR%%/resources/locale/it.po +%%DATADIR%%/resources/locale/main.cz.po +%%DATADIR%%/resources/locale/main.de.po +%%DATADIR%%/resources/locale/main.en.po +%%DATADIR%%/resources/locale/main.fr.po +%%DATADIR%%/resources/locale/main.it.po %%DATADIR%%/resources/locale/tutorial.cz.po %%DATADIR%%/resources/locale/tutorial.en.po %%DATADIR%%/resources/locale/tutorial.fr.po @@ -176,6 +176,15 @@ bin/emptyepsilon %%DATADIR%%/resources/radar_blockade.png %%DATADIR%%/resources/radar_cruiser.png %%DATADIR%%/resources/radar_dread.png +%%DATADIR%%/resources/radar_exuari_1.png +%%DATADIR%%/resources/radar_exuari_2.png +%%DATADIR%%/resources/radar_exuari_3.png +%%DATADIR%%/resources/radar_exuari_4.png +%%DATADIR%%/resources/radar_exuari_5.png +%%DATADIR%%/resources/radar_exuari_fighter.png +%%DATADIR%%/resources/radar_exuari_frigate_1.png +%%DATADIR%%/resources/radar_exuari_frigate_2.png +%%DATADIR%%/resources/radar_exuari_frigate_3.png %%DATADIR%%/resources/radar_fighter.png %%DATADIR%%/resources/radar_ktlitan_breaker.png %%DATADIR%%/resources/radar_ktlitan_destroyer.png @@ -199,18 +208,6 @@ bin/emptyepsilon %%DATADIR%%/resources/redicule2.png %%DATADIR%%/resources/room_background.png %%DATADIR%%/resources/room_door.png -%%DATADIR%%/resources/sa_51_Fordina.ogg -%%DATADIR%%/resources/sa_51_Gremus1.ogg -%%DATADIR%%/resources/sa_51_Gremus2.ogg -%%DATADIR%%/resources/sa_51_Gremus3.ogg -%%DATADIR%%/resources/sa_51_Gremus4.ogg -%%DATADIR%%/resources/sa_51_Gremus5.ogg -%%DATADIR%%/resources/sa_51_Gremus6.ogg -%%DATADIR%%/resources/sa_51_Gremus7.ogg -%%DATADIR%%/resources/sa_51_Michael.ogg -%%DATADIR%%/resources/sa_51_Protocol.ogg -%%DATADIR%%/resources/sa_51_Sentry1.ogg -%%DATADIR%%/resources/sa_51_Sentry2.ogg %%DATADIR%%/resources/sa_54_AuthMBBreak.wav %%DATADIR%%/resources/sa_54_AuthMBDefend.wav %%DATADIR%%/resources/sa_54_AuthMBVictory.wav @@ -370,6 +367,30 @@ bin/emptyepsilon %%DATADIR%%/resources/scenario48audio/sa_48_Tracy12.ogg %%DATADIR%%/resources/scenario48audio/sa_48_Tracy13.ogg %%DATADIR%%/resources/scenario48audio/sa_48_Tracy14.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Fordina.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Fordina_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus1.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus1_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus2.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus2_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus3.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus3_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus4.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus4_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus5.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus5_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus6.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus6_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus7.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Gremus7_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Michael.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Michael_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Protocol.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Protocol_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Sentry1.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Sentry1_fr.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Sentry2.ogg +%%DATADIR%%/resources/scenariosSounds/51_deliverAmbassador/sa_51_Sentry2_fr.ogg %%DATADIR%%/resources/sfx/emp_explosion.wav %%DATADIR%%/resources/sfx/engine.wav %%DATADIR%%/resources/sfx/engine_fighter.wav @@ -382,12 +403,8 @@ bin/emptyepsilon %%DATADIR%%/resources/shaders/basic.vert %%DATADIR%%/resources/shaders/basicColor.frag %%DATADIR%%/resources/shaders/basicColor.vert -%%DATADIR%%/resources/shaders/basicShader.frag -%%DATADIR%%/resources/shaders/basicShader.vert %%DATADIR%%/resources/shaders/billboard.frag %%DATADIR%%/resources/shaders/billboard.vert -%%DATADIR%%/resources/shaders/billboardShader.frag -%%DATADIR%%/resources/shaders/billboardShader.vert %%DATADIR%%/resources/shaders/glitch.frag %%DATADIR%%/resources/shaders/objectShaderB.frag %%DATADIR%%/resources/shaders/objectShaderB.vert @@ -425,11 +442,19 @@ bin/emptyepsilon %%DATADIR%%/scripts/comms_supply_drop.lua %%DATADIR%%/scripts/ee.lua %%DATADIR%%/scripts/factionInfo.lua +%%DATADIR%%/scripts/locale/scenario_01_quick_basic.en.po +%%DATADIR%%/scripts/locale/scenario_01_quick_basic.fr.po %%DATADIR%%/scripts/locale/scenario_03_waves.en.po +%%DATADIR%%/scripts/locale/scenario_03_waves.fr.po %%DATADIR%%/scripts/locale/scenario_05_beacon.en.po %%DATADIR%%/scripts/locale/scenario_05_beacon.fr.po %%DATADIR%%/scripts/locale/scenario_06_edgeofspace.en.po %%DATADIR%%/scripts/locale/scenario_06_edgeofspace.fr.po +%%DATADIR%%/scripts/locale/scenario_07_gftp.en.po +%%DATADIR%%/scripts/locale/scenario_08_atlantis.en.po +%%DATADIR%%/scripts/locale/scenario_51_deliverAmbassador.en.po +%%DATADIR%%/scripts/locale/scenario_53_escape.en.po +%%DATADIR%%/scripts/locale/scenario_62_whatTheDickens.en.po %%DATADIR%%/scripts/luax.lua %%DATADIR%%/scripts/model_data.lua %%DATADIR%%/scripts/perlin_noise.lua @@ -442,6 +467,7 @@ bin/emptyepsilon %%DATADIR%%/scripts/scenario_07_gftp.lua %%DATADIR%%/scripts/scenario_08_atlantis.lua %%DATADIR%%/scripts/scenario_10_empty.lua +%%DATADIR%%/scripts/scenario_20_training1.lua %%DATADIR%%/scripts/scenario_47_scavenger.lua %%DATADIR%%/scripts/scenario_48_visitors.lua %%DATADIR%%/scripts/scenario_49_allies.lua @@ -463,6 +489,7 @@ bin/emptyepsilon %%DATADIR%%/scripts/shipTemplates.lua %%DATADIR%%/scripts/shipTemplates_Corvette.lua %%DATADIR%%/scripts/shipTemplates_Dreadnaught.lua +%%DATADIR%%/scripts/shipTemplates_Exuari.lua %%DATADIR%%/scripts/shipTemplates_Frigates.lua %%DATADIR%%/scripts/shipTemplates_OLD.lua %%DATADIR%%/scripts/shipTemplates_StarFighters.lua @@ -477,3 +504,4 @@ bin/emptyepsilon %%DATADIR%%/scripts/tutorial_06_relay.lua %%DATADIR%%/scripts/util_random_transports.lua %%DATADIR%%/scripts/utils.lua +%%DATADIR%%/scripts/utils_customElements.lua