View | Details | Raw Unified | Return to bug 152854
Collapse All | Expand All

(-)/usr/ports/x11-toolkits/irrlicht/Makefile 2010-12-05 21:04:53.000000000 +0100 (-3 / +2 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=      irrlicht
8
PORTNAME=      irrlicht
9
PORTVERSION=   1.6.1
9
PORTVERSION=   1.7.2
10
PORTREVISION=  2
11
CATEGORIES=    x11-toolkits graphics
10
CATEGORIES=    x11-toolkits graphics
12
MASTER_SITES=  SF/${PORTNAME}/Irrlicht%20SDK/1.6/${PORTVERSION}
11
MASTER_SITES=  SF/${PORTNAME}/Irrlicht%20SDK/1.7/${PORTVERSION}
13
12
14
MAINTAINER=    acm@FreeBSD.org
13
MAINTAINER=    acm@FreeBSD.org
15
COMMENT=       High performance realtime 3D engine
14
COMMENT=       High performance realtime 3D engine
(-)/usr/ports/x11-toolkits/irrlicht/distinfo 2010-12-05 21:05:36.000000000 +0100 (-3 / +2 lines)
Lines 1-3 Link Here
1
MD5 (irrlicht-1.6.1.zip) = 6c7fa12053c475e3305cad4e720cb711
1
SHA256 (irrlicht-1.7.2.zip) = be1de9a850a94eaa5cc57a6014de5ab5304a364d45ce504315b5442be3e0d01d
2
SHA256 (irrlicht-1.6.1.zip) = be26182cc4b9edb6d1e355cb4a6b99508333209b563f393c6dfcf5ca295f4df9
2
SIZE (irrlicht-1.7.2.zip) = 24603866
3
SIZE (irrlicht-1.6.1.zip) = 22299175
(-)/usr/ports/x11-toolkits/irrlicht/files/patch-include_IrrCompileConfig.h 1970-01-01 01:00:00.000000000 +0100 (-29 lines)
Lines 1-29 Link Here
1
--- include/IrrCompileConfig.h.orig    2010-01-10 08:44:22.000000000 +0300
2
+++ include/IrrCompileConfig.h 2010-01-15 22:48:52.000000000 +0300
3
@@ -175,7 +175,7 @@
4
 //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
5
 /** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
6
       This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
7
-#define _IRR_USE_NON_SYSTEM_ZLIB_
8
+//#define _IRR_USE_NON_SYSTEM_ZLIB_
9
 
10
 
11
 //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
12
@@ -186,7 +186,7 @@
13
 //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
14
 /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
15
       This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
16
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
17
+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
18
 
19
 
20
 //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
21
@@ -197,7 +197,7 @@
22
 //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
23
 /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
24
       This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
25
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
26
+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
27
 
28
 
29
 //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
(-)/usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_COSOperator.cpp1970-01-01 01:00:00.000000000 +0100 (-23 lines)
Lines 1-23 Link Here
1
--- source/Irrlicht/COSOperator.cpp.orig       2009-09-19 15:58:12.000000000 +0400
2
+++ source/Irrlicht/COSOperator.cpp    2010-01-15 22:50:26.000000000 +0300
3
@@ -15,11 +15,9 @@
4
 #ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
5
 #include "MacOSX/OSXClipboard.h"
6
 #endif
7
-#ifdef _IRR_OSX_PLATFORM_
8
 #include <sys/types.h>
9
 #include <sys/sysctl.h>
10
 #endif
11
-#endif
12
 
13
 #if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
14
 #include "CIrrDeviceLinux.h"
15
@@ -184,7 +182,7 @@
16
       _IRR_IMPLEMENT_MANAGED_MARSHALLING_BUGFIX;
17
       return true;
18
 
19
-#elif defined(_IRR_POSIX_API_)
20
+#elif defined(_IRR_POSIX_API_) && !defined(__FreeBSD__)
21
 #if defined(_SC_PHYS_PAGES) && defined(_SC_AVPHYS_PAGES)
22
         long ps = sysconf(_SC_PAGESIZE);
23
         long pp = sysconf(_SC_PHYS_PAGES);
(-)/usr/ports/x11-toolkits/irrlicht/files/patch-source-Irrlicht_Makefile 1970-01-01 01:00:00.000000000 +0100 (-108 lines)
Lines 1-108 Link Here
1
--- source/Irrlicht/Makefile.orig      2010-01-16 01:32:18.000000000 +0300
2
+++ source/Irrlicht/Makefile   2010-01-16 01:33:07.000000000 +0300
3
@@ -3,7 +3,7 @@
4
 VERSION_RELEASE = 1
5
 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
6
 # Irrlicht Engine 1.6.0-SVN
7
-# Makefile for Linux
8
+# Makefile for FreeBSD
9
 #
10
 # To use, just run:
11
 #
12
@@ -39,29 +39,26 @@
13
 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
14
 IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o Irrlicht.o os.o
15
 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
16
-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
17
-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
18
-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
19
 # Next variable is for additional scene nodes etc. of customized Irrlicht versions
20
 EXTRAOBJ =
21
 LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
22
       $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
23
-      $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
24
+      $(IRRGUIOBJ) $(EXTRAOBJ)
25
 
26
 ###############
27
 #Compiler flags
28
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
29
-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
30
+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include
31
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
32
 CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
33
 ifndef NDEBUG
34
 CXXFLAGS += -g -D_DEBUG
35
 else
36
-CXXFLAGS += -fexpensive-optimizations -O3
37
+CXXFLAGS += -fexpensive-optimizations
38
 endif
39
 ifdef PROFILE
40
 CXXFLAGS += -pg
41
 endif
42
-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
43
+#CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
44
 
45
 sharedlib sharedlib_osx: CXXFLAGS += -fPIC
46
 sharedlib sharedlib_osx: CFLAGS += -fPIC
47
@@ -71,15 +68,15 @@
48
 LIBSELECT=64
49
 endif
50
 
51
-#Linux specific options
52
-staticlib sharedlib install: SYSTEM = Linux
53
+#FreeBSD specific options
54
+staticlib sharedlib install: SYSTEM = FreeBSD
55
 STATIC_LIB = libIrrlicht.a
56
 LIB_PATH = ../../lib/$(SYSTEM)
57
-INSTALL_DIR = /usr/local/lib
58
+INSTALL_DIR = $(PREFIX)/lib
59
 sharedlib install: SHARED_LIB = libIrrlicht.so
60
 staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
61
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
62
-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
63
+sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm -lpng -ljpeg
64
+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include
65
 
66
 #OSX specific options
67
 staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
68
@@ -97,20 +94,22 @@
69
 staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
70
 
71
 ####################
72
-# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/Linux
73
-all linux: staticlib
74
+# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into /lib/FreeBSD
75
+all linux: staticlib sharedlib
76
 
77
-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/Linux
78
+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into /lib/FreeBSD
79
 sharedlib: $(LINKOBJ)
80
-      $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
81
+      $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
82
+      mkdir -p $(LIB_PATH)
83
       cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
84
 
85
 # Builds Irrlicht as static lib (libIrrlicht.a)
86
 $(STATIC_LIB): $(LINKOBJ)
87
       $(AR) rs $@ $^
88
 
89
-# Copies static lib into /lib/Linux
90
+# Copies static lib into /lib/FreeBSD
91
 staticlib staticlib_osx: $(STATIC_LIB)
92
+      mkdir -p $(LIB_PATH)
93
       cp $^ $(LIB_PATH)
94
 
95
 # Builds Irrlicht as dll (Irrlicht.dll) into ../../bin/Win32-gcc
96
@@ -153,9 +152,9 @@
97
 
98
 help:
99
       @echo "Available targets for Irrlicht"
100
-      @echo " sharedlib: Build shared library Irrlicht.so for Linux"
101
-      @echo " staticlib: Build static library Irrlicht.a for Linux"
102
-      @echo " install: Copy shared library to /usr/lib"
103
+      @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD"
104
+      @echo " staticlib: Build static library Irrlicht.a for FreeBSD"
105
+      @echo " install: Copy shared library to $(LOCALBASE)/lib"
106
       @echo ""
107
       @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
108
       @echo " staticlib_win32: Build static library Irrlicht.a for Windows"
(-)/usr/ports/x11-toolkits/irrlicht/files/patch-source_Irrlicht_COSOperator.cpp2010-12-05 21:49:53.000000000 +0100 (+14 lines)
Line 0 Link Here
1
--- source/Irrlicht/COSOperator.cpp.orig       2010-10-24 09:42:46.000000000 +0200
2
+++ source/Irrlicht/COSOperator.cpp    2010-12-05 21:48:39.000000000 +0100
3
@@ -11,11 +11,9 @@
4
 #else
5
 #include <string.h>
6
 #include <unistd.h>
7
-#ifndef _IRR_SOLARIS_PLATFORM_
8
 #include <sys/types.h>
9
 #include <sys/sysctl.h>
10
 #endif
11
-#endif
12
 
13
 #if defined(_IRR_COMPILE_WITH_X11_DEVICE_)
14
 #include "CIrrDeviceLinux.h"
(-)/usr/ports/x11-toolkits/irrlicht/files/patch-source_Irrlicht_Makefile 2010-12-05 21:32:12.000000000 +0100 (+99 lines)
Line 0 Link Here
1
--- source/Irrlicht/Makefile.orig      2010-10-31 17:53:30.000000000 +0100
2
+++ source/Irrlicht/Makefile   2010-12-05 21:26:49.000000000 +0100
3
@@ -3,7 +3,7 @@ VERSION_MINOR = 7
4
 VERSION_RELEASE = 2
5
 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
6
 # Irrlicht Engine 1.7.2
7
-# Makefile for Linux
8
+# Makefile for FreeBSD
9
 #
10
 # To use, just run:
11
 #
12
@@ -49,23 +49,23 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffm
13
 EXTRAOBJ =
14
 LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
15
       $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
16
-      $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
17
+      $(IRRGUIOBJ) $(LIBAESGM) \
18
       $(BZIP2OBJ) $(EXTRAOBJ)
19
 
20
 ###############
21
 #Compiler flags
22
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
23
+CXXINCS = -I../../include -I$(LOCALBASE)/include -I/usr/include -I
24
 CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
25
 CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
26
 ifndef NDEBUG
27
 CXXFLAGS += -g -D_DEBUG
28
 else
29
-CXXFLAGS += -fexpensive-optimizations -O3
30
+CXXFLAGS += -fexpensive-optimizations 
31
 endif
32
 ifdef PROFILE
33
 CXXFLAGS += -pg
34
 endif
35
-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
36
+#CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
37
 
38
 sharedlib sharedlib_osx: CXXFLAGS += -fPIC
39
 sharedlib sharedlib_osx: CFLAGS += -fPIC
40
@@ -75,15 +75,15 @@ ifeq ($(HOSTTYPE), x86_64)
41
 LIBSELECT=64
42
 endif
43
 
44
-#Linux specific options
45
-staticlib sharedlib install: SYSTEM = Linux
46
+#FreeBSD specific options
47
+staticlib sharedlib install: SYSTEM = FreeBSD
48
 STATIC_LIB = libIrrlicht.a
49
 LIB_PATH = ../../lib/$(SYSTEM)
50
-INSTALL_DIR = /usr/local/lib
51
+INSTALL_DIR = $(PREFIX)/lib
52
 sharedlib install: SHARED_LIB = libIrrlicht.so
53
 staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
54
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
55
-staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
56
+sharedlib: LDFLAGS += -L/usr/lib -L$(LOCALBASE)/lib -lGL -lXxf86vm -lpng -ljpeg
57
+staticlib sharedlib: CXXINCS += -I$(LOCALBASE)/include
58
 
59
 #OSX specific options
60
 staticlib_osx sharedlib_osx install_osx: SYSTEM = MacOSX
61
@@ -103,12 +103,12 @@ sharedlib_win32 staticlib_win32: CPPFLAG
62
 staticlib_win32: CPPFLAGS += -D_IRR_STATIC_LIB_
63
 
64
 ####################
65
-# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
66
-all linux: staticlib
67
+# All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/FreeBSD
68
+all linux: staticlib sharedlib
69
 
70
-# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
71
+# Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/FreeBSD
72
 sharedlib: $(LINKOBJ)
73
-      $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
74
+      $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
75
       mkdir -p $(LIB_PATH)
76
       cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
77
 
78
@@ -116,7 +116,7 @@ sharedlib: $(LINKOBJ)
79
 $(STATIC_LIB): $(LINKOBJ)
80
       $(AR) rs $@ $^
81
 
82
-# Copies static lib into lib/Linux
83
+# Copies static lib into lib/FreeBSD
84
 staticlib staticlib_osx: $(STATIC_LIB)
85
       mkdir -p $(LIB_PATH)
86
       cp $^ $(LIB_PATH)
87
@@ -165,9 +165,9 @@ endif
88
 
89
 help:
90
       @echo "Available targets for Irrlicht"
91
-      @echo " sharedlib: Build shared library Irrlicht.so for Linux"
92
-      @echo " staticlib: Build static library Irrlicht.a for Linux"
93
-      @echo " install: Copy shared library to /usr/local/lib"
94
+      @echo " sharedlib: Build shared library Irrlicht.so for FreeBSD"
95
+      @echo " staticlib: Build static library Irrlicht.a for FreeBSD"
96
+      @echo " install: Copy shared library to $(LOCALBASE)/lib"
97
       @echo ""
98
       @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
99
       @echo " staticlib_win32: Build static library Irrlicht.a for Windows"

Return to bug 152854