ports/101052: [PATCH] graphics/ogre3d: update to 1.2.2p1

Sun Jul 30 13:40:16 UTC 2006

>Number:         101052
>Category:       ports
>Synopsis:       [PATCH] graphics/ogre3d: update to 1.2.2p1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 30 13:40:13 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Thu May 11 15:07:32 MSD 2006 amdmi3 at hades.panopticon:/usr/obj/usr/src/sys/HADES i386

>Description:
* Update to 1.2.2p1
* USE_GCC=3.4+ instead of 3.4 (compiles with GCC 4.0)
* use PORTDOCS
* other small fixes

Note to oliver@ (maintainer):
Please note that shared library number was bumped (lib/libOgreMain.so.10 -> lib/libOgreMain.so.11). This means ports that use OGRE should be checked for compatibility and, if compatible, have their LIB_DEPENDS changed accordingly. Otherwise, ogre3d port should be repocopied. I've checked my games/fwp - old version is compatible only with ogre 1.0, but the new version (see next PR) is compatible only with ogre 1.2, so graphics/ogre and games/fwp updates should be committed close to each other. I didn't check games/ember though, hope I didn't make too much trouble for you :)
>How-To-Repeat:
>Fix:

--- ogre3d-1.2.2.patch begins here ---
diff -ruN ogre3d.orig/Makefile ogre3d/Makefile
--- ogre3d.orig/Makefile	Sat Jul 29 14:49:36 2006
+++ ogre3d/Makefile	Sun Jul 30 01:40:39 2006
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	ogre3d
-PORTVERSION=	1.0.7
-PORTREVISION=	1
+DISTVERSION=	1-2-2p1
 CATEGORIES=	graphics devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=ogre
-DISTNAME=	ogre-linux_osx-v${PORTVERSION:S/./-/g}
+DISTNAME=	ogre-linux_osx-v${DISTVERSION}
 
 MAINTAINER=	oliver at FreeBSD.org
 COMMENT=	A scene-oriented, flexible 3D engine written in C++
@@ -23,20 +22,22 @@
 CONFIGURE_ARGS=	--disable-cg --program-transform-name= --enable-static
 GNU_CONFIGURE=	YES
 INSTALLS_SHLIB=	YES
-USE_GCC=	3.4
+USE_GCC=	3.4+
 USE_BZIP2=	YES
 USE_X_PREFIX=	YES
 USE_GNOME=	gnomehack
 USE_SDL=	sdl
 USE_GMAKE=	YES
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
+
+PORTDOCS=	README COPYING AUTHORS
 
 post-patch:
 	@${REINPLACE_CMD} -e '\
-		s|sdl-config|${SDL_CONFIG}|g ;\
+		s|sdl-config|${SDL_CONFIG}|g; \
 		s|-lpthread|${PTHREAD_LIBS}|g; \
 		s|"-lIL|"-L${LOCALBASE}/lib -lIL|g; \
-		s|-lGL -lGLU|-L${X11BASE}/lib &|g; \
-		s|GLSUPPORT_CFLAGS=\$$SDL_CFLAGS|GLSUPPORT_CFLAGS="-I${X11BASE}/include \$$SDL_CFLAGS"|' \
+		s|-lGL -lGLU|-L${X11BASE}/lib &|g;' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|<CEGUI/|<|g' \
 		${WRKSRC}/Samples/Gui/src/Gui.cpp \
@@ -61,7 +62,7 @@
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for docfile in README COPYING AUTHORS
+.for docfile in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 .endif
diff -ruN ogre3d.orig/distinfo ogre3d/distinfo
--- ogre3d.orig/distinfo	Sat Jul 29 14:49:36 2006
+++ ogre3d/distinfo	Sat Jul 29 14:56:40 2006
@@ -1,3 +1,3 @@
-MD5 (ogre-linux_osx-v1-0-7.tar.bz2) = 9120af9f10efddeb8c79bb9f46d9706c
-SHA256 (ogre-linux_osx-v1-0-7.tar.bz2) = e4dbd75feb877173f3cc9c83f10e4f5326affebc5833c4c0f49c349bfbda84af
-SIZE (ogre-linux_osx-v1-0-7.tar.bz2) = 18786151
+MD5 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 34004bdde39427e9a3213286f8cc057a
+SHA256 (ogre-linux_osx-v1-2-2p1.tar.bz2) = 1c0c4f2a382301db1b7e89fc95e2a099a5a5891678923eabd0d72f26fc610547
+SIZE (ogre-linux_osx-v1-2-2p1.tar.bz2) = 22890671
diff -ruN ogre3d.orig/pkg-plist ogre3d/pkg-plist
--- ogre3d.orig/pkg-plist	Sat Jul 29 14:49:36 2006
+++ ogre3d/pkg-plist	Sat Jul 29 20:14:13 2006
@@ -2,15 +2,18 @@
 bin/OgreMeshUpgrade
 bin/OgreXMLConverter
 include/OGRE/Ogre.h
