diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile index 4ca8bf2bc761..16eb5efbffc7 100644 --- a/games/irrlamb/Makefile +++ b/games/irrlamb/Makefile @@ -1,53 +1,52 @@ PORTNAME= irrlamb DISTVERSIONPREFIX= v -DISTVERSION= 1.0.3 -PORTREVISION= 4 +DISTVERSION= 1.0.5 CATEGORIES= games DIST_SUBDIR= ${PORTNAME} MAINTAINER= amdmi3@FreeBSD.org COMMENT= 3D physics-based puzzle game WWW= https://gitlab.com/irrlamb/code LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreetype.so:print/freetype2 \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ libpng.so:graphics/png \ libtinyxml2.so:textproc/tinyxml2 \ libIrrlicht.so:x11-toolkits/irrlicht \ libode.so:devel/ode \ libccd.so:math/libccd BUILD_DEPENDS= ${LOCALBASE}/include/glm/vec3.hpp:math/glm USES= cmake compiler:c++11-lib gl jpeg openal sqlite xorg lua:53 USE_GITLAB= yes GL_ACCOUNT= irrlamb GL_PROJECT= code GL_TUPLE= jazztickets:cmake:486362ce74eaf6b26067576a8b6b03dcad27a7a5:cmake/cmake USE_XORG= x11 xrandr xext xxf86vm USE_GL= gl CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" LDFLAGS_i386= -Wl,-znotext CXXFLAGS+= -DGLM_ENABLE_EXPERIMENTAL # GLM_GTX_rotate_vector is an experimental extension PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS post-extract: .for bundled in glm irrlicht libccd lua tinyxml2 ode @${RM} -r ${WRKSRC}/src/${bundled} .endfor post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/cmake/*.cmake @${REINPLACE_CMD} -e 's|tinyxml2/tinyxml2.h|tinyxml2.h|g' ${WRKSRC}/src/*.cpp @${REINPLACE_CMD} -e 's|share/games|share|g' ${WRKSRC}/deployment/${PORTNAME} .include diff --git a/games/irrlamb/distinfo b/games/irrlamb/distinfo index bd7c7e7d21d6..435f5acbd765 100644 --- a/games/irrlamb/distinfo +++ b/games/irrlamb/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1715015043 -SHA256 (irrlamb/code-v1.0.3.tar.bz2) = 14775ba5b4f9e558fdb2c6ea3ef55a754fa9ffdc8a43ca260eab580d71d1027f -SIZE (irrlamb/code-v1.0.3.tar.bz2) = 38458585 +TIMESTAMP = 1722951064 +SHA256 (irrlamb/code-v1.0.5.tar.bz2) = a417e9decd99f30c0d60467fa669a1741cab04c13c542dd67860518bffb565bc +SIZE (irrlamb/code-v1.0.5.tar.bz2) = 38453848 SHA256 (irrlamb/jazztickets-cmake-486362ce74eaf6b26067576a8b6b03dcad27a7a5_GL0.tar.gz) = 9f80e2f8ed0526c039c7d5a4545c550fd7b5f37e96409c88525f08da6ae82ff1 SIZE (irrlamb/jazztickets-cmake-486362ce74eaf6b26067576a8b6b03dcad27a7a5_GL0.tar.gz) = 10388 diff --git a/games/irrlamb/files/patch-CMakeLists.txt b/games/irrlamb/files/patch-CMakeLists.txt index ca23eebd2f94..1a53e42f1f3c 100644 --- a/games/irrlamb/files/patch-CMakeLists.txt +++ b/games/irrlamb/files/patch-CMakeLists.txt @@ -1,64 +1,63 @@ ---- CMakeLists.txt.orig 2022-06-03 00:15:34 UTC +--- CMakeLists.txt.orig 2024-07-29 16:06:12 UTC +++ CMakeLists.txt -@@ -7,14 +7,14 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/tools") - endif() +@@ -8,13 +8,13 @@ add_definitions(-DGAME_VERSION="1.0.5") # define constants - add_definitions(-DGAME_VERSION="1.0.3") + add_definitions(-DGAME_VERSION="1.0.5") -add_definitions(-D_IRR_STATIC_LIB_) -add_definitions(-DdIDEDOUBLE) -add_definitions(-DCCD_IDEDOUBLE) -add_definitions(-DdTRIMESH_ENABLED) -add_definitions(-DdTRIMESH_OPCODE) -add_definitions(-DdLIBCCD_ENABLED) -add_definitions(-DdLIBCCD_CYL_CYL) +#add_definitions(-D_IRR_STATIC_LIB_) +#add_definitions(-DdIDEDOUBLE) +#add_definitions(-DCCD_IDEDOUBLE) +#add_definitions(-DdTRIMESH_ENABLED) +#add_definitions(-DdTRIMESH_OPCODE) +#add_definitions(-DdLIBCCD_ENABLED) +#add_definitions(-DdLIBCCD_CYL_CYL) # add extra find modules set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}") -@@ -53,6 +53,14 @@ include_directories(${X11_Xrandr_INCLUDE_PATH}) +@@ -53,6 +53,14 @@ include_directories(${X11_xf86vmode_INCLUDE_PATH}) include_directories(${X11_X11_INCLUDE_PATH}) include_directories(${X11_xf86vmode_INCLUDE_PATH}) +# unbundled libs +include_directories($ENV{LOCALBASE}/include) +set(EXTRA_LIBS ${EXTRA_LIBS} $ENV{LOCALBASE}/lib/libtinyxml2.so) +set(EXTRA_LIBS ${EXTRA_LIBS} $ENV{LOCALBASE}/lib/libIrrlicht.so) +include_directories($ENV{LOCALBASE}/include/irrlicht) +set(EXTRA_LIBS ${EXTRA_LIBS} $ENV{LOCALBASE}/lib/liblua-5.3.so) +set(EXTRA_LIBS ${EXTRA_LIBS} $ENV{LOCALBASE}/lib/libode.so) + # pandora devices if(PANDORA) add_definitions("-DPANDORA") -@@ -127,15 +135,15 @@ if(WIN32) +@@ -127,15 +135,15 @@ else() else() # linux installation - install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/fonts DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/levels DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/meshes DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/scripts DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/shaders DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/sounds DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/textures DESTINATION share/games/${CMAKE_PROJECT_NAME}) - install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/ui DESTINATION share/games/${CMAKE_PROJECT_NAME}) + install(TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/fonts DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/levels DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/meshes DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/scripts DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/shaders DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/sounds DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/textures DESTINATION share/${CMAKE_PROJECT_NAME}) + install(DIRECTORY ${PROJECT_SOURCE_DIR}/working/ui DESTINATION share/${CMAKE_PROJECT_NAME}) install(FILES ${PROJECT_SOURCE_DIR}/deployment/${CMAKE_PROJECT_NAME}.png DESTINATION share/icons/hicolor/256x256/apps) install(FILES ${PROJECT_SOURCE_DIR}/deployment/${CMAKE_PROJECT_NAME}.desktop DESTINATION share/applications) install(FILES ${PROJECT_SOURCE_DIR}/deployment/${CMAKE_PROJECT_NAME}.xml DESTINATION share/metainfo)