CVS commit: pkgsrc/graphics

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Sun, 30 Jun 2019 22:13:14 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 30 22:13:14 UTC 2019

Modified Files:
        pkgsrc/graphics: Makefile
Added Files:
        pkgsrc/graphics/irrlicht: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/graphics/irrlicht/patches: patch-source_Irrlicht_COSOperator.cpp
            patch-source_Irrlicht_Makefile patch-source_Irrlicht_os.cpp

Log Message:
Add irrlicht-1.8.4 as graphics/irrlicht.
Based on work in pkgsrc-wip.

The Irrlicht Engine is an open source high performance real-time
3D engine written and usable in C++ and also available for .NET
languages.

It is completely cross-platform, using D3D, OpenGL and its own
software renderer, and has all of the state-of-the-art features
which can be found in commercial 3d engines.


To generate a diff of this commit:
cvs rdiff -u -r1.822 -r1.823 pkgsrc/graphics/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/irrlicht/DESCR \
    pkgsrc/graphics/irrlicht/Makefile pkgsrc/graphics/irrlicht/PLIST \
    pkgsrc/graphics/irrlicht/buildlink3.mk pkgsrc/graphics/irrlicht/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_COSOperator.cpp \
    pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_Makefile \
    pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_os.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/Makefile
diff -u pkgsrc/graphics/Makefile:1.822 pkgsrc/graphics/Makefile:1.823
--- pkgsrc/graphics/Makefile:1.822      Sun Jun 30 21:59:55 2019
+++ pkgsrc/graphics/Makefile    Sun Jun 30 22:13:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.822 2019/06/30 21:59:55 fcambus Exp $
+# $NetBSD: Makefile,v 1.823 2019/06/30 22:13:13 nia Exp $
 #
 
 COMMENT=       Graphics tools and libraries
@@ -256,6 +256,7 @@ SUBDIR+=    imlib2
 SUBDIR+=       impress
 SUBDIR+=       inkscape
 SUBDIR+=       ipe
+SUBDIR+=       irrlicht
 SUBDIR+=       ivtools
 SUBDIR+=       jasper
 SUBDIR+=       jbig2dec

Added files:

