- Update to 1.5 [1]

PR		:	130373
Submitted by	:	Hardy Schumacher <hardy.schumacher at amd.com>
			Luke Dean <LukeD at pobox.com> [1]
This commit is contained in:
Jose Alonso Cardenas Marquez 2009-01-20 08:16:02 +00:00
parent fefb0a67a5
commit 4a28d28497
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=226508
4 changed files with 71 additions and 32 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= irrlicht
PORTVERSION= 1.4.2
PORTVERSION= 1.5
CATEGORIES= x11-toolkits graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -27,14 +27,15 @@ PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER}
SUB_FILES= pkg-message
BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht
SHARED_LIB_VER= 1.4.2
SHARED_LIB_VER= 1.5
EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \
06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \
11.PerPixelLighting 12.TerrainRendering 13.RenderToTexture 15.LoadIrrFile \
Demo
OPTIONS= DEBUG "Compile with debugging simbols" off \
EXAMPLES "Install example files" on
EXAMPLES "Install example files" on \
JOYSTICK "Support for Linux Joystick" off
.include <bsd.port.pre.mk>
@ -52,10 +53,20 @@ PLIST_SUB+= EXAMPLES=""
PLIST_SUB+= EXAMPLES="@comment "
.endif
.if defined(WITH_JOYSTICK)
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
HAVE_JOYSTICK= true
.endif
.if !defined(WITH_DEBUG)
MAKE_ENV+= NDEBUG=1
.endif
post-patch:
.if !defined(HAVE_JOYSTICK)
@${REINPLACE_CMD} -e 75d ${WRKSRC}/include/IrrCompileConfig.h
.endif
do-install:
${MKDIR} ${PREFIX}/include/${PORTNAME}
cd ${WRKSRC}/include && \

View File

@ -1,3 +1,3 @@
MD5 (irrlicht-1.4.2.zip) = eabf78fad2f4d7aa58e1a85202b6a4f7
SHA256 (irrlicht-1.4.2.zip) = 79eab7edfb289d67569ea2061fccd6d5476648b1331f63e51a005931f129af17
SIZE (irrlicht-1.4.2.zip) = 18306598
MD5 (irrlicht-1.5.zip) = e3bc8c1074fc0ec2810dc48f94c05d5a
SHA256 (irrlicht-1.5.zip) = 289598ebb7e4c88e1de8c4324ba59257ddcaed3ed1f7ec50df30a560f1b02bac
SIZE (irrlicht-1.5.zip) = 19483190

View File

