git: 7be7ae811ee6 - main - games/irrlamb: update to 1.0.1

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dmitry Marakasov <amdmi3_at_FreeBSD.org>
Date: Thu, 16 Dec 2021 14:09:33 UTC
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7be7ae811ee6f1394fb22e6b86bfea27613627ec

commit 7be7ae811ee6f1394fb22e6b86bfea27613627ec
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2021-12-16 14:07:41 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2021-12-16 14:08:01 +0000

    games/irrlamb: update to 1.0.1
---
 games/irrlamb/Makefile                        | 33 ++++++++-----
 games/irrlamb/distinfo                        |  7 ++-
 games/irrlamb/files/patch-CMakeLists.txt      | 69 +++++++++++++++++++++++++++
 games/irrlamb/files/patch-cmake_version.cmake | 11 +++++
 games/irrlamb/files/patch-src_scripting.h     | 11 +++++
 5 files changed, 118 insertions(+), 13 deletions(-)

diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index b1db2618d293..b811af2d3a17 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	irrlamb
-PORTVERSION=	0.2.1
-PORTREVISION=	8
+PORTVERSION=	1.0.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
@@ -10,19 +9,25 @@ COMMENT=	3D physics-based puzzle game
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		not build with Bullet3.
-
-LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
-		libIrrlicht.so:x11-toolkits/irrlicht \
+LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
-		libfreetype.so:print/freetype2 \
-		libBulletCollision.so:devel/bullet
+		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 lua:53 openal
+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
 
@@ -35,8 +40,14 @@ PLIST_FILES=	bin/irrlamb \
 
 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|share/games|share|g' ${WRKSRC}/CMakeLists.txt \
-		${WRKSRC}/deployment/${PORTNAME}
+	@${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 <bsd.port.mk>
diff --git a/games/irrlamb/distinfo b/games/irrlamb/distinfo
index bbfd47df7643..eb2d02529f03 100644
--- a/games/irrlamb/distinfo
+++ b/games/irrlamb/distinfo
@@ -1,2 +1,5 @@
-SHA256 (jazztickets-irrlamb-v0.2.1_GH0.tar.gz) = 17b402e3a5cd203fa88c22c9d266ec7fe4f147781b0fc35470c859d945e323e3
-SIZE (jazztickets-irrlamb-v0.2.1_GH0.tar.gz) = 13500336
+TIMESTAMP = 1639566542
+SHA256 (jazztickets-irrlamb-v1.0.1_GH0.tar.gz) = 29edba47d41fc8536bb2c993918439587492499bffa3f9ad1d5f419ccfd720e0
+SIZE (jazztickets-irrlamb-v1.0.1_GH0.tar.gz) = 37821308
+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
new file mode 100644
index 000000000000..29e6d6a01216
--- /dev/null
+++ b/games/irrlamb/files/patch-CMakeLists.txt
@@ -0,0 +1,69 @@
+--- CMakeLists.txt.orig	2019-05-11 14:28:25 UTC
++++ CMakeLists.txt
+@@ -1,19 +1,14 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
+-# 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(-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)
+@@ -44,6 +39,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)
+ 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}/CHANGELOG DESTINATION share/doc/${CMAKE_PROJECT_NAME})
diff --git a/games/irrlamb/files/patch-cmake_version.cmake b/games/irrlamb/files/patch-cmake_version.cmake
new file mode 100644
index 000000000000..d17193d0026a
--- /dev/null
+++ b/games/irrlamb/files/patch-cmake_version.cmake
@@ -0,0 +1,11 @@
+--- cmake/version.cmake.orig	2017-10-13 23:15:05 UTC
++++ cmake/version.cmake
+@@ -1,7 +1,4 @@
+-execute_process(COMMAND git log --oneline COMMAND wc -l OUTPUT_VARIABLE BUILD_NUMBER OUTPUT_STRIP_TRAILING_WHITESPACE)
+-if(BUILD_NUMBER STREQUAL "")
+-	set(BUILD_NUMBER 0)
+-endif()
++set(BUILD_NUMBER 0)
+ 
+ configure_file(
+ 	"${SRC}"
diff --git a/games/irrlamb/files/patch-src_scripting.h b/games/irrlamb/files/patch-src_scripting.h
new file mode 100644
index 000000000000..484e903615e9
--- /dev/null
+++ b/games/irrlamb/files/patch-src_scripting.h
@@ -0,0 +1,11 @@
+--- src/scripting.h.orig	2019-05-11 14:28:25 UTC
++++ src/scripting.h
+@@ -16,7 +16,7 @@
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *******************************************************************************/
+ #pragma once
+-#include <lua/lua.hpp>
++#include <lua53/lua.hpp>
+ #include <list>
+ #include <string>
+ #include <map>