From 1fa6edfba8d1e31ca1c0d59e8202cd3c62ccf393 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 6 Feb 2012 23:14:50 +0000
Subject: Mon Feb  6 23:14:50 UTC 2012

---
 community/irrlicht/PKGBUILD                      | 17 +++++++---
 community/irrlicht/irrlicht-1.7.2-libpng15.patch | 40 ++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 community/irrlicht/irrlicht-1.7.2-libpng15.patch

(limited to 'community/irrlicht')

diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index 8dd14decd..c4b0ceccd 100644
--- a/community/irrlicht/PKGBUILD
+++ b/community/irrlicht/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56796 2011-10-12 23:30:10Z svenstaro $
+# $Id: PKGBUILD 63632 2012-02-05 12:02:14Z ibiru $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
@@ -7,19 +7,26 @@
 
 pkgname=irrlicht
 pkgver=1.7.2
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source high performance realtime 3D graphics engine."
 arch=('i686' 'x86_64')
 url="http://irrlicht.sourceforge.net/"
 license=('ZLIB')
 depends=('libgl' 'libjpeg' 'bzip2' 'libpng')
-makedepends=('mesa')
-source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip")
-md5sums=('eb627d4c432bf73f12bc6d9ddc700b07')
+makedepends=('mesa' 'unzip')
+source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip"
+        "irrlicht-1.7.2-libpng15.patch")
+md5sums=('eb627d4c432bf73f12bc6d9ddc700b07'
+         'a7f8d4aa1bc2880bbeaf3449e09f69a5')
+noextract=($pkgname-$pkgver.zip)
 
 build() {
+  unzip $pkgname-$pkgver.zip
+
   cd $srcdir/$pkgname-$pkgver
 
+  patch -Np0 < $srcdir/irrlicht-1.7.2-libpng15.patch
+
   sed -i -e '/^#.*NON_SYSTEM_ZLIB/d' \
          -e '/^#.*NON_SYSTEM_JPEG/d' \
          -e '/^#.*NON_SYSTEM_LIB_PNG/d' \
diff --git a/community/irrlicht/irrlicht-1.7.2-libpng15.patch b/community/irrlicht/irrlicht-1.7.2-libpng15.patch
new file mode 100644
index 000000000..a1426bf29
--- /dev/null
+++ b/community/irrlicht/irrlicht-1.7.2-libpng15.patch
@@ -0,0 +1,40 @@
+--- source/Irrlicht/CImageLoaderPNG.cpp
++++ source/Irrlicht/CImageLoaderPNG.cpp
+@@ -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);
+ 	// }
+ 
+--- source/Irrlicht/CImageWriterPNG.cpp
++++ source/Irrlicht/CImageWriterPNG.cpp
+@@ -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)
-- 
cgit v1.2.3-54-g00ecf