Cleanup and fix broken package()

3 files changed, 21 insertions, 86 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8158f57f99fa..1d48b0478469 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 # Generated by mksrcinfo v8
-# Sun Aug 14 08:54:00 UTC 2016
+# Fri Jan  4 08:10:50 UTC 2019
 pkgbase = algodoo
 	pkgdesc = A physics simulator program for education and fun (based on phun)
 	pkgver = 1.x.x.latest
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.algodoo.com/
 	arch = i686
 	arch = x86_64
 	license = custom:commercial
-	source = algodoo.desktop
-	md5sums = c1baec0f7e0ae085a7b41116d7500912
+	options = !strip
 	source_i686 = algodoo.desktop
 	source_i686 = http://www.algodoo.com/download/algodoo_1_8_5-Linux32.tgz
 	depends_i686 = boost-libs
@@ -26,9 +25,7 @@ pkgbase = algodoo
 	md5sums_i686 = c1baec0f7e0ae085a7b41116d7500912
 	md5sums_i686 = e215e6089b478226f6bf245caa754a6d
 	source_x86_64 = algodoo.desktop
-	source_x86_64 = Makefile.LINUX
 	source_x86_64 = http://www.algodoo.com/download/algodoo_1_8_5-Linux64.tgz
-	source_x86_64 = http://archive.ubuntu.com/ubuntu/pool/main/b/blas/blas_1.2.20110419.orig.tar.gz
 	depends_x86_64 = boost-libs
 	depends_x86_64 = curl
 	depends_x86_64 = glew
@@ -47,10 +44,10 @@ pkgbase = algodoo
 	depends_x86_64 = libtheora
 	depends_x86_64 = libvpx
 	depends_x86_64 = libraw1394
+	depends_x86_64 = lapack
+	depends_x86_64 = jasper
 	md5sums_x86_64 = c1baec0f7e0ae085a7b41116d7500912
-	md5sums_x86_64 = a07c8baa4c7e07df6054f65ae457f027
 	md5sums_x86_64 = d09fe5baffdc64a3fdcf61e3bcba3d78
-	md5sums_x86_64 = 683092022d7ede73bc98844d10803730
 
 pkgname = algodoo
 
diff --git a/Makefile.LINUX b/Makefile.LINUX
deleted file mode 100644
index 0f5d624194ae..000000000000
--- a/Makefile.LINUX
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Makefile.LINUX
-#
-#
-# If you compile, change the name to Makefile.in.
-#
-#
- 
-#-----------------------------------------------------------------------------
-# Shell
-#-----------------------------------------------------------------------------
-
-SHELL = /bin/sh
-
-#-----------------------------------------------------------------------------
-# Platform
-#-----------------------------------------------------------------------------
-
-PLAT = LINUX
-
-#-----------------------------------------------------------------------------
-# Libraries and includs
-#-----------------------------------------------------------------------------
- 
-BLLIB = libblas.a
-CBDIR = $(HOME)/CBLAS
-CBLIBDIR = $(CBDIR)/lib/$(PLAT)
-CBLIB = $(CBLIBDIR)/cblas_$(PLAT).a
-
-#-----------------------------------------------------------------------------
-# Compilers
-#-----------------------------------------------------------------------------
-
-CC = gcc
-FC = gfortran
-LOADER = $(FC)
-
-#-----------------------------------------------------------------------------
-# Flags for Compilers
-#-----------------------------------------------------------------------------
-
-CFLAGS = -O3 -DADD_ -fPIC
-FFLAGS = -O3   -fPIC
-
-#-----------------------------------------------------------------------------
-# Archive programs and flags
-#-----------------------------------------------------------------------------
-
-ARCH = ar
-ARCHFLAGS = r
-RANLIB = echo
diff --git a/PKGBUILD b/PKGBUILD
index 3a49997c6224..40ca67bd333d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,62 +4,51 @@
 
 pkgname=algodoo
 pkgver=1.x.x.latest
