diff options
author | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-03-31 18:16:39 +0000 |
---|---|---|
committer | Jose Alonso Cardenas Marquez <acm@FreeBSD.org> | 2012-03-31 18:16:39 +0000 |
commit | 43f2e3119a98a96d058547c4be0da63cbfa39c9a (patch) | |
tree | ec70f7b7b8bd92d96a0591de09c213e3dbea9e8a /x11-toolkits/irrlicht | |
parent | xli and xloadimage both installs bin/xsetbg (diff) |
- Update to 1.7.3
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=294048
Diffstat (limited to 'x11-toolkits/irrlicht')
-rw-r--r-- | x11-toolkits/irrlicht/Makefile | 11 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/distinfo | 4 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h | 37 | ||||
-rw-r--r-- | x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile | 83 |
4 files changed, 38 insertions, 97 deletions
diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 4ca64732c2fe..0903352a0761 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -6,8 +6,7 @@ # PORTNAME= irrlicht -PORTVERSION= 1.7.2 -PORTREVISION= 1 +PORTVERSION= 1.7.3 CATEGORIES= x11-toolkits graphics MASTER_SITES= SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION} @@ -28,6 +27,11 @@ PLIST_SUB+= SHARED_LIB_VER=${SHARED_LIB_VER} SUB_FILES= pkg-message BUILD_WRKSRC= ${WRKSRC}/source/Irrlicht +CPPFLAGS+= -DNO_IRR_USE_NON_SYSTEM_JPEG_LIB_ \ + -DNO_IRR_USE_NON_SYSTEM_LIB_PNG_ \ + -DNO_IRR_USE_NON_SYSTEM_ZLIB_ \ + -DNO_IRR_COMPILE_WITH_BZIP2_ + SHARED_LIB_VER= 1 EXAMPLEDIRS= 01.HelloWorld 02.Quake3Map 03.CustomSceneNode 04.Movement 05.UserInterface \ 06.2DGraphics 07.Collision 08.SpecialFX 09.Meshviewer 10.Shaders \ @@ -63,6 +67,9 @@ HAVE_JOYSTICK= true MAKE_ENV+= NDEBUG=1 .endif +post-extract: + @${RM} ${WRKSRC}/media/Thumbs.db + post-patch: @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ ${WRKSRC}/source/Irrlicht/CImageLoaderPNG.cpp diff --git a/x11-toolkits/irrlicht/distinfo b/x11-toolkits/irrlicht/distinfo index 149a0456c4ce..edf33bb57824 100644 --- a/x11-toolkits/irrlicht/distinfo +++ b/x11-toolkits/irrlicht/distinfo @@ -1,2 +1,2 @@ -SHA256 (irrlicht-1.7.2.zip) = be1de9a850a94eaa5cc57a6014de5ab5304a364d45ce504315b5442be3e0d01d -SIZE (irrlicht-1.7.2.zip) = 24603866 +SHA256 (irrlicht-1.7.3.zip) = 7230c1210a169944f815a79a975fabf2c0db0d3181dd62345b9fac9095ae026d +SIZE (irrlicht-1.7.3.zip) = 16344294 diff --git a/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h b/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h deleted file mode 100644 index e6ca2277f7d8..000000000000 --- a/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h +++ /dev/null @@ -1,37 +0,0 @@ ---- 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. */ --#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. -@@ -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. */ --#define _IRR_USE_NON_SYSTEM_LIB_PNG_ -+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ - - - //! 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 diff --git a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile index 4de044fa2506..aed07737989a 100644 --- a/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile +++ b/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile @@ -1,90 +1,79 @@ ---- source/Irrlicht/Makefile 2011-03-07 18:03:16.000000000 -0500 -+++ source/Irrlicht/Makefile 2011-03-07 18:10:51.000000000 -0500 -@@ -3,7 +3,7 @@ - VERSION_RELEASE = 2 +--- source/Irrlicht/Makefile 2012-03-31 12:50:11.000000000 -0500 ++++ source/Irrlicht/Makefile 2012-03-31 12:57:27.000000000 -0500 +@@ -3,14 +3,14 @@ + VERSION_RELEASE = 3 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) - # Irrlicht Engine 1.7.2 + # Irrlicht Engine 1.7.3 -# Makefile for Linux -+# Makefile for FreeBSD/Linux ++# Makefile for Linux/BSD # # To use, just run: # -@@ -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/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 + # make + # + # This will compile Irrlicht, create a static lib (libIrrlicht.a), and copy it +-# into the subdirectory lib/Linux. That's all. ++# into the subdirectory lib/[Linux|FreeBSD]. That's all. + # + # If you want Irrlicht to be compiled as shared lib (libIrrlicht.so.versionnumber), then run: + # +@@ -49,23 +49,20 @@ EXTRAOBJ = LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \ - $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \ - $(BZIP2OBJ) $(EXTRAOBJ) -+ $(IRRGUIOBJ) $(LIBAESGM) $(BZIP2OBJ) $(EXTRAOBJ) ++ $(IRRGUIOBJ) $(ZLIBOBJ) $(LIBAESGM) $(EXTRAOBJ) ############### #Compiler flags -CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng -+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include ++CXXINCS = -I../../include -I${LOCALBASE}/include CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing ifndef NDEBUG CXXFLAGS += -g -D_DEBUG else -CXXFLAGS += -fexpensive-optimizations -O3 -+CXXFLAGS += -fexpensive-optimizations endif ifdef PROFILE CXXFLAGS += -pg endif -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 -@@ -75,15 +74,15 @@ +@@ -75,15 +72,15 @@ LIBSELECT=64 endif -#Linux specific options -staticlib sharedlib install: SYSTEM = Linux -+# FreeBSD/Linux specific options ++#Linux/FreeBSD specific options +staticlib sharedlib install: SYSTEM = FreeBSD STATIC_LIB = libIrrlicht.a LIB_PATH = ../../lib/$(SYSTEM) -INSTALL_DIR = /usr/local/lib -+INSTALL_DIR = $(PREFIX)/lib ++INSTALL_DIR = ${PREFIX}/lib sharedlib install: SHARED_LIB = libIrrlicht.so - staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias + #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 -lpng -ljpeg -+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include ++sharedlib: LDFLAGS += -L${LOCALBASE}/lib -lGL -lXxf86vm -lpng -ljpeg ++staticlib sharedlib: CXXINCS += -I${LOCALBASE}/include #OSX specific options staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX -@@ -103,20 +102,20 @@ - staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_ +@@ -104,13 +101,13 @@ #################### --# 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 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 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_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS) + $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(SHLIB_VER) -o $(SHARED_LIB).$(SHLIB_VER) $^ $(LDFLAGS) mkdir -p $(LIB_PATH) - cp $(SHARED_LIB).$(VERSION) $(LIB_PATH) @@ -92,21 +81,3 @@ # Builds Irrlicht as static lib (libIrrlicht.a) $(STATIC_LIB): $(LINKOBJ) - $(AR) rs $@ $^ - --# Copies static lib into lib/Linux -+# Copies static lib into lib/FreeBSD - staticlib staticlib_osx: $(STATIC_LIB) - mkdir -p $(LIB_PATH) - cp $^ $(LIB_PATH) -@@ -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 " 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" |