10 files changed, 88 insertions, 13 deletions
diff --git a/extra/abiword/PKGBUILD b/extra/abiword/PKGBUILD
index b2e9ef2ca..4b81dc298 100644
--- a/extra/abiword/PKGBUILD
+++ b/extra/abiword/PKGBUILD
@@ -16,6 +16,33 @@ source=("http://www.abisource.com/downloads/${pkgbase}/${pkgver}/source/${pkgbas
 sha1sums=('998f69d038000b3fc027d4259548f02d67c8d0df'
           'e5374f439e3d9b63a4bbd2cd39146c67cf1e85ea')
 
+if [ "${CARCH}" = 'mips64el' ]; then
+    
+    ARCHFLAGS=""
+    for opt in ${CFLAGS}; do
+        case ${opt} in
+            -O?) ARCHFLAGS+="-O1 " ;;
+            *) ARCHFLAGS+="${opt} " ;;
+        esac
+    done
+    CFLAGS=${ARCHFLAGS}
+
+    ARCHFLAGS=""
+    for opt in ${CXXFLAGS}; do
+        case ${opt} in
+            -O?) ARCHFLAGS+="-O1 " ;;
+            *) ARCHFLAGS+="${opt} " ;;
+        esac
+    done
+    CXXFLAGS=${ARCHFLAGS}
+
+    unset ARCHFLAGS
+
+    echo CFLAGS  : ${CFLAGS}
+    echo CXXFLAGS: ${CXXFLAGS}
+fi
+
+
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 466fe6629..e307b5c11 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -7,7 +7,7 @@ pkgname=ffmpeg
 pkgver=20110330
 pkgrel=2
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://ffmpeg.org/"
 license=('GPL')
 depends=('bzip2' 'lame' 'sdl' 'libvorbis' 'xvidcore' 'zlib' 'x264' 'libtheora' 'opencore-amr' 'alsa-lib' 'libvdpau' 'libxfixes' 'schroedinger' 'libvpx' 'libva' 'openjpeg')
diff --git a/extra/gdome2/PKGBUILD b/extra/gdome2/PKGBUILD
index 7646b3763..0a8aac671 100644
--- a/extra/gdome2/PKGBUILD
+++ b/extra/gdome2/PKGBUILD
@@ -16,7 +16,11 @@ md5sums=('bfc114e59eec50cbda8e4ece751ff022')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --mandir=/usr/share/man
+  if [ "$CARCH" = mips64el ]; then
+      CFLAGS="$CFLAGS -fpic"
+      CXXFLAGS="$CXXFLAGS -fpic"
+  fi
+  ./configure --prefix=/usr --mandir=/usr/share/man --host=${CARCH}
   make
 }
 
diff --git a/extra/libmad/PKGBUILD b/extra/libmad/PKGBUILD
index 31ec18b16..14f32b061 100644
--- a/extra/libmad/PKGBUILD
+++ b/extra/libmad/PKGBUILD
@@ -29,7 +29,7 @@ build() {
   patch -p1 -i "${srcdir}/optimize.diff"
   CFLAGS="$CFLAGS -ftree-vectorize -ftree-vectorizer-verbose=1"
   autoconf
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --enable-fpm=default
   make
 }
 
diff --git a/extra/ocaml/PKGBUILD b/extra/ocaml/PKGBUILD
index 2e994e28d..c321869aa 100644
--- a/extra/ocaml/PKGBUILD
+++ b/extra/ocaml/PKGBUILD
@@ -12,16 +12,23 @@ depends=('gdbm')
 makedepends=('tk' 'ncurses>=5.6-7' 'libx11')
 optdepends=('ncurses: advanced ncurses features' 'tk: advanced tk features')
 source=(http://caml.inria.fr/distrib/ocaml-3.12/${pkgname}-${pkgver}.tar.gz
-        fix-ocaml-binutils-2.21.patch)
+        fix-ocaml-binutils-2.21.patch
+        fix-caml_int64_float_of_bits-n32.patch)
 options=('!makeflags' '!emptydirs')
 md5sums=('3ba7cc65123c3579f14e7c726d3ee782'
-         '8c664a0a346424ea2ec6fc6f713170c6')
+         '8c664a0a346424ea2ec6fc6f713170c6'
+         'e2c8bc316efe40532c5b9d7f9a1d8d62')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/fix-ocaml-binutils-2.21.patch"
+  patch -Np1 -i "${srcdir}/fix-caml_int64_float_of_bits-n32.patch"
   ./configure -prefix /usr 
