Here's an update for games/irrlamb, which now no longer uses
devel/bullet. It has an internal copy of Irrlicht, but working around
this to use the version from ports seems to not create any issues.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/irrlamb/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 12 Jul 2019 20:46:19 -0000 1.12
+++ Makefile 30 Dec 2021 15:36:07 -0000
@@ -1,43 +1,42 @@
# $OpenBSD: Makefile,v 1.12 2019/07/12 20:46:19 sthen Exp $
-V = 0.2.1
+V = 1.0.1
COMMENT = third person, 3D physics game
-DISTNAME = irrlamb-$V-src
+DISTNAME = irrlamb-$Vr613-src
PKGNAME = irrlamb-$V
CATEGORIES = games x11
-REVISION = 2
# GPLv3+
PERMIT_PACKAGE = Yes
-WANTLIB += BulletCollision BulletDynamics BulletSoftBody Irrlicht
-WANTLIB += X11 Xext Xrandr Xxf86vm freetype ogg sqlite3 vorbis
-WANTLIB += LinearMath c m openal vorbisfile
-WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
+WANTLIB += ${COMPILER_LIBCXX} GL GLU Irrlicht X11 Xext Xrandr
+WANTLIB += Xxf86vm c freetype jpeg m ogg openal png sqlite3 vorbis
+WANTLIB += vorbisfile z
MASTER_SITES = https://github.com/jazztickets/irrlamb/releases/download/v$V/
-MODULES = devel/cmake \
- lang/lua
-MODLUA_VERSION = 5.3
+MODULES = devel/cmake
COMPILER = base-clang ports-gcc
LIB_DEPENDS = audio/libvorbis \
audio/openal \
databases/sqlite3 \
- devel/bullet \
x11/irrlicht
RUN_DEPENDS = devel/desktop-file-utils
-WRKDIST = ${WRKDIR}/irrlamb-$V
+WRKDIST = ${WRKDIR}/irrlamb-$Vr613
NO_TEST = Yes
+post-extract:
+ rm -rf ${WRKSRC}/src/irrlicht
+
post-patch:
sed -i -e "s,games/,,g" ${WRKSRC}/CMakeLists.txt \
${WRKSRC}/deployment/irrlamb
sed -i -e "s,games,bin,g" ${WRKSRC}/CMakeLists.txt
+ ${SUBST_CMD} ${WRKSRC}/CMakeLists.txt
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/irrlamb/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 3 Nov 2017 21:08:47 -0000 1.3
+++ distinfo 30 Dec 2021 15:36:07 -0000
@@ -1,2 +1,2 @@
-SHA256 (irrlamb-0.2.1-src.tar.gz) = 5G+hzMjpkbOPyrO2ontnBsPBVRUD3wHJZd0oOMcWGiI=
-SIZE (irrlamb-0.2.1-src.tar.gz) = 3230205
+SHA256 (irrlamb-1.0.1r613-src.tar.gz) = i7fUmkHFcXD0EExkF2+XWYa5lkZ1Lyl0mkodq9cCdQo=
+SIZE (irrlamb-1.0.1r613-src.tar.gz) = 17654369
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 30 Dec 2021 15:36:07 -0000
@@ -0,0 +1,55 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -29,7 +29,6 @@ if(WIN32)
+ elseif(UNIX)
+ add_definitions(-DPLATFORM=0)
+ add_definitions(-DLUA_USE_LINUX)
+- set(EXTRA_LIBS ${EXTRA_LIBS} dl)
+ endif()
+
+ # compiler flags
+@@ -72,7 +71,7 @@ find_package(Threads REQUIRED)
+
+ # include paths
+ include_directories("src")
+-include_directories("src/irrlicht/include")
++include_directories("${LOCALBASE}/include/irrlicht")
+ include_directories("src/OPCODE")
+ include_directories("src/libccd")
+ include_directories("src/libccd/custom")
+@@ -98,6 +97,7 @@ add_executable(${CMAKE_PROJECT_NAME} ${SRC_ALL})
+
+ # link libraries
+ target_link_libraries(${CMAKE_PROJECT_NAME}
++ Irrlicht
+ ${OPENGL_LIBRARIES}
+ ${FREETYPE_LIBRARIES}
+ ${OPENAL_LIBRARY}
+@@ -115,15 +115,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})
Index: patches/patch-src_font_irrUString_h
===================================================================
RCS file: patches/patch-src_font_irrUString_h
diff -N patches/patch-src_font_irrUString_h
--- patches/patch-src_font_irrUString_h 28 Dec 2017 22:32:21 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,175 +0,0 @@
-$OpenBSD: patch-src_font_irrUString_h,v 1.1 2017/12/28 22:32:21 bentley Exp $
-
-Index: src/font/irrUString.h
---- src/font/irrUString.h.orig
-+++ src/font/irrUString.h
-@@ -37,6 +37,7 @@
- # endif
-
No comments:
Post a Comment