From a35779e23224117e01f29a921f4094c9d0f34861 Mon Sep 17 00:00:00 2001 From: Thibault Payet Date: Sun, 2 Mar 2025 19:24:24 +0300 Subject: [PATCH] graphics/rigsofrods-pagedgeometry: Update 1.2.0 => 1.2.0.20240708 (latest snapshot) to support graphics/ogre3d 1.11 While here repalce PORTVERSION with DISTVERSION. PR: 285087 --- graphics/rigsofrods-pagedgeometry/Makefile | 6 +-- graphics/rigsofrods-pagedgeometry/distinfo | 5 ++- .../files/patch-CMakeDependenciesConfig.txt | 40 ------------------- graphics/rigsofrods-pagedgeometry/pkg-plist | 1 - 4 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 graphics/rigsofrods-pagedgeometry/files/patch-CMakeDependenciesConfig.txt diff --git a/graphics/rigsofrods-pagedgeometry/Makefile b/graphics/rigsofrods-pagedgeometry/Makefile index a9ea88d8363b..ca4c38d6dd3f 100644 --- a/graphics/rigsofrods-pagedgeometry/Makefile +++ b/graphics/rigsofrods-pagedgeometry/Makefile @@ -1,7 +1,6 @@ PORTNAME= rigsofrods-pagedgeometry -PORTVERSION= 1.2.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 +DISTVERSION= 1.2.0.20240708 CATEGORIES= graphics MAINTAINER= monwarez@mailoo.org @@ -11,7 +10,7 @@ WWW= https://www.ogre3d.org/tikiwiki/PagedGeometry+Engine LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/zlib.txt -LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 +LIB_DEPENDS= libOgreMain.so:graphics/ogre3d USES= cmake dos2unix pathfix pkgconfig DOS2UNIX_GLOB= *.cpp *.h *.txt @@ -19,6 +18,7 @@ USE_CXXSTD= c++14 USE_GITHUB= yes GH_ACCOUNT= RigsOfRods GH_PROJECT= ogre-pagedgeometry +GH_TAGNAME= 428a57a USE_LDCONFIG= yes CMAKE_ARGS= -DPAGEDGEOMETRY_BUILD_SAMPLES=FALSE diff --git a/graphics/rigsofrods-pagedgeometry/distinfo b/graphics/rigsofrods-pagedgeometry/distinfo index 7ecc00d12877..e19eee1e9de6 100644 --- a/graphics/rigsofrods-pagedgeometry/distinfo +++ b/graphics/rigsofrods-pagedgeometry/distinfo @@ -1,2 +1,3 @@ -SHA256 (RigsOfRods-ogre-pagedgeometry-v1.2.0_GH0.tar.gz) = 02f9b73e468e0a6b658cc9cad2b6584f592b1f1e5e5151e1ead6cfc513cf479e -SIZE (RigsOfRods-ogre-pagedgeometry-v1.2.0_GH0.tar.gz) = 11357734 +TIMESTAMP = 1740819559 +SHA256 (RigsOfRods-ogre-pagedgeometry-v1.2.0.20240708-428a57a_GH0.tar.gz) = c808fa9619fde1e7106ddec5111a3be233186441cd3c453e4708d425104ae0ff +SIZE (RigsOfRods-ogre-pagedgeometry-v1.2.0.20240708-428a57a_GH0.tar.gz) = 11466419 diff --git a/graphics/rigsofrods-pagedgeometry/files/patch-CMakeDependenciesConfig.txt b/graphics/rigsofrods-pagedgeometry/files/patch-CMakeDependenciesConfig.txt deleted file mode 100644 index 973594fae503..000000000000 --- a/graphics/rigsofrods-pagedgeometry/files/patch-CMakeDependenciesConfig.txt +++ /dev/null @@ -1,40 +0,0 @@ ---- CMakeDependenciesConfig.txt.orig 2016-01-10 10:54:34 UTC -+++ CMakeDependenciesConfig.txt -@@ -2,11 +2,13 @@ IF(WIN32) - set(Ogre_INCLUDE_DIRS "include/Ogre" CACHE PATH "The ogre include path to use") - set(Ogre_LIBRARY_DIRS "lib" CACHE PATH "The ogre lib path to use") - set(Ogre_LIBRARIES "OgreMain" CACHE STRING "The ogre lib to link against") -+ if(PAGEDGEOMETRY_BUILD_SAMPLES) - set(Ois_INCLUDE_DIRS "include/ois" CACHE PATH "The OIS include path to use") - set(Ois_LIBRARY_DIRS "lib" CACHE PATH "The OIS lib path to use") - set(Ois_LIBRARIES "ois" CACHE STRING "The ogre lib to link against") - # add includes to check directories - set(CMAKE_REQUIRED_INCLUDES ${Ogre_INCLUDE_DIRS} ${Ois_INCLUDE_DIRS}) -+ endif(PAGEDGEOMETRY_BUILD_SAMPLES) - - # check for libs and include files we want to use - CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_INCLUDES) -@@ -22,7 +24,9 @@ ELSEIF(UNIX) - PKG_CHECK_MODULES (Ogre OGRE REQUIRED) - PKG_CHECK_MODULES (Ogre-Terrain OGRE-Terrain REQUIRED) - PKG_CHECK_MODULES (Ogre-Paging OGRE-Paging REQUIRED) -+ if(PAGEDGEOMETRY_BUILD_SAMPLES) - PKG_CHECK_MODULES (Ois OIS REQUIRED) -+ endif(PAGEDGEOMETRY_BUILD_SAMPLES) - # add includes to check directories - set(CMAKE_REQUIRED_INCLUDES ${Ogre_INCLUDE_DIRS} ${Ois_INCLUDE_DIRS}) - # check for libs and include files we want to use -@@ -46,6 +50,7 @@ IF(NOT WIN32) - message("could not find the Ogre includes. Please install them.") - endif() - -+ if(PAGEDGEOMETRY_BUILD_SAMPLES) - CHECK_INCLUDE_FILE_CXX(OIS/OIS.h HAVE_OIS_DIR_INCLUDES) - if(HAVE_OIS_DIR_INCLUDES) - set(OIS_INCLUDE "OIS/OIS.h") -@@ -65,4 +70,5 @@ IF(NOT WIN32) - else() - set(OIS_USING_DIR FALSE) - endif() -+ endif(PAGEDGEOMETRY_BUILD_SAMPLES) - endif() diff --git a/graphics/rigsofrods-pagedgeometry/pkg-plist b/graphics/rigsofrods-pagedgeometry/pkg-plist index ee469d70130a..9e2f26821e63 100644 --- a/graphics/rigsofrods-pagedgeometry/pkg-plist +++ b/graphics/rigsofrods-pagedgeometry/pkg-plist @@ -2,7 +2,6 @@ include/PagedGeometry/BatchPage.h include/PagedGeometry/BatchedGeometry.h include/PagedGeometry/GrassLoader.h include/PagedGeometry/ImpostorPage.h -include/PagedGeometry/MersenneTwister.h include/PagedGeometry/PagedGeometry.h include/PagedGeometry/PagedGeometryConfig.h include/PagedGeometry/PropertyMaps.h