mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
Code Issues Releases Activity

- Update to 1.7.2

Browse Source 
PR:		152854
Submitted by:	Pascal Stumpf <Pascal.Stumpf at cubes.de>
This commit is contained in:
Jose Alonso Cardenas Marquez 2010-12-13 20:04:36 +00:00
parent ccaed70150
commit d3847f02d0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=266260
6 changed files with 70 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11-toolkits/irrlicht/Makefile
View File

@ -6,10 +6,9 @@
#
PORTNAME= irrlicht
PORTVERSION= 1.6.1
PORTREVISION= 2
PORTVERSION= 1.7.2
CATEGORIES= x11-toolkits graphics
MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.6/${PORTVERSION}
MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION}
MAINTAINER= acm@FreeBSD.org
COMMENT= High performance realtime 3D engine

5
x11-toolkits/irrlicht/distinfo
View File

@ -1,3 +1,2 @@
MD5 (irrlicht-1.6.1.zip) = 6c7fa12053c475e3305cad4e720cb711
SHA256 (irrlicht-1.6.1.zip) = be26182cc4b9edb6d1e355cb4a6b99508333209b563f393c6dfcf5ca295f4df9
SIZE (irrlicht-1.6.1.zip) = 22299175
SHA256 (irrlicht-1.7.2.zip) = be1de9a850a94eaa5cc57a6014de5ab5304a364d45ce504315b5442be3e0d01d
SIZE (irrlicht-1.7.2.zip) = 24603866

34
x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h
View File

@ -1,15 +1,6 @@
--- include/IrrCompileConfig.h.orig 2010-01-10 08:44:22.000000000 +0300
+++ include/IrrCompileConfig.h 2010-01-15 22:48:52.000000000 +0300
@@ -175,7 +175,7 @@
//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
-#define _IRR_USE_NON_SYSTEM_ZLIB_
+//#define _IRR_USE_NON_SYSTEM_ZLIB_
//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
@@ -186,7 +186,7 @@
--- include/IrrCompileConfig.h 2010-12-13 13:05:25.000000000 -0500
+++ include/IrrCompileConfig.h 2010-12-13 13:09:57.000000000 -0500
@@ -176,7 +176,7 @@
//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
@ -18,7 +9,7 @@
//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
@@ -197,7 +197,7 @@
@@ -187,7 +187,7 @@
//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
@ -27,3 +18,20 @@
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
@@ -348,14 +348,14 @@
/** If this is commented out, Irrlicht will try to compile using the zlib
installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
defined. */
-#define _IRR_USE_NON_SYSTEM_ZLIB_
+//#define _IRR_USE_NON_SYSTEM_ZLIB_
//! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
#define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
//! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives
/** bzip2 is superior to the original zip file compression modes, but requires
a certain amount of memory for decompression and adds several files to the
library. */
-#define _IRR_COMPILE_WITH_BZIP2_
+//#define _IRR_COMPILE_WITH_BZIP2_
//! Define _IRR_USE_NON_SYSTEM_BZLIB_ to let irrlicht use the bzlib which comes with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the bzlib
installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is

23
x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp
View File

@ -1,23 +0,0 @@
--- source/Irrlicht/COSOperator.cpp.orig 2009-09-19 15:58:12.000000000 +0400
+++ source/Irrlicht/COSOperator.cpp 2010-01-15 22:50:26.000000000 +0300
@@ -15,11 +15,9 @@
#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
#include "MacOSX/OSXClipboard.h"
#endif
-#ifdef _IRR_OSX_PLATFORM_
#include <sys/types.h>
#include <sys/sysctl.h>
#endif
-#endif
#if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
#include "CIrrDeviceLinux.h"
@@ -184,7 +182,7 @@
_IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
return true;
-#elif defined(_IRR_POSIX_API_)
+#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__)
#if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)
long ps = sysconf(_SC_PAGESIZE);
long pp = sysconf(_SC_PHYS_PAGES);

73
x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile
View File

