---- 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 @@
+--- irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.cpp.orig 2013-07-14 08:59:10.710771070 +0200
++++ irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.cpp 2013-07-14 09:20:05.454051748 +0200
+@@ -389,7 +389,7 @@
+ // next line by uncommenting it\r
+ // #define _IRR_GETPROCADDRESS_WORKAROUND_\r
\r
- #ifndef _IRR_GETPROCADDRESS_WORKAROUND_\r
- __GLXextFuncPtr (*IRR_OGL_LOAD_EXTENSION)(const GLubyte*)=0;\r
-- #ifdef GLX_VERSION_1_4\r
-+/* #ifdef GLX_VERSION_1_4\r
+- #ifndef _IRR_GETPROCADDRESS_WORKAROUND_\r
++ #if 0\r
+ __GLXextFuncPtr (*IRR_OGL_LOAD_EXTENSION_FUNCP)(const GLubyte*)=0;\r
+ #ifdef GLX_VERSION_1_4\r
int major=0,minor=0;\r
- if (glXGetCurrentDisplay())\r
- glXQueryVersion(glXGetCurrentDisplay(), &major, &minor);\r
-@@ -218,7 +218,7 @@
- else\r
- #endif\r
- IRR_OGL_LOAD_EXTENSION=glXGetProcAddressARB;\r
-- #else\r
-+ #else*/\r
- #define IRR_OGL_LOAD_EXTENSION glXGetProcAddressARB\r
- #endif\r
- #endif\r
+++ /dev/null
---- irrlicht-1.7/source/Irrlicht/CImageLoaderPNG.cpp~ 2010-01-31 16:03:28.000000000 +0100
-+++ irrlicht-1.7/source/Irrlicht/CImageLoaderPNG.cpp 2010-02-05 15:12:19.296717517 +0100
-@@ -162,7 +162,11 @@
- if (BitDepth < 8)
- {
- if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA)
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ #if PNG_LIBPNG_VER < 10400
-+ png_set_gray_1_2_4_to_8(png_ptr);
-+ #else
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
-+ #endif
- else
- png_set_packing(png_ptr);
- }
+++ /dev/null
---- irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp~ 2012-02-12 09:43:14.202178018 +0100
-+++ irrlicht-1.7.2/source/Irrlicht/CImageLoaderPNG.cpp 2012-02-12 09:45:33.286194594 +0100
-@@ -28,7 +28,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file reading
-@@ -37,7 +37,7 @@
- png_size_t check;
-
- // changed by zola {
-- io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;
-+ io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->read((void*)data,(u32)length);
- // }
-
---- irrlicht-1.7.2/source/Irrlicht/CImageWriterPNG.cpp~ 2010-10-24 09:42:48.000000000 +0200
-+++ irrlicht-1.7.2/source/Irrlicht/CImageWriterPNG.cpp 2012-02-12 09:47:02.876634690 +0100
-@@ -35,7 +35,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file writing
-@@ -43,7 +43,7 @@
- {
- png_size_t check;
-
-- io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;
-+ io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->write((const void*)data,(u32)length);
-
- if (check != length)
---- irrlicht-1.7/include/IrrCompileConfig.h~ 2010-02-04 09:41:09.079266016 +0100
-+++ irrlicht-1.7/include/IrrCompileConfig.h 2010-02-04 09:44:15.335913904 +0100
-@@ -176,7 +176,7 @@
+--- irrlicht-1.8/include/IrrCompileConfig.h.orig 2013-07-14 09:21:14.764048838 +0200
++++ irrlicht-1.8/include/IrrCompileConfig.h 2013-07-14 09:25:40.837371005 +0200
+@@ -245,7 +245,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_
-+//n#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_JPEG_LIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif
+@@ -261,7 +261,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,7 +348,7 @@
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #endif
+@@ -598,7 +598,7 @@
/** 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
-@@ -360,7 +360,7 @@
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+ #endif
+@@ -619,7 +619,7 @@
/** 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
defined. */
-#define _IRR_USE_NON_SYSTEM_BZLIB_
+//#define _IRR_USE_NON_SYSTEM_BZLIB_
- //! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
- /** LZMA is a very efficient compression code, known from 7zip. Irrlicht
- currently only supports zip archives, though. */
+ #ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
+ #undef _IRR_USE_NON_SYSTEM_BZLIB_
+ #endif
--- irrlicht-1.7/source/Irrlicht/Makefile~ 2010-02-04 09:41:09.082599460 +0100
+++ irrlicht-1.7/source/Irrlicht/Makefile 2010-02-04 09:47:09.905895602 +0100
@@ -39,18 +39,13 @@
Summary: Irrlicht - high performance realtime 3D engine
Summary(pl.UTF-8): Irrlicht - wysoko wydajny silnik 3D czasu rzeczywistego
Name: irrlicht
-Version: 1.7.3
+Version: 1.8
Release: 1
License: BSD-like
Group: Libraries
Source0: http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
-# Source0-md5: cfbdc8c68fbca544c7c8dfb3623ae086
+# Source0-md5: d06329d8f466658caaf4838ba349e393
Patch0: %{name}-glXGetProcAddress.patch
Patch1: %{name}-system-libs.patch
-Patch2: %{name}-libpng14.patch
-Patch3: %{name}-libpng15.patch
URL: http://irrlicht.sourceforge.net/
BuildRequires: OpenGL-devel
BuildRequires: bzip2-devel
BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
+BuildRequires: libpng-devel >= 1.4
BuildRequires: libstdc++-devel
BuildRequires: rpmbuild(macros) >= 1.566
BuildRequires: sed >= 4.0
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
%{__make} -C source/Irrlicht \
projects / packages / irrlicht.git / commitdiff