testing/irrlicht: really fixed include path, removed demos + other cleanups/fixes

1 files changed, 11 insertions, 38 deletions

diff --git a/testing/irrlicht/APKBUILD b/testing/irrlicht/APKBUILD
index 3e7457969b5..8e7644f661d 100644
--- a/testing/irrlicht/APKBUILD
+++ b/testing/irrlicht/APKBUILD
@@ -1,18 +1,14 @@
+# Contributor: <xmingske@gmail.com>
 # Maintainer: Jeff Bilyk <jbilyk@alpinelinux.org>
 pkgname=irrlicht
 pkgver=1.8.1
-case $pkgver in
-*.*.*) _pkgmajver=${pkgver%.*};;
-*.*) _pkgmajver=${pkgver};;
-esac
-pkgrel=1
-pkgdesc="3D graphics engine"
+pkgrel=2
+pkgdesc="High performance realtime 3D engine written in C++"
 url="http://irrlicht.sourceforge.net"
 arch="all"
 license="ZLIB"
 depends=
-depends_dev="musl-dev mesa-dev jpeg-dev bzip2 libpng-dev zlib-dev"
-makedepends="$depends_dev"
+makedepends="mesa-dev jpeg-dev bzip2 libpng-dev zlib-dev"
 install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://downloads.sourceforge.net/irrlicht/irrlicht-$pkgver.zip
@@ -20,8 +16,8 @@ source="http://downloads.sourceforge.net/irrlicht/irrlicht-$pkgver.zip
 	irrlicht-1.8.1-config.patch
 	irrlicht-1.8.1-sysctl.patch
 "
+_builddir="$srcdir"/$pkgname-$pkgver/
 
-_builddir="$srcdir"/$pkgname-$pkgver/source/Irrlicht
 prepare() {
        local i
        cd "$srcdir"/$pkgname-$pkgver/
@@ -33,17 +29,11 @@ prepare() {
 }
 
 build() {
-       cd "$_builddir"
+       cd "$_builddir"/source/Irrlicht/
        make sharedlib || return 1
-       make || return 1
 
        #from arch pkgbuild: example build helper
        ln -s libIrrlicht.so.$pkgver "$srcdir"/$pkgname-$pkgver/lib/Linux/libIrrlicht.so
-
-       cd ../../examples
-       # Fix examples building
-       sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h
-       make || return 1
 }
 
 package() {
@@ -51,37 +41,20 @@ package() {
 
        mkdir -p "$pkgdir"/usr/lib
        mkdir -p "$pkgdir"/usr/share/licenses/$pkgname
-       mkdir -p "$pkgdir"/usr/share/$pkgname/examples/bin
        mkdir -p "$pkgdir"/usr/share/doc/$pkgname
-       mkdir -p "$pkgdir"/usr/include/$pkgname/include
-
-       make INSTALL_DIR="$pkgdir" install || return 1
+       mkdir -p "$pkgdir"/usr/include/$pkgname
 
-       cd ../..
        install -m644 readme.txt "$pkgdir"/usr/share/licenses/$pkgname
 
-       #from arch pkgbuild: install static library and fix perms
-       install -m644 lib/Linux/libIrrlicht.a "$pkgdir"/usr/lib
-
-       #from arch pkgbuild: install media file examples
-       cp -r media "$pkgdir"/usr/share/$pkgname
-
        #from arch pkgbuild: install docs
        cp -r doc/* "$pkgdir"/usr/share/doc/$pkgname
-       rm -f "$pkgdir"/usr/share/doc/$pkgname/*.txt
 
+       install -m755 "$_builddir"/lib/Linux/libIrrlicht.so.$pkgver "$pkgdir"/usr/lib
        cd "$pkgdir"/usr/lib
-       mv ../../libIrrlicht* ./
-       ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1
-       ln -s libIrrlicht.so.$pkgver libIrrlicht.so.$_pkgmajver
-
-       rmdir "$pkgdir"/usr/include/$pkgname/include/irricht/
-       rmdir "$pkgdir"/usr/include/$pkgname/include/
-       mv "$pkgdir"/../include/* "$pkgdir"/usr/include/$pkgname/include/
-       mv "$pkgdir"/usr/include/$pkgname/include/irrlicht/* "$pkgdir"/usr/include/$pkgname/
-       rm -rf "$pkgdir"/../include/
+       ln -s libIrrlicht.so.$pkgver libIrrlicht.so
+       ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1.8
 
-       install -m755 "$srcdir"/$pkgname-$pkgver/bin/Linux/* "$pkgdir"/usr/share/$pkgname/examples/bin/
+       install -m644 "$_builddir"/include/* "$pkgdir"/usr/include/$pkgname
 }
 
 md5sums="f4f7fa33bd1060eb0dd51dcd66b0f6e3  irrlicht-1.8.1.zip