Index: pkgsrc/graphics/irrlicht/DESCR
diff -u /dev/null pkgsrc/graphics/irrlicht/DESCR:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/DESCR      Sun Jun 30 22:13:13 2019
@@ -0,0 +1,7 @@
+The Irrlicht Engine is an open source high performance real-time
+3D engine written and usable in C++ and also available for .NET
+languages.
+
+It is completely cross-platform, using D3D, OpenGL and its own
+software renderer, and has all of the state-of-the-art features
+which can be found in commercial 3d engines.
Index: pkgsrc/graphics/irrlicht/Makefile
diff -u /dev/null pkgsrc/graphics/irrlicht/Makefile:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/Makefile   Sun Jun 30 22:13:13 2019
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2019/06/30 22:13:13 nia Exp $
+
+DISTNAME=      irrlicht-1.8.4
+CATEGORIES=    graphics
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=irrlicht/}
+EXTRACT_SUFX=  .zip
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://irrlicht.sourceforge.net/
+COMMENT=       Open source high performance real-time 3D engine
+LICENSE=       zlib
+
+USE_TOOLS+=    pkg-config gmake
+USE_LANGUAGES= c c++
+USE_LIBTOOL=   yes
+
+MAKE_ENV+=     NDEBUG=1
+BUILD_DIRS=    source/Irrlicht
+BUILD_TARGET=  sharedlib
+
+CXXFLAGS+=     -DNO_IRR_COMPILE_WITH_JOYSTICK_EVENTS_=1
+CXXFLAGS+=     -DNO_IRR_USE_NON_SYSTEM_JPEG_LIB_=1
+CXXFLAGS+=     -DNO_IRR_USE_NON_SYSTEM_LIB_PNG_=1
+CXXFLAGS+=     -DNO_IRR_USE_NON_SYSTEM_ZLIB_=1
+CXXFLAGS+=     -DNO_IRR_USE_NON_SYSTEM_BZLIB_=1
+
+SUBST_CLASSES+=                        dos_eol
+SUBST_MESSAGE.dos_eol=         Removing DOS line-ends
+SUBST_STAGE.dos_eol=           post-extract
+SUBST_FILES.dos_eol=           source/Irrlicht/Makefile
+SUBST_FILES.dos_eol+=          source/Irrlicht/os.cpp
+SUBST_FILES.dos_eol+=          source/Irrlicht/COSOperator.cpp
+SUBST_FILTER_CMD.dos_eol=      ${TR} -d '\r'
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/irrlicht/PLIST
diff -u /dev/null pkgsrc/graphics/irrlicht/PLIST:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/PLIST      Sun Jun 30 22:13:13 2019
@@ -0,0 +1,184 @@
+@comment $NetBSD: PLIST,v 1.1 2019/06/30 22:13:13 nia Exp $
+include/irrlicht/CDynamicMeshBuffer.h
+include/irrlicht/CIndexBuffer.h
+include/irrlicht/CMeshBuffer.h
+include/irrlicht/CVertexBuffer.h
+include/irrlicht/EAttributes.h
+include/irrlicht/ECullingTypes.h
+include/irrlicht/EDebugSceneTypes.h
+include/irrlicht/EDeviceTypes.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
+include/irrlicht/EMessageBoxFlags.h
+include/irrlicht/EPrimitiveTypes.h
+include/irrlicht/ESceneNodeAnimatorTypes.h
+include/irrlicht/ESceneNodeTypes.h
+include/irrlicht/EShaderTypes.h
+include/irrlicht/ETerrainElements.h
+include/irrlicht/IAnimatedMesh.h
+include/irrlicht/IAnimatedMeshMD2.h
+include/irrlicht/IAnimatedMeshMD3.h
+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/IColladaMeshWriter.h
+include/irrlicht/ICursorControl.h
+include/irrlicht/IDummyTransformationSceneNode.h
+include/irrlicht/IDynamicMeshBuffer.h
+include/irrlicht/IEventReceiver.h
+include/irrlicht/IFileArchive.h
+include/irrlicht/IFileList.h
+include/irrlicht/IFileSystem.h
+include/irrlicht/IGPUProgrammingServices.h
+include/irrlicht/IGUIButton.h
+include/irrlicht/IGUICheckBox.h
+include/irrlicht/IGUIColorSelectDialog.h
+include/irrlicht/IGUIComboBox.h
+include/irrlicht/IGUIContextMenu.h
+include/irrlicht/IGUIEditBox.h
+include/irrlicht/IGUIElement.h
+include/irrlicht/IGUIElementFactory.h
+include/irrlicht/IGUIEnvironment.h
+include/irrlicht/IGUIFileOpenDialog.h
+include/irrlicht/IGUIFont.h
+include/irrlicht/IGUIFontBitmap.h
+include/irrlicht/IGUIImage.h
+include/irrlicht/IGUIImageList.h
+include/irrlicht/IGUIInOutFader.h
+include/irrlicht/IGUIListBox.h
+include/irrlicht/IGUIMeshViewer.h
+include/irrlicht/IGUIScrollBar.h
+include/irrlicht/IGUISkin.h
+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/IGUITreeView.h
+include/irrlicht/IGUIWindow.h
+include/irrlicht/IGeometryCreator.h
+include/irrlicht/IImage.h
+include/irrlicht/IImageLoader.h
+include/irrlicht/IImageWriter.h
+include/irrlicht/IIndexBuffer.h
+include/irrlicht/ILightManager.h
+include/irrlicht/ILightSceneNode.h
+include/irrlicht/ILogger.h
+include/irrlicht/IMaterialRenderer.h
+include/irrlicht/IMaterialRendererServices.h
+include/irrlicht/IMesh.h
+include/irrlicht/IMeshBuffer.h
+include/irrlicht/IMeshCache.h
+include/irrlicht/IMeshLoader.h
+include/irrlicht/IMeshManipulator.h
+include/irrlicht/IMeshSceneNode.h
+include/irrlicht/IMeshWriter.h
+include/irrlicht/IMetaTriangleSelector.h
+include/irrlicht/IOSOperator.h
+include/irrlicht/IParticleAffector.h
+include/irrlicht/IParticleAnimatedMeshSceneNodeEmitter.h
+include/irrlicht/IParticleAttractionAffector.h
+include/irrlicht/IParticleBoxEmitter.h
+include/irrlicht/IParticleCylinderEmitter.h
+include/irrlicht/IParticleEmitter.h
+include/irrlicht/IParticleFadeOutAffector.h
+include/irrlicht/IParticleGravityAffector.h
+include/irrlicht/IParticleMeshEmitter.h
+include/irrlicht/IParticleRingEmitter.h
+include/irrlicht/IParticleRotationAffector.h
+include/irrlicht/IParticleSphereEmitter.h
+include/irrlicht/IParticleSystemSceneNode.h
+include/irrlicht/IQ3LevelMesh.h
+include/irrlicht/IQ3Shader.h
+include/irrlicht/IRandomizer.h
+include/irrlicht/IReadFile.h
+include/irrlicht/IReferenceCounted.h
+include/irrlicht/ISceneCollisionManager.h
+include/irrlicht/ISceneLoader.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
+include/irrlicht/ISceneUserDataSerializer.h
+include/irrlicht/IShaderConstantSetCallBack.h
+include/irrlicht/IShadowVolumeSceneNode.h
+include/irrlicht/ISkinnedMesh.h
+include/irrlicht/ITerrainSceneNode.h
+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
+include/irrlicht/IrrCompileConfig.h
+include/irrlicht/IrrlichtDevice.h
+include/irrlicht/Keycodes.h
+include/irrlicht/S3DVertex.h
+include/irrlicht/SAnimatedMesh.h
+include/irrlicht/SColor.h
+include/irrlicht/SExposedVideoData.h
+include/irrlicht/SIrrCreationParameters.h
+include/irrlicht/SKeyMap.h
+include/irrlicht/SLight.h
+include/irrlicht/SMaterial.h
+include/irrlicht/SMaterialLayer.h
+include/irrlicht/SMesh.h
+include/irrlicht/SMeshBuffer.h
+include/irrlicht/SMeshBufferLightMap.h
+include/irrlicht/SMeshBufferTangents.h
+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
+include/irrlicht/irrArray.h
+include/irrlicht/irrList.h
+include/irrlicht/irrMap.h
+include/irrlicht/irrMath.h
+include/irrlicht/irrString.h
+include/irrlicht/irrTypes.h
+include/irrlicht/irrXML.h
+include/irrlicht/irrlicht.h
+include/irrlicht/irrpack.h
+include/irrlicht/irrunpack.h
+include/irrlicht/line2d.h
+include/irrlicht/line3d.h
+include/irrlicht/matrix4.h
+include/irrlicht/path.h
+include/irrlicht/plane3d.h
+include/irrlicht/position2d.h
+include/irrlicht/quaternion.h
+include/irrlicht/rect.h
+include/irrlicht/triangle3d.h
+include/irrlicht/vector2d.h
+include/irrlicht/vector3d.h
+lib/libIrrlicht.la
Index: pkgsrc/graphics/irrlicht/buildlink3.mk
diff -u /dev/null pkgsrc/graphics/irrlicht/buildlink3.mk:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/buildlink3.mk      Sun Jun 30 22:13:13 2019
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2019/06/30 22:13:13 nia Exp $
+
+BUILDLINK_TREE+=       irrlicht
+
+.if !defined(IRRLICHT_BUILDLINK3_MK)
+IRRLICHT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.irrlicht+=       irrlicht>=1.8
+BUILDLINK_PKGSRCDIR.irrlicht?=         ../../graphics/irrlicht
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.endif # IRRLICHT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -irrlicht
Index: pkgsrc/graphics/irrlicht/distinfo
diff -u /dev/null pkgsrc/graphics/irrlicht/distinfo:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/distinfo   Sun Jun 30 22:13:13 2019
@@ -0,0 +1,9 @@
+$NetBSD: distinfo,v 1.1 2019/06/30 22:13:13 nia Exp $
+
+SHA1 (irrlicht-1.8.4.zip) = 38bf0223fe868d243d6a39d0dc191c8df6e03b3b
+RMD160 (irrlicht-1.8.4.zip) = 275eb79193a330b3924166e9cac8d74d37990256
+SHA512 (irrlicht-1.8.4.zip) = de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
+Size (irrlicht-1.8.4.zip) = 27927144 bytes
+SHA1 (patch-source_Irrlicht_COSOperator.cpp) = 8019eba39d03ba80de76ab8bb5fad68d9863f5bf
+SHA1 (patch-source_Irrlicht_Makefile) = 4d49b4eac2b501c0bbfeacb8b1f1f54e9d5feea3
+SHA1 (patch-source_Irrlicht_os.cpp) = de05d9e836c3dc619ab15075366db50f11ebe3fc

