diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile index b811af2d3a17..198f03e90f20 100644 --- a/games/irrlamb/Makefile +++ b/games/irrlamb/Makefile @@ -1,53 +1,53 @@ PORTNAME= irrlamb -PORTVERSION= 1.0.1 +PORTVERSION= 1.0.2 DISTVERSIONPREFIX= v CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= 3D physics-based puzzle game LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libfreetype.so:print/freetype2 \ libvorbis.so:audio/libvorbis \ libogg.so:audio/libogg \ libsqlite3.so:databases/sqlite3 \ 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 USE_GITHUB= yes GH_ACCOUNT= jazztickets GH_TUPLE:= ${GH_ACCOUNT}:cmake:6e3586a:cmake/cmake USES= cmake compiler:c++11-lib gl jpeg openal xorg lua:53 USE_XORG= x11 xrandr xext xxf86vm USE_GL= gl CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" LDFLAGS_i386= -Wl,-znotext PORTDOCS= * PORTDATA= * PLIST_FILES= bin/irrlamb \ share/applications/irrlamb.desktop \ - share/pixmaps/irrlamb.png + share/icons/hicolor/256x256/apps/irrlamb.png 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 eb2d02529f03..798e8d791564 100644 --- a/games/irrlamb/distinfo +++ b/games/irrlamb/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1639566542 -SHA256 (jazztickets-irrlamb-v1.0.1_GH0.tar.gz) = 29edba47d41fc8536bb2c993918439587492499bffa3f9ad1d5f419ccfd720e0 -SIZE (jazztickets-irrlamb-v1.0.1_GH0.tar.gz) = 37821308 +TIMESTAMP = 1653524155 +SHA256 (jazztickets-irrlamb-v1.0.2_GH0.tar.gz) = 7db4368848145a1993293adbf8719ac6a2cdff8538cbe264a2aaedef06d8f9bd +SIZE (jazztickets-irrlamb-v1.0.2_GH0.tar.gz) = 39972531 SHA256 (jazztickets-cmake-6e3586a_GH0.tar.gz) = 2f25931465584c783c1d357a9c544a46cea2d23a147ccb5519ace726723f101f SIZE (jazztickets-cmake-6e3586a_GH0.tar.gz) = 10818 diff --git a/games/irrlamb/files/patch-CMakeLists.txt b/games/irrlamb/files/patch-CMakeLists.txt index 6c895b34188c..2fbcc3f1e65e 100644 --- a/games/irrlamb/files/patch-CMakeLists.txt +++ b/games/irrlamb/files/patch-CMakeLists.txt @@ -1,78 +1,78 @@ ---- CMakeLists.txt.orig 2019-05-11 14:28:25 UTC +--- CMakeLists.txt.orig 2022-05-23 17:54:07 UTC +++ CMakeLists.txt -@@ -1,19 +1,14 @@ - cmake_minimum_required(VERSION 2.8) +@@ -8,19 +8,14 @@ endif() --# set default build type --if(NOT CMAKE_BUILD_TYPE) -- set(CMAKE_BUILD_TYPE Release) --endif() -- # define constants - add_definitions(-DGAME_VERSION="1.0.1") + add_definitions(-DGAME_VERSION="1.0.2") -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) - # projects - project(irrlamb) -@@ -33,7 +28,7 @@ elseif(UNIX) +-# set default build type +-if(NOT CMAKE_BUILD_TYPE) +- set(CMAKE_BUILD_TYPE Release) +-endif() +- + # add extra find modules + set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}") + +@@ -39,7 +34,7 @@ elseif(UNIX) endif() # compiler flags -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations -pedantic -std=gnu++11 -msse -mfpmath=sse") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-deprecated-declarations -pedantic -std=gnu++11") set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DdNODEBUG -s") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DdNODEBUG -s") -@@ -44,6 +39,14 @@ include_directories(${X11_Xrandr_INCLUDE_PATH}) +@@ -50,6 +45,14 @@ include_directories(${X11_Xrandr_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") -@@ -115,15 +118,15 @@ if(WIN32) +@@ -124,15 +127,15 @@ if(WIN32) 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/irrlamb.png DESTINATION share/pixmaps) - install(FILES ${PROJECT_SOURCE_DIR}/deployment/irrlamb.desktop DESTINATION share/applications) + 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}/CHANGELOG DESTINATION share/doc/${CMAKE_PROJECT_NAME})