@ -1,8 +1,8 @@
--- source/Irrlicht/Makefile 2008-12-06 13:51:48.000000000 -0500
+++ source/Irrlicht/Makefile 2008-12-06 14:00:34.000000000 -0500
--- source/Irrlicht/Makefile 2008-12-14 07:15:56.000000000 -0800
+++ source/Irrlicht/Makefile 2008-12-28 12:04:16.000000000 -0800
@@ -1,6 +1,6 @@
VERSION = 1.4.2
# Irrlicht Engine 1.4.2
VERSION = 1.5
# Irrlicht Engine 1.5
-# Makefile for Linux
+# Makefile for FreeBSD
#
@ -11,13 +11,13 @@
@@ -36,29 +36,26 @@
IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o irrXML.o CAttributes.o
IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o
IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
-ZLIBOBJ = zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o
-JPEGLIBOBJ = jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcphuff.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdphuff.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jidctred.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o
-LIBPNGOBJ = libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o
# Next variable is for additional scene nodes etc. of customized Irrlicht versions
EXTRAOBJ =
LINKOBJ := $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
+ $(IRRGUIOBJ) $(EXTRAOBJ)
@ -26,10 +26,10 @@
#Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
-CXXFLAGS = -Wall
-CXXFLAGS = -Wall -pipe
+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+CXXFLAGS += -Wall
+CXXFLAGS += -Wall -pipe
ifndef NDEBUG
CXXFLAGS += -g -D_DEBUG
else
@ -39,28 +39,34 @@
ifdef PROFILE
CXXFLAGS += -pg
endif
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+#CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+#CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
sharedlib : CXXFLAGS += -fpic
sharedlib : CFLAGS += -fpic
@@ -73,11 +70,11 @@
SHARED_LIB = libIrrlicht.so
sharedlib sharedlib_osx: CXXFLAGS += -fpic
sharedlib sharedlib_osx: CFLAGS += -fpic
@@ -68,16 +65,16 @@
LIBSELECT=64
endif
-#Linux specific options
-staticlib sharedlib install: SYSTEM = Linux
+#FreeBSD specific options
+staticlib sharedlib install: SYSTEM = FreeBSD
STATIC_LIB = libIrrlicht.a
IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
LIB_PATH = ../../lib/$(SYSTEM)
-INSTALL_DIR = /usr/local/lib
-staticlib sharedlib install: SYSTEM = Linux
+INSTALL_DIR = $(PREFIX)/lib
+staticlib sharedlib install: SYSTEM = FreeBSD
staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias
-sharedlib : LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
-staticlib sharedlib : CXXINCS += -I/usr/X11R6/include
+sharedlib : LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm
+staticlib sharedlib : CXXINCS += -I$(LOCALBASE)/include
sharedlib: SHARED_LIB = libIrrlicht.so
staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm
+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include
#Windows specific options
sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc
@@ -86,20 +83,22 @@
#OSX specific options
staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
@@ -94,20 +91,22 @@
staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
####################
@ -83,12 +89,12 @@
-# Copies static lib into /lib/Linux
+# Copies static lib into /lib/FreeBSD
staticlib: $(STATIC_LIB)
staticlib staticlib_osx: $(STATIC_LIB)
+ mkdir -p $(LIB_PATH)
cp $^ $(LIB_PATH)
# Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
@@ -125,9 +124,9 @@
@@ -152,9 +151,9 @@
help:
@echo "Available targets for Irrlicht"

View File