+include/OGRE/OgreAnimable.h
 include/OGRE/OgreAnimation.h
 include/OGRE/OgreAnimationState.h
 include/OGRE/OgreAnimationTrack.h
+include/OGRE/OgreAny.h
 include/OGRE/OgreArchive.h
 include/OGRE/OgreArchiveFactory.h
 include/OGRE/OgreArchiveManager.h
 include/OGRE/OgreAutoParamDataSource.h
 include/OGRE/OgreAxisAlignedBox.h
 include/OGRE/OgreBillboard.h
+include/OGRE/OgreBillboardChain.h
 include/OGRE/OgreBillboardParticleRenderer.h
 include/OGRE/OgreBillboardSet.h
 include/OGRE/OgreBitwise.h
@@ -24,6 +27,16 @@
 include/OGRE/OgreCodec.h
 include/OGRE/OgreColourValue.h
 include/OGRE/OgreCommon.h
+include/OGRE/OgreCompiler2Pass.h
+include/OGRE/OgreCompositionPass.h
+include/OGRE/OgreCompositionTargetPass.h
+include/OGRE/OgreCompositionTechnique.h
+include/OGRE/OgreCompositor.h
+include/OGRE/OgreCompositorChain.h
+include/OGRE/OgreCompositorInstance.h
+include/OGRE/OgreCompositorManager.h
+include/OGRE/OgreCompositorScriptCompiler.h
+include/OGRE/OgreCompositorSerializer.h
 include/OGRE/OgreConfig.h
 include/OGRE/OgreConfigDialog.h
 include/OGRE/OgreConfigFile.h
@@ -76,6 +89,7 @@
 include/OGRE/OgreLight.h
 include/OGRE/OgreLog.h
 include/OGRE/OgreLogManager.h
+include/OGRE/OgreManualObject.h
 include/OGRE/OgreMaterial.h
 include/OGRE/OgreMaterialManager.h
 include/OGRE/OgreMaterialSerializer.h
@@ -121,24 +135,26 @@
 include/OGRE/OgrePlaneBoundedVolume.h
 include/OGRE/OgrePlatform.h
 include/OGRE/OgrePlatformManager.h
+include/OGRE/OgrePose.h
 include/OGRE/OgrePositionTarget.h
 include/OGRE/OgrePredefinedControllers.h
 include/OGRE/OgrePrerequisites.h
 include/OGRE/OgreProfiler.h
 include/OGRE/OgreProgressiveMesh.h
 include/OGRE/OgreQuaternion.h
+include/OGRE/OgreRadixSort.h
 include/OGRE/OgreRay.h
 include/OGRE/OgreRectangle.h
 include/OGRE/OgreRectangle2D.h
 include/OGRE/OgreRenderOperation.h
 include/OGRE/OgreRenderQueue.h
+include/OGRE/OgreRenderQueueInvocation.h
 include/OGRE/OgreRenderQueueListener.h
 include/OGRE/OgreRenderQueueSortingGrouping.h
 include/OGRE/OgreRenderSystem.h
 include/OGRE/OgreRenderSystemCapabilities.h
 include/OGRE/OgreRenderTarget.h
 include/OGRE/OgreRenderTargetListener.h
-include/OGRE/OgreRenderTargetTexture.h
 include/OGRE/OgreRenderTexture.h
 include/OGRE/OgreRenderWindow.h
 include/OGRE/OgreRenderable.h
@@ -146,6 +162,7 @@
 include/OGRE/OgreResourceBackgroundQueue.h
 include/OGRE/OgreResourceGroupManager.h
 include/OGRE/OgreResourceManager.h
+include/OGRE/OgreRibbonTrail.h
 include/OGRE/OgreRoot.h
 include/OGRE/OgreRotationalSpline.h
 include/OGRE/OgreSceneManager.h
@@ -215,17 +232,12 @@
 lib/libOgreMain.a
 lib/libOgreMain.la
 lib/libOgreMain.so
-lib/libOgreMain.so.10
+lib/libOgreMain.so.11
 lib/libOgrePlatform.a
 lib/libOgrePlatform.la
 lib/libOgrePlatform.so
+lib/libOgrePlatform.so.0
 libdata/pkgconfig/CEGUI-OGRE.pc
 libdata/pkgconfig/OGRE.pc
-share/OGRE/ogre-config.glade
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
- at dirrm include/OGRE
 @dirrm lib/OGRE
- at dirrm share/OGRE
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm include/OGRE
--- ogre3d-1.2.2.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

