diff options
author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2007-08-20 07:02:28 +0000 |
---|---|---|
committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2007-08-20 07:02:28 +0000 |
commit | 0600e3e46f25ef10982a827a7d987650b9adf735 (patch) | |
tree | 6e77e70817e070fdb5d28ae750d5a30e5d33fdf2 /x11-toolkits/irrlicht | |
parent | Update to 1.4.6. (diff) |
- Update to 1.3.1
Notes
Notes:
svn path=/head/; revision=197942
Diffstat (limited to 'x11-toolkits/irrlicht')
-rw-r--r-- | x11-toolkits/irrlicht/Makefile | 3 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/distinfo | 6 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h | 16 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp | 26 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile | 23 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/pkg-plist | 5 |
6 files changed, 44 insertions, 35 deletions
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 44a6c8598212..270d25e663d0 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -6,8 +6,7 @@ # PORTNAME= irrlicht -PORTVERSION= 1.3 -PORTREVISION= 1 +PORTVERSION= 1.3.1 CATEGORIES= x11-toolkits graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/x11-toolkits/irrlicht/distinfo b/x11-toolkits/irrlicht/distinfo index e538f4d4d6ef..c9ad01a3e5ef 100644 --- a/x11-toolkits/irrlicht/distinfo +++ b/x11-toolkits/irrlicht/distinfo @@ -1,3 +1,3 @@ -MD5 (irrlicht-1.3.zip) = 87d25c36a2d93a34ab64b5fa783fb557 -SHA256 (irrlicht-1.3.zip) = 5370777c47c4311de21a8c71b2a302711364299b71f43d1e13d35ea2bc66cefe -SIZE (irrlicht-1.3.zip) = 16473254 +MD5 (irrlicht-1.3.1.zip) = 939b21d5fa16d7d949e4ce0c23e0b4b0 +SHA256 (irrlicht-1.3.1.zip) = 91f080776fbad55331ca793b25647def2ef66363eac0cf5fef619f3690044beb +SIZE (irrlicht-1.3.1.zip) = 16325880 diff --git a/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h b/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h index 17ae6b30246c..78bde355b29a 100644 --- a/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h +++ b/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h @@ -1,27 +1,27 @@ ---- include/IrrCompileConfig.h Fri Dec 29 19:14:48 2006 -+++ include/IrrCompileConfig.h Fri Dec 29 19:15:49 2006 -@@ -90,7 +90,7 @@ +--- include/IrrCompileConfig.h Sun Aug 19 19:56:33 2007 ++++ include/IrrCompileConfig.h Sun Aug 19 19:57:30 2007 +@@ -113,7 +113,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. */ + 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. -@@ -101,7 +101,7 @@ +@@ -124,7 +124,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. */ + This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ -#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ +//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng. -@@ -112,7 +112,7 @@ +@@ -135,7 +135,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. */ + This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ -#define _IRR_USE_NON_SYSTEM_LIB_PNG_ +//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp index d51913c9520a..56adcba358a9 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp @@ -1,20 +1,24 @@ ---- source/Irrlicht/COSOperator.cpp Tue Mar 20 09:46:39 2007 -+++ source/Irrlicht/COSOperator.cpp Tue Mar 20 09:50:49 2007 -@@ -13,6 +13,8 @@ - - #ifdef LINUX +--- source/Irrlicht/COSOperator.cpp Sun Aug 19 20:14:42 2007 ++++ source/Irrlicht/COSOperator.cpp Sun Aug 19 20:19:35 2007 +@@ -10,12 +10,9 @@ + #else + #include <string.h> #include <unistd.h> -+#include <sys/types.h> -+#include <sys/sysctl.h> +-#ifdef MACOSX +-#include "OSXClipboard.h" + #include <sys/types.h> + #include <sys/sysctl.h> #endif +-#endif - #ifdef MACOSX -@@ -167,7 +169,7 @@ + namespace irr + { +@@ -156,7 +153,7 @@ _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX; return true; --#elif defined(LINUX) // || defined(MACOSX) -+#elif defined(LINUX) && !defined(__FreeBSD__) // || defined(MACOSX) +-#elif defined(_IRR_POSIX_API_) // || defined(MACOSX) ++#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__)// || defined(MACOSX) long ps = sysconf(_SC_PAGESIZE); long pp = sysconf(_SC_PHYS_PAGES); long ap = sysconf(_SC_AVPHYS_PAGES); diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile index a74e61b948e8..b86a6ebc7e1f 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile @@ -1,8 +1,8 @@ ---- source/Irrlicht/Makefile Tue Mar 20 09:59:30 2007 -+++ source/Irrlicht/Makefile Tue Mar 20 10:01:49 2007 -@@ -25,34 +25,31 @@ +--- source/Irrlicht/Makefile Sun Aug 19 20:05:59 2007 ++++ source/Irrlicht/Makefile Sun Aug 19 20:13:03 2007 +@@ -25,35 +25,33 @@ 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 = CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.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 CGUISkin.o CGUIStaticText.o CGUITabControl.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 jpeglib/rdbmp.o jpeglib/rdcolmap.o jpeglib/rdgif.o jpeglib/rdppm.o jpeglib/rdrle.o jpeglib/rdswitch.o jpeglib/rdtarga.o jpeglib/transupp.o jpeglib/wrbmp.o jpeglib/wrgif.o jpeglib/wrppm.o jpeglib/wrrle.o jpeglib/wrtarga.o @@ -21,14 +21,15 @@ +CXXINCS = -I../../include -I$(LOCALBASE)/include -I$(X11BASE)/include -I/usr/include +CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 +CXXFLAGS += -Wall ++ +ifdef DEBUG CXXFLAGS += -g else -CXXFLAGS += -fexpensive-optimizations -O3 +CXXFLAGS += -fexpensive-optimizations endif --CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -+CFLAGS += -fexpensive-optimizations -DPNG_NO_MMX_CODE +-CFLAGS := -fexpensive-optimizations -O3 -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES ++CFLAGS += -fexpensive-optimizations -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES #Linux specific options STATIC_LIB = libIrrlicht.a @@ -37,16 +38,18 @@ LIB_PATH = ../../lib/$(SYSTEM) -INSTALL_DIR = /usr/local/lib -staticlib sharedlib install: SYSTEM = Linux --staticlib sharedlib : LDFLAGS = -L/usr/X11R6/lib --no-export-all-symbols --add-stdcall-alias -lGLU -lGL -lXxf86vm +-staticlib sharedlib : LDFLAGS = --no-export-all-symbols --add-stdcall-alias +-sharedlib : LDFLAGS += -L/usr/X11R6/lib -lGLU -lGL -lXxf86vm -staticlib sharedlib : CXXINCS += -I/usr/X11R6/include ++ +INSTALL_DIR = $(PREFIX)/lib +staticlib sharedlib install: SYSTEM = FreeBSD -+staticlib sharedlib : LDFLAGS = -L/usr/lib -L$(LOCALBASE) -L$(X11BASE)/lib --no-export-all-symbols --add-stdcall-alias -lGLU -lGL -lXxf86vm ++staticlib sharedlib : LDFLAGS = -L/usr/lib -L$(LOCALBASE)/lib -L$(X11BASE)/lib --no-export-all-symbols --add-stdcall-alias -lGLU -lGL -lXxf86vm +staticlib sharedlib : CXXINCS += -I$(X11BASE)/include #Windows specific options sharedlib_win32 staticlib_win32: SYSTEM = Win32-gcc -@@ -61,20 +58,22 @@ +@@ -62,20 +60,22 @@ staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_ #################### @@ -73,7 +76,7 @@ cp $^ $(LIB_PATH) # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc -@@ -100,9 +99,9 @@ +@@ -101,9 +101,9 @@ help: @echo "Available targets for Irrlicht" diff --git a/x11-toolkits/irrlicht/pkg-plist b/x11-toolkits/irrlicht/pkg-plist index cd436642cd8f..705dbe136d6c 100644 --- a/x11-toolkits/irrlicht/pkg-plist +++ b/x11-toolkits/irrlicht/pkg-plist @@ -1,3 +1,7 @@ +include/irrlicht/CMeshBuffer.h +include/irrlicht/ECullingTypes.h +include/irrlicht/EDebugSceneTypes.h +include/irrlicht/EDriverFeatures.h include/irrlicht/EDriverTypes.h include/irrlicht/EGUIElementTypes.h include/irrlicht/ESceneNodeAnimatorTypes.h @@ -195,7 +199,6 @@ lib/libIrrlicht.so.%%SHARED_LIB_VER%% %%EXAMPLES%%%%EXAMPLESDIR%%/media/d3d9.hlsl %%EXAMPLES%%%%EXAMPLESDIR%%/media/d3d9.psh %%EXAMPLES%%%%EXAMPLESDIR%%/media/d3d9.vsh -%%EXAMPLES%%%%EXAMPLESDIR%%/media/demoback.bmp %%EXAMPLES%%%%EXAMPLESDIR%%/media/demoback.jpg %%EXAMPLES%%%%EXAMPLESDIR%%/media/detailmap3.jpg %%EXAMPLES%%%%EXAMPLESDIR%%/media/directxlogo.png |