-pkgrel=4
+pkgrel=5
 pkgdesc="A physics simulator program for education and fun (based on phun)"
 arch=(i686 x86_64)
 url=http://www.algodoo.com/
 license=(custom:commercial)
 depends_i686=(boost-libs curl glew libjpeg6 libpng12 libzip mesa pango sdl_image libcurl-gnutls glew1.5)
-depends_x86_64=(${depends_i686[@]} 'libva' 'gsm' 'schroedinger' 'speex' 'libtheora' 'libvpx' 'libraw1394')
+depends_x86_64=(${depends_i686[@]} libva gsm schroedinger speex libtheora libvpx libraw1394 lapack jasper)
+options=('!strip')
+
+source_i686=('algodoo.desktop' 'http://www.algodoo.com/download/algodoo_1_8_5-Linux32.tgz')
+source_x86_64=('algodoo.desktop' 'http://www.algodoo.com/download/algodoo_1_8_5-Linux64.tgz')
 
-source=(algodoo.desktop)
-source_i686=(${source[@]} 'http://www.algodoo.com/download/algodoo_1_8_5-Linux32.tgz')
-md5sums=('c1baec0f7e0ae085a7b41116d7500912')
 md5sums_i686=('c1baec0f7e0ae085a7b41116d7500912'
               'e215e6089b478226f6bf245caa754a6d')
 md5sums_x86_64=('c1baec0f7e0ae085a7b41116d7500912'
-                'a07c8baa4c7e07df6054f65ae457f027'
-                'd09fe5baffdc64a3fdcf61e3bcba3d78'
-                '683092022d7ede73bc98844d10803730')
+                'd09fe5baffdc64a3fdcf61e3bcba3d78')
 
-source_x86_64=(${source[@]} 'Makefile.LINUX' 'http://www.algodoo.com/download/algodoo_1_8_5-Linux64.tgz' 'http://archive.ubuntu.com/ubuntu/pool/main/b/blas/blas_1.2.20110419.orig.tar.gz')
 
 package()
 {
-  if [ $CARCH == 'i686' ]
-  then
-        cd tarball
-  else
-	cd blas-1.2.orig/cblas
-	ln -fs Makefile.LINUX Makefile.in
-	cp ${srcdir}/Makefile.LINUX .
-	cd src
-	make all
-	gfortran -shared -Wl,-soname=libblas.so.3gf -o libblas.so.3gf *.o
-	cd ${srcdir}
-  fi
   mv Algodoo algodoo
   mkdir -p "${pkgdir}"/usr/share
   mv algodoo "${pkgdir}"/usr/share/
   cd "${pkgdir}"/usr/share/algodoo/lib
   if [ $CARCH == 'i686' ]
         then
-          ln -s libcxcore.so.2 libcxcore.so.1
-          ln -s libcv.so.2 libcv.so.1
-          ln -s libhighgui.so.2 libhighgui.so.1
+          ln -s libcxcore.so libcxcore.so.1
+          ln -s libcv.so libcv.so.1
+          ln -s libhighgui.so libhighgui.so.1
         else
+          rm liblapack.so.3gf
           ln -s libcxcore.so libcxcore.so.2.1
           ln -s libcv.so libcv.so.2.1
           ln -s libhighgui.so libhighgui.so.2.1
           ln -s libzip.so libzip.so.1
           ln -s libtiff.so libtiff.so.4
           ln -s libswscale.so libswscale.so.0
-          ln -s /usr/lib/libvpx.so.4 libvpx.so.0
-          install -m644 $srcdir/blas-1.2.orig/cblas/src/libblas.so.3gf libblas.so.3gf
+          ln -s /usr/lib/libvpx.so libvpx.so.0
+          ln -s /usr/lib/libjasper.so libjasper.so.1
+          ln -s /usr/lib/liblapack.so liblapack.so.3gf
+          ln -s /usr/lib/libva.so libva.so.1
         fi
   mkdir -p "${pkgdir}"/usr/bin
   cat <<HERE >${pkgdir}/usr/bin/algodoo
-#!/bin/bash
+#!/bin/sh
 export LD_LIBRARY_PATH="/usr/share/algodoo/lib:${LD_LIBRARY_PATH}"
 exec /usr/share/algodoo/algodoo.bin
 HERE