Fri Dec 27 23:54:04 UTC 2013

2 files changed, 26 insertions, 76 deletions

diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index 53ac71ce8..ae8af24b7 100644
--- a/community/irrlicht/PKGBUILD
+++ b/community/irrlicht/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 79765 2012-11-12 07:14:50Z svenstaro $
+# $Id: PKGBUILD 102440 2013-12-11 11:35:15Z svenstaro $
 # 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>
 # Contributor: Paolo Fagni <paolo.fagni AT mail DOT com>
 # Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com>
 
-pkgname=irrlicht
-pkgver=1.8
-pkgrel=1
+pkgbase=irrlicht
+pkgname=('irrlicht' 'irrlicht-docs')
+pkgver=1.8.1
+pkgrel=2
 pkgdesc="An open source high performance realtime 3D graphics engine."
 arch=('i686' 'x86_64')
 url="http://irrlicht.sourceforge.net/"
@@ -17,54 +18,43 @@ makedepends=('mesa' 'unzip' 'libxcursor')
 optdepends=('libxcursor: run examples')
 source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip")
 noextract=($pkgname-$pkgver.zip)
-md5sums=('d06329d8f466658caaf4838ba349e393')
+md5sums=('db97cce5e92da9b053f4546c652e9bd5')
 
 build() {
-  unzip $pkgname-$pkgver.zip
+  unzip $pkgbase-$pkgver.zip
 
-  cd $srcdir/$pkgname-$pkgver
-
-  cd source/Irrlicht
-  sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \
-	 Makefile
+  cd $srcdir/$pkgbase-$pkgver/source/Irrlicht
 
   make NDEBUG=1 sharedlib
+}
 
-  make NDEBUG=1
+package_irrlicht() {
+  cd $srcdir/$pkgbase-$pkgver/source/Irrlicht
 
-  install -d $pkgdir/usr/lib \
-             $pkgdir/usr/share/licenses/$pkgname \
-             $pkgdir/usr/share/$pkgname/examples/bin \
-             $pkgdir/usr/share/doc/$pkgname
+  sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" Makefile
 
   make install
 
-  cd $srcdir/$pkgname-$pkgver/
-  install -m644 readme.txt $pkgdir/usr/share/licenses/$pkgname
-
-  # Install static library and fix headers permissions
-  install -m644 lib/Linux/libIrrlicht.a $pkgdir/usr/lib
-  chmod 644 $pkgdir/usr/include/$pkgname/*
+  cd $srcdir/$pkgbase-$pkgver/
+  install -Dm644 readme.txt $pkgdir/usr/share/licenses/$pkgbase/LICENSE
 
-  # Install media files for examples
-  cp -r media $pkgdir/usr/share/$pkgname
-
-  # Install documentation
-  cp -r doc/* $pkgdir/usr/share/doc/$pkgname
-  rm -f $pkgdir/usr/share/doc/$pkgname/*.txt
+  # fix headers permissions
+  chmod 644 $pkgdir/usr/include/$pkgbase/*
 
   cd $pkgdir/usr/lib
   ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1
+}
 
-  # Just a helper for examples compilation
-  ln -s libIrrlicht.so.$pkgver $srcdir/$pkgname-$pkgver/lib/Linux/libIrrlicht.so
+package_irrlicht-docs() {
+  cd $srcdir/$pkgbase-$pkgver/
 
-  # Edit, build and install the examples
-  cd $srcdir/$pkgname-$pkgver/examples
-  sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h
-  sed -i '/^CXXFLAGS/d' $(grep -Rl "^CXXFLAGS =" *)
+  install -d $pkgdir/usr/share/$pkgbase \
+             $pkgdir/usr/share/doc/$pkgbase
 
-  make
+  # install media files for examples
+  cp -r media $pkgdir/usr/share/$pkgbase
 
-  install -m755  ../bin/Linux/* /$pkgdir/usr/share/$pkgname/examples/bin/
+  # install documentation
+  cp -r doc/* $pkgdir/usr/share/doc/$pkgbase
+  rm -f $pkgdir/usr/share/doc/$pkgbase/*.txt
 }
diff --git a/community/irrlicht/irrlicht-1.7.2-libpng15.patch b/community/irrlicht/irrlicht-1.7.2-libpng15.patch
deleted file mode 100644
index a1426bf29..000000000
--- a/community/irrlicht/irrlicht-1.7.2-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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)