@ -1,34 +1,41 @@
--- source/Irrlicht/Makefile.orig 2010-01-16 01:32:18.000000000 +0300
+++ source/Irrlicht/Makefile 2010-01-16 01:33:07.000000000 +0300
--- source/Irrlicht/Makefile 2010-12-13 14:40:13.000000000 -0500
+++ source/Irrlicht/Makefile 2010-12-13 14:46:13.000000000 -0500
@@ -3,7 +3,7 @@
VERSION_RELEASE = 1
VERSION_RELEASE = 2
VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
# Irrlicht Engine 1.6.0-SVN
# Irrlicht Engine 1.7.2
-# Makefile for Linux
+# Makefile for FreeBSD
+# Makefile for FreeBSD/Linux
#
# To use, just run:
#
@@ -39,29 +39,26 @@
IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o
IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o
@@ -39,33 +39,32 @@
IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.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 CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.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
-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/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/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/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.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
+#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/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/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/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.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
LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o
-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
+#BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o
# Next variable is for additional scene nodes etc. of customized Irrlicht versions
EXTRAOBJ =
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
+ $(IRRGUIOBJ) $(EXTRAOBJ)
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
- $(BZIP2OBJ) $(EXTRAOBJ)
+ $(IRRGUIOBJ) $(LIBAESGM) $(BZIP2OBJ) $(EXTRAOBJ)
###############
#Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
ifndef NDEBUG
CXXFLAGS += -g -D_DEBUG
@ -39,18 +46,18 @@
ifdef PROFILE
CXXFLAGS += -pg
endif
-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
-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
+#CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
sharedlib sharedlib_osx: CXXFLAGS += -fPIC
sharedlib sharedlib_osx: CFLAGS += -fPIC
@@ -71,15 +68,15 @@
@@ -75,15 +74,15 @@
LIBSELECT=64
endif
-#Linux specific options
-staticlib sharedlib install: SYSTEM = Linux
+#FreeBSD specific options
+# FreeBSD/Linux specific options
+staticlib sharedlib install: SYSTEM = FreeBSD
STATIC_LIB = libIrrlicht.a
LIB_PATH = ../../lib/$(SYSTEM)
@ -65,44 +72,40 @@
#OSX specific options
staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
@@ -97,20 +94,22 @@
@@ -103,12 +102,12 @@
staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
####################
-# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/Linux
-# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
-all linux: staticlib
+# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/FreeBSD
+# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/FreeBSD
+all linux: staticlib sharedlib
-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux
+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/FreeBSD
-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/FreeBSD
sharedlib: $(LINKOBJ)
- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
+ mkdir -p $(LIB_PATH)
mkdir -p $(LIB_PATH)
cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
# Builds Irrlicht as static lib (libIrrlicht.a)
@@ -116,7 +115,7 @@
$(STATIC_LIB): $(LINKOBJ)
$(AR) rs $@ $^
-# Copies static lib into /lib/Linux
+# Copies static lib into /lib/FreeBSD
-# Copies static lib into lib/Linux
+# Copies static lib into lib/FreeBSD
staticlib staticlib_osx: $(STATIC_LIB)
+ mkdir -p $(LIB_PATH)
mkdir -p $(LIB_PATH)
cp $^ $(LIB_PATH)
# Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
@@ -153,9 +152,9 @@
@@ -165,8 +164,8 @@
help:
@echo "Available targets for Irrlicht"
- @echo " sharedlib: Build shared library Irrlicht.so for Linux"
- @echo " staticlib: Build static library Irrlicht.a for Linux"
- @echo " install: Copy shared library to /usr/lib"
+ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD"
+ @echo " staticlib: Build static library Irrlicht.a for FreeBSD"
+ @echo " install: Copy shared library to $(LOCALBASE)/lib"
+ @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD/Linux"
+ @echo " staticlib: Build static library Irrlicht.a for FreeBSD/Linux"
@echo " install: Copy shared library to /usr/local/lib"
@echo ""
@echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
@echo " staticlib_win32: Build static library Irrlicht.a for Windows"

7
x11-toolkits/irrlicht/pkg-plist
View File

@ -2,6 +2,8 @@ include/irrlicht/CDynamicMeshBuffer.h
include/irrlicht/CIndexBuffer.h
include/irrlicht/CMeshBuffer.h
include/irrlicht/CVertexBuffer.h
include/irrlicht/EAttributes.h
include/irrlicht/EShaderTypes.h
include/irrlicht/ECullingTypes.h
include/irrlicht/EDebugSceneTypes.h
include/irrlicht/EDeviceTypes.h
@ -14,6 +16,7 @@ include/irrlicht/EMaterialFlags.h
include/irrlicht/EMaterialTypes.h
include/irrlicht/EMeshWriterEnums.h
include/irrlicht/EMessageBoxFlags.h
include/irrlicht/EPrimitiveTypes.h
include/irrlicht/ESceneNodeAnimatorTypes.h
include/irrlicht/ESceneNodeTypes.h
include/irrlicht/ETerrainElements.h
@ -143,11 +146,13 @@ include/irrlicht/SParticle.h
include/irrlicht/SSharedMeshBuffer.h
include/irrlicht/SSkinMeshBuffer.h
include/irrlicht/SVertexIndex.h
include/irrlicht/SVertexManipulator.h
include/irrlicht/SViewFrustum.h
include/irrlicht/SceneParameters.h
include/irrlicht/aabbox3d.h
include/irrlicht/coreutil.h
include/irrlicht/dimension2d.h
include/irrlicht/driverChoice.h
include/irrlicht/fast_atof.h
include/irrlicht/heapsort.h
include/irrlicht/irrAllocator.h
@ -230,6 +235,8 @@ lib/libIrrlicht.so.%%SHARED_LIB_VER%%
%%EXAMPLES%%%%EXAMPLESDIR%%/media/019shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/020shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/021shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/022shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/023shot.jpg
%%EXAMPLES%%%%EXAMPLESDIR%%/media/2ddemo.png
%%EXAMPLES%%%%EXAMPLESDIR%%/media/Faerie5.BMP
%%EXAMPLES%%%%EXAMPLESDIR%%/media/IrrlichtTheme.ogg