Fix (hopefully) 64bit build

3 files changed, 142 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d392b3e0643..f82dac8accc7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,56 @@
+# Generated by mksrcinfo v8
+# Sat Aug 13 18:37:26 UTC 2016
 pkgbase = algodoo
 	pkgdesc = A physics simulator program for education and fun (based on phun)
 	pkgver = 1.x.x.latest
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.algodoo.com/
 	arch = i686
+	arch = x86_64
 	license = custom:commercial
-	makedepends = lynx
-	depends = boost-libs
-	depends = curl
-	depends = glew
-	depends = libjpeg6
-	depends = libpng12
-	depends = libzip
-	depends = mesa
-	depends = pango
-	depends = sdl_image
-	depends = libcurl-gnutls
 	source = algodoo.desktop
 	md5sums = c1baec0f7e0ae085a7b41116d7500912
+	source_i686 = algodoo.desktop
+	source_i686 = http://www.algodoo.com/download/algodoo_1_8_5-Linux32.tgz
+	depends_i686 = boost-libs
+	depends_i686 = curl
+	depends_i686 = glew
+	depends_i686 = libjpeg6
+	depends_i686 = libpng12
+	depends_i686 = libzip
+	depends_i686 = mesa
+	depends_i686 = pango
+	depends_i686 = sdl_image
+	depends_i686 = libcurl-gnutls
+	depends_i686 = glew1.5
+	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
+	depends_x86_64 = libjpeg6
+	depends_x86_64 = libpng12
+	depends_x86_64 = libzip
+	depends_x86_64 = mesa
+	depends_x86_64 = pango
+	depends_x86_64 = sdl_image
+	depends_x86_64 = libcurl-gnutls
+	depends_x86_64 = glew1.5
+	depends_x86_64 = libva
+	depends_x86_64 = gsm
+	depends_x86_64 = schroedinger
+	depends_x86_64 = speex
+	depends_x86_64 = libtheora
+	depends_x86_64 = libvpx
+	depends_x86_64 = libraw1394
+	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
new file mode 100644
index 000000000000..0f5d624194ae
--- /dev/null
+++ b/Makefile.LINUX
@@ -0,0 +1,51 @@
+#
+# 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 3c5b1ed02a6f..ec195ffd3258 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,41 +4,66 @@
 
 pkgname=algodoo
 pkgver=1.x.x.latest
-pkgrel=2
+pkgrel=3
 pkgdesc="A physics simulator program for education and fun (based on phun)"
-arch=(i686)
+arch=(i686 x86_64)
 url=http://www.algodoo.com/
 license=(custom:commercial)
-depends=(boost-libs curl glew libjpeg6 libpng12 libzip mesa pango sdl_image libcurl-gnutls)
+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')
+
 source=(algodoo.desktop)
-makedepends=(lynx)
+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')
 
-build(){
-:
-}
+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()
 {
-  rm algodoo.tgz 2>/dev/null || true
-  _url=$(lynx -dump "http://www.algodoo.com/wiki/Download" | grep -o http.*download.algodoo_.*Linux32.tgz)
-  wget -O algodoo.tgz "${_url}"
-  bsdtar -xf algodoo.tgz
-  cd tarball
+  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
+  fi
+  cd ${srcdir}
   mv Algodoo algodoo
   mkdir -p "${pkgdir}"/usr/share
   mv algodoo "${pkgdir}"/usr/share/
   cd "${pkgdir}"/usr/share/algodoo/lib
-  ln -s libcxcore.so.2 libcxcore.so.1
-  ln -s libcv.so.2 libcv.so.1
-  ln -s libhighgui.so.2 libhighgui.so.1
+  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
+        else
+          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
+        fi
   mkdir -p "${pkgdir}"/usr/bin
-  USRBINFILE="${pkgdir}"/usr/bin/algodoo
-  echo '#!/bin/bash' > "${USRBINFILE}"
-  echo 'export LD_LIBRARY_PATH="/usr/share/algodoo/lib:${LD_LIBRARY_PATH}"' >> "${USRBINFILE}"
-  echo 'exec /usr/share/algodoo/algodoo.bin' >> "${USRBINFILE}"
-  chmod +x "${USRBINFILE}"
+  cat <<HERE >${pkgdir}/usr/bin/algodoo
+#!/bin/bash
+export LD_LIBRARY_PATH="/usr/share/algodoo/lib:${LD_LIBRARY_PATH}"
+exec /usr/share/algodoo/algodoo.bin
+HERE
+  chmod +x ${pkgdir}/usr/bin/algodoo
   install -Dm644 $pkgdir/usr/share/algodoo/data/logos/icon.bmp $pkgdir/usr/share/pixmaps/algodoo.bmp
   install -Dm644 $srcdir/algodoo.desktop $pkgdir/usr/share/applications/algodoo.desktop
 }
-