-  make world.opt
+  if [ "${CARCH}" == "mips64el" ] ; then
+      make world
+  else
+      make world.opt
+  fi
   make PREFIX="${pkgdir}/usr" MANDIR="${pkgdir}/usr/share/man" install
    
   # Save >10MB with this one, makepkg only strips debug symbols.
diff --git a/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch b/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch
new file mode 100644
index 000000000..98755d30b
--- /dev/null
+++ b/extra/ocaml/fix-caml_int64_float_of_bits-n32.patch
@@ -0,0 +1,12 @@
+--- ocaml-3.12.0.orig/byterun/ints.c	2011-06-25 18:03:21.548733206 +0200
++++ ocaml-3.12.0/byterun/ints.c	2011-06-25 22:34:17.304788306 +0200
+@@ -585,6 +585,9 @@
+   return caml_copy_int64(u.i);
+ }
+ 
++#ifdef _ABIN32
++__attribute__((optimize(0)))
++#endif
+ CAMLprim value caml_int64_float_of_bits(value vi)
+ {
+   union { double d; int64 i; int32 h[2]; } u;
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index d54651ccc..03118b5a2 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -26,7 +26,8 @@ build() {
   patch -p1 -i "${srcdir}"/libv4l-0.8.3.patch
 
   if [ ${CARCH} == 'mips64el' ]; then
-      EXTRAOPTS="--without-snm"
+      export CFLAGS="${CFLAGS} -O1"
+      EXTRAOPTS="--without-snmp"
   else
       EXTRAOPTS=""
   fi
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index d7bb5d4b8..0ca331123 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -12,10 +12,12 @@ arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
 depends=('glibc')
 provides=('common-lisp' 'cl-asdf')
-makedepends=('sbcl' 'texinfo')
-source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp")
+makedepends=('clisp' 'texinfo')
+source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2" "arch-fixes.lisp"
+        "mips-arch.h.diff")
 md5sums=('8d15c6af6388fcd9efbd13f301b7ba33'
-         '7ac0c1936547f4278198b8bf7725204d')
+         '7ac0c1936547f4278198b8bf7725204d'
+         'a456535d65d6c5b85b1b646f11455fce')
 url="http://www.sbcl.org/"
 install=sbcl.install
 
@@ -32,11 +34,13 @@ build() {
 (lambda (features)
   (flet ((enable (x) (pushnew x features))
          (disable (x) (setf features (remove x features))))
-  (enable :sb-thread)
+  (disable :sb-thread)
   (disable :largefile)))
 EOF
 
-  sh make.sh sbcl
+  patch -Nup1 < "${srcdir}/mips-arch.h.diff"
+
+  sh make.sh clisp
   mkdir -p ${startdir}/pkg/usr
   pushd doc/manual
   make info || return 1
diff --git a/extra/sbcl/mips-arch.h.diff b/extra/sbcl/mips-arch.h.diff
new file mode 100644
index 000000000..4f593aa83
--- /dev/null
+++ b/extra/sbcl/mips-arch.h.diff
@@ -0,0 +1,20 @@
+--- sbcl-1.0.49.orig/src/runtime/mips-arch.h	2011-06-25 16:13:44.103101571 +0200
++++ sbcl-1.0.49/src/runtime/mips-arch.h	2011-06-25 16:14:31.279501569 +0200
+@@ -1,6 +1,8 @@
+ #ifndef _MIPS_ARCH_H
+ #define _MIPS_ARCH_H
+ 
++/* For lose. */
++#include "interr.h"
+ 
+ static inline void
+ get_spinlock(volatile lispobj *word, long value)
+@@ -31,7 +33,7 @@
+           [__new] "r" (value)
+         : "memory");
+ 
+-    if (!cmp)
++    if (!__cmp)
+         lose("recursive get_spinlock: 0x%x,%d\n", word, value);
+ #else /* LISP_FEATURE_SB_THREAD */
+     *word=value;
diff --git a/extra/xvidcore/PKGBUILD b/extra/xvidcore/PKGBUILD
index 360ddd8aa..924265186 100644
--- a/extra/xvidcore/PKGBUILD
+++ b/extra/xvidcore/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=xvidcore
 pkgver=1.3.2
 pkgrel=1
 pkgdesc="XviD is an open source MPEG-4 video codec"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xvid.org/"
 license=('GPL')
 depends=('glibc')