@ -1,9 +1,14 @@
include/irrlicht/CDynamicMeshBuffer.h
include/irrlicht/CIndexBuffer.h
include/irrlicht/CMeshBuffer.h
include/irrlicht/CVertexBuffer.h
include/irrlicht/ECullingTypes.h
include/irrlicht/EDebugSceneTypes.h
include/irrlicht/EDriverFeatures.h
include/irrlicht/EDriverTypes.h
include/irrlicht/EGUIAlignment.h
include/irrlicht/EGUIElementTypes.h
include/irrlicht/EHardwareBufferFlags.h
include/irrlicht/EMaterialFlags.h
include/irrlicht/EMaterialTypes.h
include/irrlicht/EMeshWriterEnums.h
@ -18,10 +23,12 @@ include/irrlicht/IAnimatedMeshSceneNode.h
include/irrlicht/IAttributeExchangingObject.h
include/irrlicht/IAttributes.h
include/irrlicht/IBillboardSceneNode.h
include/irrlicht/IBillboardTextSceneNode.h
include/irrlicht/IBoneSceneNode.h
include/irrlicht/ICameraSceneNode.h
include/irrlicht/ICursorControl.h
include/irrlicht/IDummyTransformationSceneNode.h
include/irrlicht/IDynamicMeshBuffer.h
include/irrlicht/IEventReceiver.h
include/irrlicht/IFileList.h
include/irrlicht/IFileSystem.h
@ -48,11 +55,13 @@ include/irrlicht/IGUISpinBox.h
include/irrlicht/IGUISpriteBank.h
include/irrlicht/IGUIStaticText.h
include/irrlicht/IGUITabControl.h
include/irrlicht/IGUITable.h
include/irrlicht/IGUIToolbar.h
include/irrlicht/IGUIWindow.h
include/irrlicht/IImage.h
include/irrlicht/IImageLoader.h
include/irrlicht/IImageWriter.h
include/irrlicht/IIndexBuffer.h
include/irrlicht/ILightSceneNode.h
include/irrlicht/ILogger.h
include/irrlicht/IMaterialRenderer.h
@ -87,6 +96,8 @@ include/irrlicht/ISceneCollisionManager.h
include/irrlicht/ISceneManager.h
include/irrlicht/ISceneNode.h
include/irrlicht/ISceneNodeAnimator.h
include/irrlicht/ISceneNodeAnimatorCameraFPS.h
include/irrlicht/ISceneNodeAnimatorCameraMaya.h
include/irrlicht/ISceneNodeAnimatorCollisionResponse.h
include/irrlicht/ISceneNodeAnimatorFactory.h
include/irrlicht/ISceneNodeFactory.h
@ -99,8 +110,10 @@ include/irrlicht/ITextSceneNode.h
include/irrlicht/ITexture.h
include/irrlicht/ITimer.h
include/irrlicht/ITriangleSelector.h
include/irrlicht/IVertexBuffer.h
include/irrlicht/IVideoDriver.h
include/irrlicht/IVideoModeList.h
include/irrlicht/IVolumeLightSceneNode.h
include/irrlicht/IWriteFile.h
include/irrlicht/IXMLReader.h
include/irrlicht/IXMLWriter.h
@ -124,6 +137,7 @@ include/irrlicht/SParticle.h
include/irrlicht/SSharedMeshBuffer.h
include/irrlicht/SSkinMeshBuffer.h
include/irrlicht/SceneParameters.h
include/irrlicht/SVertexIndex.h
include/irrlicht/SViewFrustum.h
include/irrlicht/aabbox3d.h
include/irrlicht/coreutil.h
@ -203,6 +217,8 @@ lib/libIrrlicht.so.%%SHARED_LIB_VER%%
%%EXAMPLES%%%%EXAMPLESDIR%%/media/013shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/014shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/015shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/016shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/018shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/2ddemo.bmp
%%EXAMPLES%%%%EXAMPLESDIR%%/media/Faerie5.BMP
%%EXAMPLES%%%%EXAMPLESDIR%%/media/IrrlichtTheme.ogg
@ -252,10 +268,15 @@ lib/libIrrlicht.so.%%SHARED_LIB_VER%%
%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoaligned.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha.tga
%%EXAMPLES%%%%EXAMPLESDIR%%/media/irrlichtlogoalpha2.tga
%%EXAMPLES%%%%EXAMPLESDIR%%/media/lightFalloff.png
%%EXAMPLES%%%%EXAMPLESDIR%%/media/lucida.xml
%%EXAMPLES%%%%EXAMPLESDIR%%/media/lucida0.png
%%EXAMPLES%%%%EXAMPLESDIR%%/media/map-20kdm2.pk3
%%EXAMPLES%%%%EXAMPLESDIR%%/media/map-20kdm2.txt
%%EXAMPLES%%%%EXAMPLESDIR%%/media/ninja animation ranges.txt
%%EXAMPLES%%%%EXAMPLESDIR%%/media/ninja.b3d
%%EXAMPLES%%%%EXAMPLESDIR%%/media/nskinbl.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/nskinrd.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/open.png
%%EXAMPLES%%%%EXAMPLESDIR%%/media/opengl.frag
%%EXAMPLES%%%%EXAMPLESDIR%%/media/opengl.psh
@ -276,6 +297,7 @@ lib/libIrrlicht.so.%%SHARED_LIB_VER%%
%%EXAMPLES%%%%EXAMPLESDIR%%/media/rockwall_height.bmp
%%EXAMPLES%%%%EXAMPLESDIR%%/media/room.3ds
%%EXAMPLES%%%%EXAMPLESDIR%%/media/rsptnback.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/skydome.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/smoke.bmp
%%EXAMPLES%%%%EXAMPLESDIR%%/media/sphere.3ds
%%EXAMPLES%%%%EXAMPLESDIR%%/media/spheremap.jpg