Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

2 files changed, 52 insertions, 5 deletions

diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index 740ce5a28..eedb901ec 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' 'mips64el')
 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)