Date: Fri, 26 Apr 2019 23:39:32 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500178 - in head: games/opendungeons games/stuntrally games/vegastrike graphics graphics/cegui graphics/ogre3d graphics/ogre3d19 graphics/rigsofrods-caelum graphics/rigsofrods-pagedgeo... Message-ID: <201904262339.x3QNdWRJ014080@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Apr 26 23:39:31 2019 New Revision: 500178 URL: https://svnweb.freebsd.org/changeset/ports/500178 Log: - Copy graphics/ogre3d to graphics/ogre3d19 and add mutual conflicts - Switch all ogre3d consumers to ogre3d19 This allows to update ogre3d to the latest version without breaking existing ports. The plans are also to make it possible for both ogre3d versions to coexist. Approved by: oliver (discussed via private email) Added: head/graphics/ogre3d19/ - copied from r500172, head/graphics/ogre3d/ Modified: head/games/opendungeons/Makefile head/games/stuntrally/Makefile head/games/vegastrike/Makefile head/graphics/Makefile head/graphics/cegui/Makefile head/graphics/ogre3d/Makefile head/graphics/ogre3d19/Makefile head/graphics/rigsofrods-caelum/Makefile head/graphics/rigsofrods-pagedgeometry/Makefile head/misc/visp/Makefile head/x11-toolkits/mygui-ogre/Makefile Modified: head/games/opendungeons/Makefile ============================================================================== --- head/games/opendungeons/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/games/opendungeons/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -2,7 +2,7 @@ PORTNAME= opendungeons PORTVERSION= 0.7.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MAINTAINER= ports@FreeBSD.org @@ -23,7 +23,7 @@ LIB_DEPENDS= libboost_atomic.so:devel/boost-libs \ libOIS.so:devel/ois \ libsfml-audio.so:devel/sfml \ libCEGUIBase-0.so:graphics/cegui \ - libOgreMain.so:graphics/ogre3d + libOgreMain.so:graphics/ogre3d19 USES= cmake pkgconfig Modified: head/games/stuntrally/Makefile ============================================================================== --- head/games/stuntrally/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/games/stuntrally/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -3,6 +3,7 @@ PORTNAME= stuntrally PORTVERSION= 2.6.1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -32,7 +33,7 @@ OPTIONS_SUB= yes GAME_DESC= Build the game binary GAME_CMAKE_BOOL= BUILD_GAME -GAME_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d \ +GAME_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 \ libBulletDynamics.so:devel/bullet \ libMyGUIEngine.so:x11-toolkits/mygui \ libogg.so:audio/libogg \ @@ -44,7 +45,7 @@ GAME_USES= openal EDITOR_DESC= Build the track editor EDITOR_CMAKE_BOOL= BUILD_EDITOR -EDITOR_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d \ +EDITOR_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 \ libBulletDynamics.so:devel/bullet \ libMyGUIEngine.so:x11-toolkits/mygui \ libogg.so:audio/libogg \ Modified: head/games/vegastrike/Makefile ============================================================================== --- head/games/vegastrike/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/games/vegastrike/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -3,7 +3,7 @@ PORTNAME= vegastrike PORTVERSION= 0.5.1.r1 -PORTREVISION= 15 +PORTREVISION= 16 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}/ DISTNAME= ${PORTNAME}-src-${PORTVERSION} @@ -53,7 +53,7 @@ OPTIONS_DEFINE= MESHER DOCS MESHER_DESC= Enable mesher modelling tool MESHER_VARS= BIN_FILES+=bin/mesher -MESHER_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d +MESHER_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 MESHER_CONFIGURE_ENABLE= ogre post-patch: Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/graphics/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -579,6 +579,7 @@ SUBDIR += ocrad SUBDIR += ocre SUBDIR += ogre3d + SUBDIR += ogre3d19 SUBDIR += oidn SUBDIR += okular SUBDIR += open3d Modified: head/graphics/cegui/Makefile ============================================================================== --- head/graphics/cegui/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/graphics/cegui/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -3,7 +3,7 @@ PORTNAME= cegui PORTVERSION= 0.8.7 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= graphics devel MASTER_SITES= SF/crayzedsgui/CEGUI%20Mk-2/0.8 @@ -84,7 +84,7 @@ SDL2_CMAKE_ON= -DCEGUI_BUILD_IMAGECODEC_SDL2=ON SDL2_CMAKE_OFF= -DCEGUI_BUILD_IMAGECODEC_SDL2=OFF OGRE_DESC= Ogre3D support -OGRE_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d +OGRE_LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 OGRE_CMAKE_ON= -DCEGUI_BUILD_RENDERER_OGRE=ON OGRE_CMAKE_OFF= -DCEGUI_BUILD_RENDERER_OGRE=OFF IRRLICHT_DESC= Irrlicht support Modified: head/graphics/ogre3d/Makefile ============================================================================== --- head/graphics/ogre3d/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/graphics/ogre3d/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -18,6 +18,8 @@ LIB_DEPENDS= libzzip.so:devel/zziplib \ libfreetype.so:print/freetype2 \ libfreeimage.so:graphics/freeimage +CONFLICTS= ogre3d19-[0-9]* + USE_LDCONFIG= yes USES= tar:bzip2 cmake pkgconfig compiler:c++11-lib USE_SDL= sdl Modified: head/graphics/ogre3d19/Makefile ============================================================================== --- head/graphics/ogre3d/Makefile Fri Apr 26 21:54:11 2019 (r500172) +++ head/graphics/ogre3d19/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -7,8 +7,9 @@ PORTREVISION= 18 CATEGORIES= graphics devel MASTER_SITES= https://bitbucket.org/sinbad/ogre/get/ DISTNAME= v1-9-0 +PKGNAMESUFFIX= 19 -MAINTAINER= oliver@FreeBSD.org +MAINTAINER= amdmi3@FreeBSD.org COMMENT= Scene-oriented, flexible 3D engine written in C++ LICENSE= MIT @@ -17,6 +18,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libzzip.so:devel/zziplib \ libfreetype.so:print/freetype2 \ libfreeimage.so:graphics/freeimage + +CONFLICTS= ogre3d-[0-9]* USE_LDCONFIG= yes USES= tar:bzip2 cmake pkgconfig compiler:c++11-lib Modified: head/graphics/rigsofrods-caelum/Makefile ============================================================================== --- head/graphics/rigsofrods-caelum/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/graphics/rigsofrods-caelum/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -4,6 +4,7 @@ PORTNAME= rigsofrods-caelum PORTVERSION= 0.6.3 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= monwarez@mailoo.org @@ -12,7 +13,7 @@ COMMENT= OGRE plugin for atmospheric effects LICENSE= LGPL3+ LICENSE_FILE= ${WRKSRC}/lgpl.txt -LIB_DEPENDS= libOgreMain.so:graphics/ogre3d +LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 USE_GITHUB= yes GH_ACCOUNT= RigsOfRods Modified: head/graphics/rigsofrods-pagedgeometry/Makefile ============================================================================== --- head/graphics/rigsofrods-pagedgeometry/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/graphics/rigsofrods-pagedgeometry/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -4,6 +4,7 @@ PORTNAME= rigsofrods-pagedgeometry PORTVERSION= 1.2.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= monwarez@mailoo.org @@ -12,7 +13,7 @@ COMMENT= OGRE plugin for real-time dense forests LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/zlib.txt -LIB_DEPENDS= libOgreMain.so:graphics/ogre3d +LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 USE_GITHUB= yes GH_ACCOUNT= RigsOfRods Modified: head/misc/visp/Makefile ============================================================================== --- head/misc/visp/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/misc/visp/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -2,7 +2,7 @@ PORTNAME= visp DISTVERSION= 3.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= http://gforge.inria.fr/frs/download.php/latestfile/475/ @@ -37,6 +37,6 @@ OPTIONS_DEFINE= OGRE OGRE_DESC= Include Ogre support OGRE_CMAKE_BOOL= USE_OGRE OGRE_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ - libOgreMain.so:graphics/ogre3d + libOgreMain.so:graphics/ogre3d19 .include <bsd.port.mk> Modified: head/x11-toolkits/mygui-ogre/Makefile ============================================================================== --- head/x11-toolkits/mygui-ogre/Makefile Fri Apr 26 22:50:39 2019 (r500177) +++ head/x11-toolkits/mygui-ogre/Makefile Fri Apr 26 23:39:31 2019 (r500178) @@ -1,14 +1,14 @@ # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 PKGNAMESUFFIX= -ogre COMMENT= Ogre3d renderer for MyGUI MASTERDIR= ${.CURDIR}/../mygui -LIB_DEPENDS= libOgreMain.so:graphics/ogre3d +LIB_DEPENDS= libOgreMain.so:graphics/ogre3d19 MYGUI_RENDERSYSTEM= 3 MYGUI_SUBDIR= Platforms/Ogre/OgrePlatform
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904262339.x3QNdWRJ014080>