Index: pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_COSOperator.cpp
diff -u /dev/null pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_COSOperator.cpp:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_COSOperator.cpp      Sun Jun 30 22:13:14 2019
@@ -0,0 +1,14 @@
+$NetBSD: patch-source_Irrlicht_COSOperator.cpp,v 1.1 2019/06/30 22:13:14 nia Exp $
+
+Add missing include.
+
+--- source/Irrlicht/COSOperator.cpp.orig       Sun Jan  6 13:20:50 2013
++++ source/Irrlicht/COSOperator.cpp
+@@ -12,6 +12,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #ifndef _IRR_SOLARIS_PLATFORM_
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/sysctl.h>
+ #endif
Index: pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_Makefile
diff -u /dev/null pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_Makefile:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_Makefile     Sun Jun 30 22:13:14 2019
@@ -0,0 +1,97 @@
+$NetBSD: patch-source_Irrlicht_Makefile,v 1.1 2019/06/30 22:13:14 nia Exp $
+
+* Libtoolized
+* Use system's libraries
+
+--- source/Irrlicht/Makefile.orig      Sun Jan  6 13:20:50 2013
++++ source/Irrlicht/Makefile
+@@ -46,11 +46,7 @@ IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o 
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.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
+ 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
+ 
+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions
+ EXTRAOBJ =
+@@ -83,13 +79,12 @@ LIBSELECT=64
+ endif
+ 
+ #Linux specific options
+-staticlib sharedlib install: SYSTEM = Linux
++staticlib sharedlib install: SYSTEM = pkgsrc
+ STATIC_LIB = libIrrlicht.a
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+ sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
+-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
++sharedlib: LDFLAGS += -lGL -lXxf86vm -lpng -ljpeg -lbz2 -lz
+ 
+ #OSX specific options
+ staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
+@@ -121,18 +116,14 @@ all linux: staticlib
+ 
+ # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
+ sharedlib: $(LINKOBJ)
+-      $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS)
+-      mkdir -p $(LIB_PATH)
+-      cp $(SHARED_FULLNAME) $(LIB_PATH)
++      $(LIBTOOL) --mode=link $(CXX) $(CPPFLAGS) $(CXXFLAGS) -rpath $(PREFIX)/lib -version-info $(VERSION_MAJOR):$(VERSION_MINOR) -o $(SHARED_LIB:.so=.la) $(LINKOBJ:.o=.lo) $(LDFLAGS)
+ 
+ # Builds Irrlicht as static lib (libIrrlicht.a)
+ $(STATIC_LIB): $(LINKOBJ)
+-      $(AR) rs $@ $^
++      $(LIBTOOL) --mode=link $(CXX) -o $(@:.a=.la) $(LINKOBJ:.o=.lo)
+ 
+ # Copies static lib into lib/Linux
+ staticlib staticlib_osx: $(STATIC_LIB)
+-      mkdir -p $(LIB_PATH)
+-      cp $^ $(LIB_PATH)
+ 
+ # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
+ all_win32 win32: sharedlib_win32
+@@ -150,32 +141,19 @@ sharedlib_osx: $(LINKOBJ)
+ 
+ # Installs Irrlicht if it was created as shared lib
+ install install_osx:
+-      $(RM) -r $(INSTALL_DIR)/../include/irrlicht
+-      mkdir -p $(INSTALL_DIR)/../include/irrlicht
+-      cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/
+-      cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)
+-      cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)
+-      cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)
+-#     ldconfig -n $(INSTALL_DIR)
++      ${BSD_INSTALL_LIB_DIR} $(DESTDIR)${PREFIX}/lib
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} ${SHARED_LIB:.so=.la} $(DESTDIR)${PREFIX}/lib
++      ${BSD_INSTALL_DATA_DIR} $(DESTDIR)${PREFIX}/include/irrlicht
++      ${BSD_INSTALL_DATA} ../../include/*.h $(DESTDIR)${PREFIX}/include/irrlicht
+ 
+ TAGS:
+       ctags *.cpp ../../include/*.h *.h
+ 
+-# Create dependency files for automatic recompilation
+-%.d:%.cpp
+-      $(CXX) $(CPPFLAGS) -MM -MF $@ $<
++%.o:%.cpp
++      $(LIBTOOL) --mode=compile --tag=CXX $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $(@:.o=.lo) $<
+ 
+-# Create dependency files for automatic recompilation
+-%.d:%.c
+-      $(CC) $(CPPFLAGS) -MM -MF $@ $<
+-
+-# Create object files from objective-c code
+-%.o:%.mm
+-      $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
+-
+-ifneq ($(MAKECMDGOALS),clean)
+--include $(LINKOBJ:.o=.d)
+-endif
++%.o:%.c
++      $(LIBTOOL) --mode=compile --tag=CC $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $(@:.o=.lo) $<
+ 
+ help:
+       @echo "Available targets for Irrlicht"
Index: pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_os.cpp
diff -u /dev/null pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_os.cpp:1.1
--- /dev/null   Sun Jun 30 22:13:14 2019
+++ pkgsrc/graphics/irrlicht/patches/patch-source_Irrlicht_os.cpp       Sun Jun 30 22:13:14 2019
@@ -0,0 +1,22 @@
+$NetBSD: patch-source_Irrlicht_os.cpp,v 1.1 2019/06/30 22:13:14 nia Exp $
+
+Support NetBSD.
+
+--- source/Irrlicht/os.cpp.orig        Sun Jan  6 13:20:50 2013
++++ source/Irrlicht/os.cpp
+@@ -22,10 +22,14 @@
+       #include <libkern/OSByteOrder.h>
+       #define bswap_16(X) OSReadSwapInt16(&X,0)
+       #define bswap_32(X) OSReadSwapInt32(&X,0)
+-#elif defined(__FreeBSD__) || defined(__OpenBSD__)
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+       #include <sys/endian.h>
+       #define bswap_16(X) bswap16(X)
+       #define bswap_32(X) bswap32(X)
++#elif defined(__OpenBSD__)
++      #include <sys/endian.h>
++      #define bswap_16(x) letoh16(x)
++      #define bswap_32(x) letoh32(x)
+ #elif !defined(_IRR_SOLARIS_PLATFORM_) && !defined(__PPC__) && !defined(_IRR_WINDOWS_API_)
+       #include <byteswap.h>
+ #else

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index