From nobody Thu Dec 16 14:09:33 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D3EC718F627E; Thu, 16 Dec 2021 14:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JFDWd3jy3z54Nc; Thu, 16 Dec 2021 14:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5F5DCFF4; Thu, 16 Dec 2021 14:09:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BGE9X4e050181; Thu, 16 Dec 2021 14:09:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BGE9XLV050180; Thu, 16 Dec 2021 14:09:33 GMT (envelope-from git) Date: Thu, 16 Dec 2021 14:09:33 GMT Message-Id: <202112161409.1BGE9XLV050180@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 7be7ae811ee6 - main - games/irrlamb: update to 1.0.1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7be7ae811ee6f1394fb22e6b86bfea27613627ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639663773; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5IC/6AOY6NqulZ7aqb5ApFiE4CP9lLG2YSTAlftKJiU=; b=ngfYYsAl4aVrLTw/TPlrCjptRwM67rJXI59tWpO13ysx4Z76VpvW2TWI1dEVDzUy6Awyvh +v+KhuP0Z+BzpdJDCHB1TauJxjKPkMGv1FA+uuZ4JXiIAOB9vlRkA71Je0n4MgvTOiCnkD wBmjv9rGO6gRt0KLRxLJDasJ8l/WCTw1J02ddPC4nMUaoUfxHvzM8EITRRfjFVyzrY651x 8QFSRsXDJ5NeKnUA+dqmXRid+ipFI+iF+kuwQChCP5QF5DQSPUusz3rOFNk471LzmJ+b0g bATGpVqXXsmTMVAa2j/b5ixVxhy9qo/4prbv4qg18D+vWwWVB00FMbDTGNL5FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639663773; a=rsa-sha256; cv=none; b=DSCoJJIHfh4Ihrhg+a5TH57nZbgFp52bFD3S0TWbIb/g5f8FEa63J7Np/ePg15yOpNe0xu A7WBEZoxzIFri8iT4oHh6MzuykIzAU3aWblM3idn+lUGl17vLNoCUwkh4lEZZ/jEySyNLE jAvSLDtNaeL5qI0/p5StTUcOC6vEzSthcsOx2+/9gLXioVydUiiElBtBOtSjvHndxTH7Eg 72A4FLec8Vk7oem7Rf/R1YtkZ1znBwSL7D+r3UsVCtJu0MM/7c4ZkCB9Oe6gRxYIxJv/vO +KfnfPUparkSzShk6ysVSyYkdcoxPWyYOWaH5MIFKfyCkq5P7QN0faSOoSoEaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=7be7ae811ee6f1394fb22e6b86bfea27613627ec commit 7be7ae811ee6f1394fb22e6b86bfea27613627ec Author: Dmitry Marakasov AuthorDate: 2021-12-16 14:07:41 +0000 Commit: Dmitry Marakasov 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 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 . + *******************************************************************************/ + #pragma once +-#include ++#include + #include + #include + #include