Merge branch 'master' of ssh://gparabola/srv/git/abslibre-mips64el

Conflicts:
	community/wings3d/wings3d.sh
	extra/openmpi/PKGBUILD
	~xihh/couchdb-git/couchdb.install
	~xihh/couchdb-git/rc-script.patch
	~xihh/gmime24/PKGBUILD

13 files changed, 119 insertions, 293 deletions

diff --git a/community/wings3d/wings3d.sh b/community/wings3d/wings3d.sh
new file mode 100644
index 000000000..c0fd3b2fb
--- /dev/null
+++ b/community/wings3d/wings3d.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"}
diff --git a/extra/farstream/PKGBUILD b/extra/farstream/PKGBUILD
index ccfa4887c..2a9c961d4 100644
--- a/extra/farstream/PKGBUILD
+++ b/extra/farstream/PKGBUILD
@@ -5,7 +5,7 @@ pkgname=farstream
 pkgver=0.1.2
 pkgrel=1
 pkgdesc="Farstream (formerly Farsight) - Audio/Video Communications Framework"
-arch=(i686 x86_64)
+arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/Farstream"
 license=('LGPL2.1')
 depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins' 'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
@@ -22,8 +22,8 @@ build() {
   cd  "$pkgname-$pkgver"
   patch -Np1 -i "$srcdir/vp8.patch"
   ./configure --prefix=/usr \
-    --with-package-name='Arch Linux farstream package' \
-    --with-package-origin='http://archlinux.org' \
+    --with-package-name='Parabola GNU/Linux-libre farstream package' \
+    --with-package-origin='https://parabolagnulinux.org/' \
     --disable-static
   make
 }
