packages: irrlicht/irrlicht-glXGetProcAddress.patch, irrlicht/irrlicht-spar...
lisu
lisu at pld-linux.org
Mon Oct 5 16:33:33 CEST 2009
Author: lisu Date: Mon Oct 5 14:33:33 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated for 1.6
---- Files affected:
packages/irrlicht:
irrlicht-glXGetProcAddress.patch (1.4 -> 1.5) , irrlicht-sparc.patch (1.3 -> 1.4) , irrlicht-system-libs.patch (1.7 -> 1.8)
---- Diffs:
================================================================
Index: packages/irrlicht/irrlicht-glXGetProcAddress.patch
diff -u packages/irrlicht/irrlicht-glXGetProcAddress.patch:1.4 packages/irrlicht/irrlicht-glXGetProcAddress.patch:1.5
--- packages/irrlicht/irrlicht-glXGetProcAddress.patch:1.4 Tue Dec 16 09:31:01 2008
+++ packages/irrlicht/irrlicht-glXGetProcAddress.patch Mon Oct 5 16:33:28 2009
@@ -1,15 +1,15 @@
---- irrlicht-1.5/source/Irrlicht/COpenGLExtensionHandler.cpp~ 2008-12-14 07:15:56.000000000 +0100
-+++ irrlicht-1.5/source/Irrlicht/COpenGLExtensionHandler.cpp 2008-12-16 08:57:41.000000000 +0100
-@@ -198,7 +198,7 @@
+--- irrlicht-1.6/source/Irrlicht/COpenGLExtensionHandler.cpp~ 2009-09-19 16:58:12.000000000 +0200
++++ irrlicht-1.6/source/Irrlicht/COpenGLExtensionHandler.cpp 2009-10-05 16:02:17.000000000 +0200
+@@ -209,7 +209,7 @@
#ifndef _IRR_GETPROCADDRESS_WORKAROUND_
__GLXextFuncPtr (*IRR_OGL_LOAD_EXTENSION)(const GLubyte*)=0;
- #ifdef GLX_VERSION_1_4
+/* #ifdef GLX_VERSION_1_4
- int major,minor;
- glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);
- if ((major>1) || (minor>3))
-@@ -206,7 +206,7 @@
+ int major=0,minor=0;
+ if (glXGetCurrentDisplay())
+ glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);
+@@ -218,7 +218,7 @@
else
#endif
IRR_OGL_LOAD_EXTENSION=glXGetProcAddressARB;
================================================================
Index: packages/irrlicht/irrlicht-sparc.patch
diff -u packages/irrlicht/irrlicht-sparc.patch:1.3 packages/irrlicht/irrlicht-sparc.patch:1.4
--- packages/irrlicht/irrlicht-sparc.patch:1.3 Wed Aug 5 16:47:56 2009
+++ packages/irrlicht/irrlicht-sparc.patch Mon Oct 5 16:33:28 2009
@@ -1,6 +1,6 @@
---- irrlicht-1.5.1/include/IrrCompileConfig.h~ 2009-08-05 16:22:18.000000000 +0200
-+++ irrlicht-1.5.1/include/IrrCompileConfig.h 2009-08-05 16:24:08.000000000 +0200
-@@ -66,7 +66,11 @@
+--- irrlicht-1.6/include/IrrCompileConfig.h~ 2009-10-05 16:07:18.000000000 +0200
++++ irrlicht-1.6/include/IrrCompileConfig.h 2009-10-05 16:08:46.000000000 +0200
+@@ -87,7 +87,11 @@
#if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_)
#if defined(__sparc__) || defined(__sun__)
#define __BIG_ENDIAN__
================================================================
Index: packages/irrlicht/irrlicht-system-libs.patch
diff -u packages/irrlicht/irrlicht-system-libs.patch:1.7 packages/irrlicht/irrlicht-system-libs.patch:1.8
--- packages/irrlicht/irrlicht-system-libs.patch:1.7 Wed Aug 5 16:47:56 2009
+++ packages/irrlicht/irrlicht-system-libs.patch Mon Oct 5 16:33:28 2009
@@ -1,6 +1,6 @@
---- irrlicht-1.5.1/include/IrrCompileConfig.h~ 2009-08-01 11:13:46.000000000 +0200
-+++ irrlicht-1.5.1/include/IrrCompileConfig.h 2009-08-05 16:20:32.000000000 +0200
-@@ -151,7 +151,7 @@
+--- irrlicht-1.6/include/IrrCompileConfig.h~ 2009-09-19 17:47:04.000000000 +0200
++++ irrlicht-1.6/include/IrrCompileConfig.h 2009-10-05 16:05:40.000000000 +0200
+@@ -179,7 +179,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. */
@@ -9,7 +9,7 @@
//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
-@@ -162,7 +162,7 @@
+@@ -190,7 +190,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 +18,7 @@
//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
-@@ -173,7 +173,7 @@
+@@ -201,7 +201,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,18 +27,15 @@
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
---- irrlicht-1.5.1/source/Irrlicht/Makefile~ 2009-08-01 11:15:42.000000000 +0200
-+++ irrlicht-1.5.1/source/Irrlicht/Makefile 2009-08-05 16:21:47.000000000 +0200
-@@ -36,14 +36,14 @@
- 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 = 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 CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o
+--- irrlicht-1.6/source/Irrlicht/Makefile~ 2009-09-20 09:49:40.000000000 +0200
++++ irrlicht-1.6/source/Irrlicht/Makefile 2009-10-05 16:06:43.000000000 +0200
+@@ -39,14 +39,11 @@
+ 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
+ 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
-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/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
-+#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
# Next variable is for additional scene nodes etc. of customized Irrlicht versions
EXTRAOBJ =
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/irrlicht/irrlicht-glXGetProcAddress.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/irrlicht/irrlicht-sparc.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/irrlicht/irrlicht-system-libs.patch?r1=1.7&r2=1.8&f=u
More information about the pld-cvs-commit
mailing list