SOURCES: irrlicht-glXGetProcAddress.patch, irrlicht-system-libs.pa...

qboosh qboosh at pld-linux.org
Mon Dec 3 08:13:30 CET 2007 

Author: qboosh                       Date: Mon Dec  3 07:13:30 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SOURCES:
   irrlicht-glXGetProcAddress.patch (1.2 -> 1.3) , irrlicht-system-libs.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/irrlicht-glXGetProcAddress.patch
diff -u SOURCES/irrlicht-glXGetProcAddress.patch:1.2 SOURCES/irrlicht-glXGetProcAddress.patch:1.3
--- SOURCES/irrlicht-glXGetProcAddress.patch:1.2	Fri Jul 20 22:57:19 2007
+++ SOURCES/irrlicht-glXGetProcAddress.patch	Mon Dec  3 08:13:24 2007
@@ -1,20 +1,20 @@
---- irrlicht-1.3.1/source/Irrlicht/COpenGLExtensionHandler.cpp~	2007-06-07 15:17:34.000000000 +0200
-+++ irrlicht-1.3.1/source/Irrlicht/COpenGLExtensionHandler.cpp	2007-07-20 21:34:19.000000000 +0200
-@@ -188,7 +188,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))
-@@ -196,7 +196,7 @@
- 		else
- 	#endif
- 			IRR_OGL_LOAD_EXTENSION=glXGetProcAddressARB;
--	#else
-+	#else*/
- 		#define IRR_OGL_LOAD_EXTENSION glXGetProcAddressARB
- 	#endif
- 	#endif
+--- irrlicht-1.4beta/source/Irrlicht/COpenGLExtensionHandler.cpp~	2007-10-04 19:17:51.000000000 +0200
++++ irrlicht-1.4beta/source/Irrlicht/COpenGLExtensionHandler.cpp	2007-10-04 19:19:24.000000000 +0200
+@@ -179,7 +179,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))
+@@ -187,7 +187,7 @@
+ 		else
+ 	#endif
+ 			IRR_OGL_LOAD_EXTENSION=glXGetProcAddressARB;
+-	#else
++	#else*/
+ 		#define IRR_OGL_LOAD_EXTENSION glXGetProcAddressARB
+ 	#endif
+ 	#endif

================================================================
Index: SOURCES/irrlicht-system-libs.patch
diff -u SOURCES/irrlicht-system-libs.patch:1.2 SOURCES/irrlicht-system-libs.patch:1.3
--- SOURCES/irrlicht-system-libs.patch:1.2	Fri Jul 20 22:57:19 2007
+++ SOURCES/irrlicht-system-libs.patch	Mon Dec  3 08:13:25 2007
@@ -1,48 +1,50 @@
---- irrlicht-1.3.1/include/IrrCompileConfig.h~	2007-06-17 09:30:30.000000000 +0200
-+++ irrlicht-1.3.1/include/IrrCompileConfig.h	2007-07-20 21:37:50.000000000 +0200
-@@ -113,7 +113,7 @@
+--- irrlicht-1.4beta/include/IrrCompileConfig.h~	2007-09-29 09:30:44.000000000 +0200
++++ irrlicht-1.4beta/include/IrrCompileConfig.h	2007-10-04 19:22:58.000000000 +0200
+@@ -117,7 +117,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. */
 -#define _IRR_USE_NON_SYSTEM_ZLIB_
-+/*#define _IRR_USE_NON_SYSTEM_ZLIB_*/
++//#define _IRR_USE_NON_SYSTEM_ZLIB_
  
  
  //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
-@@ -124,7 +124,7 @@
+@@ -128,7 +128,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_USE_NON_SYSTEM_JPEG_LIB_
  
  
  //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
-@@ -135,7 +135,7 @@
+@@ -139,7 +139,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_USE_NON_SYSTEM_LIB_PNG_
  
  
  //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
---- irrlicht-1.3.1/source/Irrlicht/Makefile~	2007-06-07 15:06:40.000000000 +0200
-+++ irrlicht-1.3.1/source/Irrlicht/Makefile	2007-07-20 21:40:07.000000000 +0200
-@@ -25,16 +25,16 @@
+--- irrlicht-1.4beta/source/Irrlicht/Makefile~	2007-09-29 09:28:12.000000000 +0200
++++ irrlicht-1.4beta/source/Irrlicht/Makefile	2007-10-04 19:25:55.000000000 +0200
+@@ -36,18 +36,18 @@
  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 CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.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 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 jpeg
 lib/transupp.o jpeglib/wrbmp.o jpeglib/wrgif.o jpeglib/wrppm.o jpeglib/wrrle.o jpeglib/wrtarga.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 jpeglib/rdbmp.o jpeglib/rdcolmap.o jpeglib/rdgif.o jpeglib/rdppm.o jpeglib/rdrle.o jpeglib/rdswitch.o jpeglib/rdtarga.o jpe
 glib/transupp.o jpeglib/wrbmp.o jpeglib/wrgif.o jpeglib/wrppm.o jpeglib/wrrle.o jpeglib/wrtarga.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 = $(IRROBJ) $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
-+LINKOBJ = $(IRROBJ) $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) $(IRRGUIOBJ) $(EXTRAOBJ)
+ LINKOBJ := $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
++	$(IRRGUIOBJ) $(EXTRAOBJ)
  
  ###############
  #Compiler flags
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/irrlicht-glXGetProcAddress.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/irrlicht-system-libs.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list