diff --git a/extra/fwbuilder/gcc47.patch b/extra/fwbuilder/gcc47.patch
deleted file mode 100644
index 2581e9b43..000000000
--- a/extra/fwbuilder/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru fwbuilder-5.0.1.3592.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h
---- fwbuilder-5.0.1.3592.orig/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-04-21 19:25:26.684127714 +0200
-+++ fwbuilder-5.0.1.3592/src/libfwbuilder/src/fwbuilder/ThreadTools.h	2012-04-21 19:26:05.308091572 +0200
-@@ -31,6 +31,7 @@
- 
- #include <time.h> //for time_t definition
- #include <pthread.h>
-+#include <unistd.h>  // for ssize_t
- 
- #include <string>
- #include <queue>
diff --git a/extra/xulrunner/mips.patch b/extra/xulrunner/mips.patch
deleted file mode 100644
index f9de910b2..000000000
--- a/extra/xulrunner/mips.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- ../../tmp.ne6Bz1oy72/xulrunner/src/mozilla-2.0/js/src/assembler/jit/ExecutableAllocator.h	2011-03-18 20:33:47.000000000 -0300
-+++ js/src/assembler/jit/ExecutableAllocator.h	2011-03-30 15:45:07.537247142 -0300
-@@ -44,9 +44,7 @@
- #include <e32std.h>
- #endif
- 
--#if WTF_CPU_MIPS && WTF_PLATFORM_LINUX
- #include <sys/cachectl.h>
--#endif
- 
- #if WTF_PLATFORM_WINCE
- // From pkfuncs.h (private header file from the Platform Builder)
-@@ -311,89 +309,10 @@
- #endif
- 
- 
--#if WTF_CPU_X86 || WTF_CPU_X86_64
--    static void cacheFlush(void*, size_t)
--    {
--    }
--#elif WTF_CPU_MIPS
-     static void cacheFlush(void* code, size_t size)
-     {
--#if WTF_COMPILER_GCC && (GCC_VERSION >= 40300)
--#if WTF_MIPS_ISA_REV(2) && (GCC_VERSION < 40403)
--        int lineSize;
--        asm("rdhwr %0, $1" : "=r" (lineSize));
--        //
--        // Modify "start" and "end" to avoid GCC 4.3.0-4.4.2 bug in
--        // mips_expand_synci_loop that may execute synci one more time.
--        // "start" points to the fisrt byte of the cache line.
--        // "end" points to the last byte of the line before the last cache line.
--        // Because size is always a multiple of 4, this is safe to set
--        // "end" to the last byte.
--        //
--        intptr_t start = reinterpret_cast<intptr_t>(code) & (-lineSize);
--        intptr_t end = ((reinterpret_cast<intptr_t>(code) + size - 1) & (-lineSize)) - 1;
--        __builtin___clear_cache(reinterpret_cast<char*>(start), reinterpret_cast<char*>(end));
--#else
--        intptr_t end = reinterpret_cast<intptr_t>(code) + size;
--        __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));
--#endif
--#else
-         _flush_cache(reinterpret_cast<char*>(code), size, BCACHE);
--#endif
--    }
--#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_IPHONE
--    static void cacheFlush(void* code, size_t size)
--    {
--        sys_dcache_flush(code, size);
--        sys_icache_invalidate(code, size);
--    }
--#elif WTF_CPU_ARM_THUMB2 && WTF_PLATFORM_LINUX
--    static void cacheFlush(void* code, size_t size)
--    {
--        asm volatile (
--            "push    {r7}\n"
--            "mov     r0, %0\n"
--            "mov     r1, %1\n"
--            "movw    r7, #0x2\n"
--            "movt    r7, #0xf\n"
--            "movs    r2, #0x0\n"
--            "svc     0x0\n"
--            "pop     {r7}\n"
--            :
--            : "r" (code), "r" (reinterpret_cast<char*>(code) + size)
--            : "r0", "r1", "r2");
--    }
--#elif WTF_PLATFORM_SYMBIAN
--    static void cacheFlush(void* code, size_t size)
--    {
--        User::IMB_Range(code, static_cast<char*>(code) + size);
--    }
--#elif WTF_CPU_ARM_TRADITIONAL && WTF_PLATFORM_LINUX && WTF_COMPILER_RVCT
--    static __asm void cacheFlush(void* code, size_t size);
--#elif WTF_CPU_ARM_TRADITIONAL && (WTF_PLATFORM_LINUX || WTF_PLATFORM_ANDROID) && WTF_COMPILER_GCC
--    static void cacheFlush(void* code, size_t size)
--    {
--        asm volatile (
--            "push    {r7}\n"
--            "mov     r0, %0\n"
--            "mov     r1, %1\n"
--            "mov     r7, #0xf0000\n"
--            "add     r7, r7, #0x2\n"
--            "mov     r2, #0x0\n"
--            "svc     0x0\n"
--            "pop     {r7}\n"
--            :
--            : "r" (code), "r" (reinterpret_cast<char*>(code) + size)
--            : "r0", "r1", "r2");
--    }
--#elif WTF_PLATFORM_WINCE
--    static void cacheFlush(void* code, size_t size)
--    {
--        CacheRangeFlush(code, size, CACHE_SYNC_ALL);
-     }
--#else
--    #error "The cacheFlush support is missing on this platform."
--#endif
- 
- private:
- 
---- js/src/Makefile.in.orig	2011-03-30 22:02:39.725318514 -0300
-+++ js/src/Makefile.in	2011-03-30 22:02:51.689347820 -0300
-@@ -914,7 +914,7 @@
- # Needed to "configure" it correctly.  Unfortunately these
- # flags wind up being applied to all code in js/src, not just
- # the code in js/src/assembler.
--CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1
-+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_JIT=1
- 
- INCLUDES +=	-I$(srcdir)/assembler -I$(srcdir)/yarr
- 
-
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 9694faf9e..d2bfa1a1f 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -17,7 +17,6 @@ md5sums=('e4822fa2cc933768e2998311a1565979')
 
 build() {
   cd "${srcdir}/gst-plugins-bad-${pkgver}"
-  patch -Np1 -i "${srcdir}/mpeg2enc-mjpegtools-2.0.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
     --disable-static --enable-experimental \
     --with-package-name="GStreamer Bad Plugins (Parabola)" \
diff --git a/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch b/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch
deleted file mode 100644
index 771d75743..000000000
--- a/libre/gstreamer0.10-bad-libre/mpeg2enc-mjpegtools-2.0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001
-From: Götz Waschk <waschk@mandriva.org>
-Date: Tue, 24 May 2011 13:42:44 +0000
-Subject: mpeg2enc: support mjpegtools 2.0
-
-This adds conditional includes for the renamed headers in mjpegtools 2.0.
-Fixes: #650970.
----
-diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc
-index acfda50..31f1a30 100644
---- a/ext/mpeg2enc/gstmpeg2encoder.cc
-+++ b/ext/mpeg2enc/gstmpeg2encoder.cc
-@@ -26,7 +26,10 @@
- 
- #include <mpegconsts.h>
- #include <quantize.hh>
--#if GST_MJPEGTOOLS_API >= 10900
-+#if GST_MJPEGTOOLS_API >= 10903
-+#include <ontheflyratectlpass1.hh>
-+#include <ontheflyratectlpass2.hh>
-+#elif GST_MJPEGTOOLS_API >= 10900
- #include <ontheflyratectl.hh>
- #include <pass1ratectl.hh>
- #include <pass2ratectl.hh>
---
-cgit v0.9.0.2-2-gbebe
diff --git a/staging/gegl/PKGBUILD b/staging/gegl/PKGBUILD
deleted file mode 100644
index 858b8593e..000000000
--- a/staging/gegl/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 158346 2012-05-03 21:27:34Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gegl
-pkgver=0.2.0
-pkgrel=1
-pkgdesc="Graph based image processing framework"
-arch=('i686' 'x86_64')
-url="http://www.gegl.org/"
-license=('GPL3' 'LGPL3')
-depends=('babl' 'gtk2')
-makedepends=('intltool' 'ruby' 'lua' 'openexr' 'ffmpeg' 'librsvg' 'jasper' 'exiv2')
-optdepends=('openexr: for using the openexr plugin' \
-            'ffmpeg: for using the ffmpeg plugin' \
-            'librsvg: for using the svg plugin' \
-            'jasper: for using the jasper plugin')
-options=('!libtool')
-source=(ftp://ftp.gimp.org/pub/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure  --prefix=/usr  --with-sdl --with-openexr --with-librsvg \
-    --with-libavformat --with-jasper --disable-docs
-  make
-}
-
-check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make check
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gimp-devel/PKGBUILD b/staging/gimp-devel/PKGBUILD
deleted file mode 100644
index a4baf7eab..000000000
--- a/staging/gimp-devel/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 158530 2012-05-04 00:33:40Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gimp-devel
-pkgver=2.8.0
-pkgrel=1
-pkgdesc="GNU Image Manipulation Program (Development Version)"
-arch=('i686' 'x86_64')
-url="http://www.gimp.org/"
-license=('GPL3' 'LGPL3')
-depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'librsvg' 'libmng' 'dbus-glib' \
-         'jasper' 'libexif' 'gegl' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
-optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser or web-page plug-ins'
-            'poppler-glib: for pdf support'
-            'alsa-lib: for MIDI event controller module'
-            'curl: for URI support'
-            'ghostscript: for postscript support')
-options=('!libtool' '!makeflags')
-conflicts=('gimp')
-provides=("gimp=${pkgver}")
-install=gimp-devel.install
-source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/gimp-${pkgver}.tar.bz2 linux.gpl)
-md5sums=('28997d14055f15db063eb92e1c8a7ebb'
-         'bb27bc214261d36484093e857f015f38')
-
-build() {
-  cd "${srcdir}/gimp-${pkgver}"
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
-    --enable-mp --enable-gimp-console --enable-python --with-libcurl \
-    --with-gif-compression=lzw --without-aa --without-gvfs
-  make
-}
-
-#check() {
-#  cd "${srcdir}/gimp-${pkgver}"
-#  make check
-#}
-
-package() {
-  cd "${srcdir}/gimp-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
-  install -D -m644 "${srcdir}/linux.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/Linux.gpl"
-
-  rm  "${pkgdir}/usr/share/man/man1/gimp-console.1"
-  ln -sf gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
-  ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
-  ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
-}
diff --git a/staging/gimp-devel/linux.gpl b/staging/gimp-devel/linux.gpl
deleted file mode 100644
index 0a73d8979..000000000
--- a/staging/gimp-devel/linux.gpl
+++ /dev/null
@@ -1,19 +0,0 @@
-GIMP Palette
-Name: linux
-#
-  0   0   0
-  0   0 170
-  0 170   0
-  0 170 170
-170   0   0
-170   0 170
-170  85   0
-170 170 170
- 85  85  85
- 85  85 255
- 85 255  85
- 85 255 255
-255  85  85
-255  85 255
-255 255  85
-255 255 255
diff --git a/testing/zlib/PKGBUILD b/testing/zlib/PKGBUILD
deleted file mode 100644
index 8cb139591..000000000
--- a/testing/zlib/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 158127 2012-05-03 08:36:59Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=zlib
-pkgver=1.2.7
-pkgrel=1
-pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP'
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.zlib.net/"
-depends=('glibc')
-source=("http://zlib.net/current/zlib-${pkgver}.tar.gz")
-md5sums=('60df6a37c56e7c1366cca812414f7b85')
-
-build() {
-	cd ${srcdir}/zlib-$pkgver
-	./configure --prefix=/usr
-	make
-
-	grep -A 24 '^  Copyright' zlib.h > LICENSE
-}
-
-check() {
-	cd ${srcdir}/zlib-$pkgver
-	make test
-}
-
-package() {
-	cd ${srcdir}/zlib-$pkgver
-	make install DESTDIR=${pkgdir}
-	install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/zlib/LICENSE
-}
diff --git a/~xihh/couchdb-git/couchdb.install b/~xihh/couchdb-git/couchdb.install
new file mode 100644
index 000000000..5eff459c7
--- /dev/null
+++ b/~xihh/couchdb-git/couchdb.install
@@ -0,0 +1,22 @@
+post_install() {
+	id couchdb &>/dev/null || \
+		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
+	mkdir -p /var/run/couchdb
+	chown -R couchdb.daemon /etc/couchdb
+	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
+}
+
+pre_upgrade() {
+	id couchdb &>/dev/null || \
+		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
+}
+
+post_upgrade() {
+	mkdir -p $pkgdir/var/run/couchdb
+	chown -R couchdb.daemon /etc/couchdb
+	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
+}
+
+post_remove() {
+	userdel couchdb &>/dev/null
+}
diff --git a/~xihh/couchdb-git/rc-script.patch b/~xihh/couchdb-git/rc-script.patch
new file mode 100644
index 000000000..1dd723ffc
--- /dev/null
+++ b/~xihh/couchdb-git/rc-script.patch
@@ -0,0 +1,57 @@
+--- couchdb	2011-12-27 01:21:59.000000000 +0400
++++ couchdb.my	2011-12-27 01:21:18.000000000 +0400
+@@ -1,6 +1,4 @@
+-#!/bin/bash
+-. /etc/rc.conf
+-. /etc/rc.d/functions
++#!/bin/sh -e
+ 
+ # Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ # use this file except in compliance with the License. You may obtain a copy of
+@@ -31,7 +29,7 @@
+ NAME=couchdb
+ SCRIPT_NAME=`basename $0`
+ COUCHDB=/usr/bin/couchdb
+-CONFIGURATION_FILE=/etc/conf.d/couchdb
++CONFIGURATION_FILE=/etc/default/couchdb
+ RUN_DIR=/var/run/couchdb
+ LSB_LIBRARY=/lib/lsb/init-functions
+ 
+@@ -44,14 +42,16 @@
+ fi
+ 
+ log_daemon_msg () {
+-    stat_busy $@
++    # Dummy function to be replaced by LSB library.
++
++    echo $@
+ }
+ 
+ log_end_msg () {
++    # Dummy function to be replaced by LSB library.
++
+     if test "$1" != "0"; then
+-      stat_fail
+-    else
+-      stat_done
++      echo "Error with $DESCRIPTION: $NAME"
+     fi
+     return $1
+ }
+@@ -66,7 +66,7 @@
+         command="$command $COUCHDB_OPTIONS"
+     fi
+     if test -n "$COUCHDB_USER"; then
+-        if su $COUCHDB_USER -s /bin/bash -c "$command"; then
++        if su $COUCHDB_USER -c "$command"; then
+             return $SCRIPT_OK
+         else
+             return $SCRIPT_ERROR
+@@ -84,7 +84,6 @@
+     # Start Apache CouchDB as a background process.
+ 
+     mkdir -p "$RUN_DIR"
+-    chown -R $COUCHDB_USER "$RUN_DIR"
+     command="$COUCHDB -b"
+     if test -n "$COUCHDB_STDOUT_FILE"; then
+         command="$command -o $COUCHDB_STDOUT_FILE"
diff --git a/~xihh/gmime24/PKGBUILD b/~xihh/gmime24/PKGBUILD
new file mode 100644
index 000000000..d50f71c4d
--- /dev/null
+++ b/~xihh/gmime24/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 150770 2012-02-21 20:45:23Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Ben <ben@benmazer.net>
+
+_pkgbase=gmime
+pkgname=gmime24
+pkgver=2.4.32
+pkgrel=1
+pkgdesc="Core mime parsing library"
+arch=('i686' 'x86_64' 'mips64el')
+license=('GPL')
+url="http://spruce.sourceforge.net/gmime/"
+depends=('glib2' 'gpgme' 'zlib')
+makedepends=('gtk-sharp-2' 'pkgconfig')
+[ "$CARCH" = "mips64el" ] && unset makedepends
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbase/${pkgver%.*}/$_pkgbase-$pkgver.tar.xz)
+sha256sums=('a0e8f3a1949e7281e92edc5dd6309a7ca34b6838c6acf7b7f1563a41b5ddd74b')
+
+build() {
+  # get rid of that .wapi errors in fakeroot
+  export MONO_SHARED_DIR="$srcdir/weird"
+  mkdir -p "$MONO_SHARED_DIR"
+
+  cd "$srcdir/$_pkgbase-$pkgver"
+
+  ./configure --prefix=/usr --enable-smime \
+      --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgbase-$pkgver"
+  make DESTDIR="$pkgdir" install
+}