Sun Jan 22 23:15:13 UTC 2012

3 files changed, 35 insertions, 31 deletions

diff --git a/community/freemat/PKGBUILD b/community/freemat/PKGBUILD
index 0dc55bb14..2609674ba 100644
--- a/community/freemat/PKGBUILD
+++ b/community/freemat/PKGBUILD
@@ -1,45 +1,38 @@
-# $Id: PKGBUILD 58815 2011-11-18 15:51:12Z spupykin $
+# $Id: PKGBUILD 62525 2012-01-20 17:49:51Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freemat
-pkgver=4.0
-pkgrel=5
+pkgver=4.1
+pkgrel=1
 pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
 arch=('i686' 'x86_64')
 url="http://freemat.sourceforge.net"
 license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake')
+depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi')
+makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
 install=freemat.install
 source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	freemat-gcc-4.3.0.patch
-	freemat-gcc-4.5.0.patch
-	freemat-qt46.patch
-	input-fix.patch)
-md5sums=('adb58b9f2c508d9ae5b6041da2f75baf'
-         '3dc3848949183de2664c2cf67663c892'
-         'a3edb7b51057a90a752aff5053f8eed6'
-         'a8d2ffa9319eccaedb28a10f9c7617f4'
-         'a78941563453feaca5c7463eaeea1a70')
+	build-fix.patch)
+md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
+         '2d11a28aa2a7df89c4618ed1c4be5973')
 
 build() {
-  cd $srcdir/FreeMat-$pkgver.1-Source
+  cd $srcdir/FreeMat-$pkgver-Source
 
-  if [ $NOEXTRACT -ne 1 ]; then
-    patch -p1 <$srcdir/freemat-gcc-4.5.0.patch
-    patch -p1 <$srcdir/input-fix.patch
-    patch -p1 <$srcdir/freemat-qt46.patch
-    patch -p1 CMakeCache.txt <<EOF
-23c23,25
-< CMAKE_CACHEFILE_DIR:INTERNAL=/home/basu/dev/branches/FreeMat4
----
-> #CMAKE_CACHEFILE_DIR:INTERNAL=/home/basu/dev/branches/FreeMat4
-> USE_LLVM:BOOL=OFF
-> CMAKE_INSTALL_PREFIX:PATH=/usr
-EOF
-    cmake `pwd`
-  fi
+  rm -f CMakeCache.txt
+  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
+  find . -type f -name 'add.so' -exec rm -f {} \;
+  patch -p1 <$srcdir/build-fix.patch
+  echo >libs/libMatC/CJitFuncClang.hpp
+  echo >libs/libMatC/CJitFuncClang.cpp
+
+  cmake \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DUSE_LLVM=OFF \
+	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
+	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
+	.
   make
   make DESTDIR=$pkgdir install
   sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
diff --git a/community/freemat/build-fix.patch b/community/freemat/build-fix.patch
new file mode 100644
index 000000000..c1ea63088
--- /dev/null
+++ b/community/freemat/build-fix.patch
@@ -0,0 +1,11 @@
+diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
+--- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
++++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
+@@ -20,6 +20,7 @@
+ #include <qimage.h>
+ #include <qpainter.h>
+ #include <QtOpenGL>
++#include <GL/glu.h>
+ #include <math.h>
+ #include "IEEEFP.hpp"
+ 
diff --git a/community/freemat/freemat.install b/community/freemat/freemat.install
index e319f1a24..051cca866 100644
--- a/community/freemat/freemat.install
+++ b/community/freemat/freemat.install
@@ -1,7 +1,7 @@
 post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.0/ to adjust docs location"
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
 }
 
 post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.0/ to adjust docs location"
+  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
 }