From c502d9eb0cbfc58cc3cbcd4c92a1f813f785d0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= Date: Sun, 21 Sep 2014 14:58:12 +0200 Subject: testing/irrlicht: fix line endings in patches --- testing/irrlicht/APKBUILD | 18 ++++---- testing/irrlicht/irrlicht-1.8.1-config.patch | 56 +++++++++++++------------ testing/irrlicht/irrlicht-1.8.1-mesa-10.x.patch | 56 ++++++++++++------------- testing/irrlicht/irrlicht-1.8.1-sysctl.patch | 20 +++++---- 4 files changed, 77 insertions(+), 73 deletions(-) (limited to 'testing') diff --git a/testing/irrlicht/APKBUILD b/testing/irrlicht/APKBUILD index 356f3b7bbc..2c5446fa35 100644 --- a/testing/irrlicht/APKBUILD +++ b/testing/irrlicht/APKBUILD @@ -83,14 +83,14 @@ package() { } md5sums="f4f7fa33bd1060eb0dd51dcd66b0f6e3 irrlicht-1.8.1.zip -6c35d64a6ca262bca59b93203f1fb802 irrlicht-1.8.1-mesa-10.x.patch -f7a8e6a075f0e2c9fd585f23afd5bc86 irrlicht-1.8.1-config.patch -a84ec80127fdb4bd672413576395db77 irrlicht-1.8.1-sysctl.patch" +b83f74be3507b9a0488ac15892456ac9 irrlicht-1.8.1-mesa-10.x.patch +892096241cd5ae5bd9e86548f271cb38 irrlicht-1.8.1-config.patch +eb2edf8959d587f590e978b4e93b3663 irrlicht-1.8.1-sysctl.patch" sha256sums="814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b irrlicht-1.8.1.zip -42798617c00c6026da70735714dde5088991b6e0bf43509f3ad42714862e40ba irrlicht-1.8.1-mesa-10.x.patch -1aeec60ed987e789e36b71a2761ceaf7b59b9f9a9c35e287cbd72f3d18777c87 irrlicht-1.8.1-config.patch -c1f887abe9e2e40f3a502cad10f1000d34065df473db1dcf3caa6860761361b5 irrlicht-1.8.1-sysctl.patch" +d17e8084cb5b458aef85a136b6366e07e615b8dcca18fd7f66a988886d7ab750 irrlicht-1.8.1-mesa-10.x.patch +743ea676da8e60f2aada5f4b228cf48cc2b2d419339d1a03560d655164a732e1 irrlicht-1.8.1-config.patch +71a372624332d8c72c215565e1d66da1ff8eb85cefdbe4f0c8c949fb6aa74e8d irrlicht-1.8.1-sysctl.patch" sha512sums="93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb irrlicht-1.8.1.zip -bb767ffd288efc2e7b88ad92d9844ab71064ab114c4b83234da3de07968a286e60e3e63db8050d4bff7c55a02bdecd1a858061b06dd8c4699431a9450c503504 irrlicht-1.8.1-mesa-10.x.patch -d8b5995924808a78f242bd6cbad7a2d81673f3d7fed24f620805c006506ff677cdc7790552568788f84ec518df569b3d1d1d96291fd3bc7eef9f3ebbdc94a8c2 irrlicht-1.8.1-config.patch -3f1dac1f5cbee54d3c6f3f0c4b694611104dff6d57ec5b118d3d2f3f8946029ac040793dd3965d880ecb08c9fcdfe56e22bb68948712b95e7b9a9b2b0cfad950 irrlicht-1.8.1-sysctl.patch" +44c16419c07597ba6d06d66057fbe2ab86e7b02b5dcdf458678b4ea87f6f721840da951ae4df59c983e1da83abdbe45f82e44a6a311bd42eb94d93dfd5aa437c irrlicht-1.8.1-mesa-10.x.patch +8cd4ec3fd439f2b3d560fed3403628fccaf870249410cd879a76f3a44aadfb4f01381dc400c07192848b78fa74533f0b61faf5bb8b409cbf6a6dff560c676d47 irrlicht-1.8.1-config.patch +a25887c46990620271168f3c1ff42e3ff7bd577d5e986803f067942b7f43d63428ebbbf29d3956765b3199da731b151a39d3ee6b8e5bdab189710ef8fb9595e5 irrlicht-1.8.1-sysctl.patch" diff --git a/testing/irrlicht/irrlicht-1.8.1-config.patch b/testing/irrlicht/irrlicht-1.8.1-config.patch index a394dc14d2..b1b8b74201 100644 --- a/testing/irrlicht/irrlicht-1.8.1-config.patch +++ b/testing/irrlicht/irrlicht-1.8.1-config.patch @@ -1,29 +1,31 @@ +diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h +index 2fa2423..e0bff92 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.h -@@ -249,7 +249,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_ - #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ - #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ - #endif -@@ -265,7 +265,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_ - #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ - #undef _IRR_USE_NON_SYSTEM_LIB_PNG_ - #endif -@@ -602,7 +602,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_ - #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_ - #undef _IRR_USE_NON_SYSTEM_ZLIB_ - #endif +@@ -249,7 +249,7 @@ the engine will no longer read .jpeg images. */ + //! 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_ + #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ + #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ + #endif +@@ -265,7 +265,7 @@ the engine will no longer read .png images. */ + //! 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_ + #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ + #undef _IRR_USE_NON_SYSTEM_LIB_PNG_ + #endif +@@ -594,7 +594,7 @@ B3D, MS3D or X meshes */ + /** This enables the engine to read from compressed .zip archives. If you + disable this feature, the engine can still read archives, but only uncompressed + ones. */ +-#define _IRR_COMPILE_WITH_ZLIB_ ++//#define _IRR_COMPILE_WITH_ZLIB_ + #ifdef NO_IRR_COMPILE_WITH_ZLIB_ + #undef _IRR_COMPILE_WITH_ZLIB_ + #endif diff --git a/testing/irrlicht/irrlicht-1.8.1-mesa-10.x.patch b/testing/irrlicht/irrlicht-1.8.1-mesa-10.x.patch index ab0b117c17..e90ff36443 100644 --- a/testing/irrlicht/irrlicht-1.8.1-mesa-10.x.patch +++ b/testing/irrlicht/irrlicht-1.8.1-mesa-10.x.patch @@ -7,34 +7,34 @@ Subject: [PATCH] Applied patch from jpirie for fixing mesa 10 compilation --- irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h +++ irrlicht-1.8.1/source/Irrlicht/COpenGLExtensionHandler.h @@ -21,6 +21,7 @@ - #endif - #include - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #endif - #include "wglext.h" + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #include "wglext.h" @@ -35,6 +36,7 @@ - #endif - #include - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #endif - #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #endif + #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) @@ -48,6 +50,7 @@ - #define NO_SDL_GLEXT - #include - #include -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #else - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + #define NO_SDL_GLEXT + #include + #include ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) @@ -60,6 +63,7 @@ - #include - #include - #if defined(_IRR_OPENGL_USE_EXTPOINTER_) -+ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); - #include "glext.h" - #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h - #include "glxext.h" + #include + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) ++ typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); + #include "glext.h" + #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h + #include "glxext.h" diff --git a/testing/irrlicht/irrlicht-1.8.1-sysctl.patch b/testing/irrlicht/irrlicht-1.8.1-sysctl.patch index 35f8aa5c86..5ab99a9667 100644 --- a/testing/irrlicht/irrlicht-1.8.1-sysctl.patch +++ b/testing/irrlicht/irrlicht-1.8.1-sysctl.patch @@ -1,11 +1,13 @@ ---- a/source/Irrlicht/COSOperator.cpp.orig +diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp +index 0899d1d..d0e25f4 100644 +--- a/source/Irrlicht/COSOperator.cpp +++ b/source/Irrlicht/COSOperator.cpp @@ -13,7 +13,7 @@ - #include - #ifndef _IRR_SOLARIS_PLATFORM_ - #include --#include -+//#include - #endif - #endif - + #include + #ifndef _IRR_SOLARIS_PLATFORM_ + #include +-#include ++//#include + #endif + #endif + -- cgit v1.2.3