Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/adns/PKGBUILD
	community/afpfs-ng/PKGBUILD
	community/aqbanking/PKGBUILD
	community/arp-scan/PKGBUILD
	community/arpack/PKGBUILD
	community/bind/PKGBUILD
	community/bird/PKGBUILD
	community/cairo-dock/PKGBUILD
	community/cinnamon-control-center/PKGBUILD
	community/commoncpp2/PKGBUILD
	community/cuetools/PKGBUILD
	community/erlang/PKGBUILD
	community/fxdesktop/PKGBUILD
	community/gavl/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/gpicview/PKGBUILD
	community/gtk-aurora-engine/PKGBUILD
	community/icewm-utils/PKGBUILD
	community/inotify-tools/PKGBUILD
	community/jack2/PKGBUILD
	community/judy/PKGBUILD
	community/lash/PKGBUILD
	community/libdlna/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/libgig/PKGBUILD
	community/liblinebreak/PKGBUILD
	community/liblockfile/PKGBUILD
	community/libopenraw/PKGBUILD
	community/librcd/PKGBUILD
	community/librsync/PKGBUILD
	community/libvirt/PKGBUILD
	community/libyaml/PKGBUILD
	community/linux-tools/PKGBUILD
	community/lomoco/PKGBUILD
	community/luasec/PKGBUILD
	community/luasocket/PKGBUILD
	community/lwp/PKGBUILD
	community/lxappearance-obconf/PKGBUILD
	community/lxappearance/PKGBUILD
	community/lxsplit/PKGBUILD
	community/metamail/PKGBUILD
	community/mg/PKGBUILD
	community/nemo-fileroller/PKGBUILD
	community/nsd/PKGBUILD
	community/obby/PKGBUILD
	community/openarena/PKGBUILD
	community/opensc/PKGBUILD
	community/osmo/PKGBUILD
	community/perl-json-xs/PKGBUILD
	community/pyqt3/PKGBUILD
	community/python-pymongo/PKGBUILD
	community/python-pytables/PKGBUILD
	community/qscintilla-qt3/PKGBUILD
	community/qtcurve-gtk2/PKGBUILD
	community/qtcurve-kde4/PKGBUILD
	community/rxvt-unicode/PKGBUILD
	community/smalltalk/PKGBUILD
	community/xmlrpc-c/PKGBUILD
	community/xpad/PKGBUILD
	community/xsettings-client/PKGBUILD
	community/yaws/PKGBUILD
	core/bzip2/PKGBUILD
	core/gcc/PKGBUILD
	core/glibc/PKGBUILD
	core/keyutils/PKGBUILD
	core/ldns/PKGBUILD
	core/libmpc/PKGBUILD
	core/librpcsecgss/PKGBUILD
	core/libtool/PKGBUILD
	core/lvm2/PKGBUILD
	core/lzo2/PKGBUILD
	core/openssl/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	cross/mips64el-unknown-linux-gnu-linux-libre-api-headers/PKGBUILD
	extra/aalib/PKGBUILD
	extra/aiksaurus/PKGBUILD
	extra/alsa-oss/PKGBUILD
	extra/alsa-tools/PKGBUILD
	extra/apache/PKGBUILD
	extra/autopano-sift-c/PKGBUILD
	extra/avahi/PKGBUILD
	extra/cfitsio/PKGBUILD
	extra/clamav/PKGBUILD
	extra/compface/PKGBUILD
	extra/dotconf/PKGBUILD
	extra/enca/PKGBUILD
	extra/eventlog/PKGBUILD
	extra/exiv2/PKGBUILD
	extra/faad2/PKGBUILD
	extra/fcgi/PKGBUILD
	extra/ffcall/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/flac/PKGBUILD
	extra/fltk/PKGBUILD
	extra/freealut/PKGBUILD
	extra/freetds/PKGBUILD
	extra/gc/PKGBUILD
	extra/gdome2/PKGBUILD
	extra/giblib/PKGBUILD
	extra/gmime/PKGBUILD
	extra/gnome-python-desktop/PKGBUILD
	extra/gnome-python-extras/PKGBUILD
	extra/gnome-speech/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/gsasl/PKGBUILD
	extra/gsl/PKGBUILD
	extra/gtkspell/PKGBUILD
	extra/gupnp-igd/PKGBUILD
	extra/htdig/PKGBUILD
	extra/hugin/PKGBUILD
	extra/id3lib/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/jade/PKGBUILD
	extra/jasper/PKGBUILD
	extra/kdesdk-thumbnailers/PKGBUILD
	extra/kdevelop-php/PKGBUILD
	extra/lablgtk/PKGBUILD
	extra/lame/PKGBUILD
	extra/lcms2/PKGBUILD
	extra/lesstif/PKGBUILD
	extra/libaio/PKGBUILD
	extra/libart-lgpl/PKGBUILD
	extra/libass/PKGBUILD
	extra/libasyncns/PKGBUILD
	extra/libavc1394/PKGBUILD
	extra/libbluray/PKGBUILD
	extra/libcaca/PKGBUILD
	extra/libcddb/PKGBUILD
	extra/libchamplain/PKGBUILD
	extra/libdca/PKGBUILD
	extra/libdv/PKGBUILD
	extra/libglade/PKGBUILD
	extra/libgtkhtml/PKGBUILD
	extra/libice/PKGBUILD
	extra/libid3tag/PKGBUILD
	extra/libidl2/PKGBUILD
	extra/libieee1284/PKGBUILD
	extra/libjpeg-turbo/PKGBUILD
	extra/liblo/PKGBUILD
	extra/libmad/PKGBUILD
	extra/libmikmod/PKGBUILD
	extra/libmowgli/PKGBUILD
	extra/libmpd/PKGBUILD
	extra/libmpdclient/PKGBUILD
	extra/libofa/PKGBUILD
	extra/liboil/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libqalculate/PKGBUILD
	extra/libraw1394/PKGBUILD
	extra/libsndfile/PKGBUILD
	extra/libstroke/PKGBUILD
	extra/libvncserver/PKGBUILD
	extra/libxkbui/PKGBUILD
	extra/libxss/PKGBUILD
	extra/libytnef/PKGBUILD
	extra/libzvt/PKGBUILD
	extra/lynx/PKGBUILD
	extra/lzo/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mhash/PKGBUILD
	extra/musicbrainz/PKGBUILD
	extra/ocaml/PKGBUILD
	extra/openal/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/pavucontrol/PKGBUILD
	extra/perl-dbi/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	extra/phonon/PKGBUILD
	extra/ppl/PKGBUILD
	extra/progsreiserfs/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pycurl/PKGBUILD
	extra/pyopenssl/PKGBUILD
	extra/pyxml/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/schroedinger/PKGBUILD
	extra/sdl_gfx/PKGBUILD
	extra/signon/PKGBUILD
	extra/slang/PKGBUILD
	extra/sofia-sip/PKGBUILD
	extra/spandsp/PKGBUILD
	extra/speech-dispatcher/PKGBUILD
	extra/sqlite/PKGBUILD
	extra/t1lib/PKGBUILD
	extra/taglib/PKGBUILD
	extra/tidyhtml/PKGBUILD
	extra/totem/PKGBUILD
	extra/unixodbc/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/wavpack/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webrtc-audio-processing/PKGBUILD
	extra/xfce4-mailwatch-plugin/PKGBUILD
	extra/xine-lib/PKGBUILD
	extra/xmms/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yajl/PKGBUILD
	extra/yasm/PKGBUILD
	extra/zenity/PKGBUILD
	extra/zziplib/PKGBUILD
	libre/blackbox-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/sdl-libre/PKGBUILD

2 files changed, 40 insertions, 16 deletions

diff --git a/extra/libofa/PKGBUILD b/extra/libofa/PKGBUILD
index 7ae65d413..86aff404a 100644
--- a/extra/libofa/PKGBUILD
+++ b/extra/libofa/PKGBUILD
@@ -1,44 +1,46 @@
-# $Id: PKGBUILD 150605 2012-02-18 22:48:27Z pierre $
+# $Id: PKGBUILD 197670 2013-10-28 02:51:05Z eric $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=libofa
 pkgver=0.9.3
-pkgrel=4.1
+pkgrel=5
 pkgdesc="An open-source audio fingerprint by MusicIP"
 arch=(i686 x86_64 'mips64el')
 url="http://code.google.com/p/musicip-libofa/"
 license=('GPL2' 'custom')
 depends=('expat' 'curl' 'fftw')
-makedepends=('pkgconfig')
-options=('!libtool')
 source=("http://musicip-libofa.googlecode.com/files/$pkgname-$pkgver.tar.gz"
         'gcc-4.patch'
         'gcc4.3.patch'
         'gcc4.5.patch'
-	'gcc47.patch'
-        'libofa-0.9.3-curl-7.21.patch')
+        'libofa-0.9.3-curl-7.21.patch'
+	'libofa-0.9.3-gcc-4.7.patch')
 md5sums=('51507d2c4b432bd2755f48d58471696e'
          'a6f78b90bd0f4354d022a71c3e58ef6c'
          'dd57db13770b8f8d196e8a3d3a50e713'
          'c245363368d0e6fa2b4676364b81b74f'
-         '5b571a09118131d7f7c8b84617efba71'
-         '2e1579d74613cfbb1799d0ab5f1a4cba')
+         '2e1579d74613cfbb1799d0ab5f1a4cba'
+         'a53a0104f9b5bba220322c6d0b68bf96')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p0 -i "${srcdir}/gcc-4.patch"
+  patch -p1 -i "${srcdir}/gcc4.3.patch"
+  patch -p1 -i "${srcdir}/gcc4.5.patch"
+  patch -p1 -i "${srcdir}/libofa-0.9.3-gcc-4.7.patch"
+  patch -p1 -i "${srcdir}/libofa-0.9.3-curl-7.21.patch"
+}
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -p0 -i ${srcdir}/gcc-4.patch
-  patch -p1 -i ${srcdir}/gcc4.3.patch
-  patch -p1 -i ${srcdir}/gcc4.5.patch
-  patch -p1 -i ${srcdir}/gcc47.patch
-  patch -p1 -i ${srcdir}/libofa-0.9.3-curl-7.21.patch
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR=${pkgdir} install
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/libofa/libofa-0.9.3-gcc-4.7.patch b/extra/libofa/libofa-0.9.3-gcc-4.7.patch
new file mode 100644
index 000000000..c5ab09876
--- /dev/null
+++ b/extra/libofa/libofa-0.9.3-gcc-4.7.patch
@@ -0,0 +1,22 @@
+diff -up libofa-0.9.3/examples/uselame.cpp.gcc47 libofa-0.9.3/examples/uselame.cpp
+--- libofa-0.9.3/examples/uselame.cpp.gcc47	2012-01-14 09:35:24.343146853 -0600
++++ libofa-0.9.3/examples/uselame.cpp	2012-01-14 09:35:49.956826634 -0600
+@@ -12,6 +12,7 @@
+ #else
+ #include <sys/wait.h>
+ #endif
++#include <unistd.h>
+ 
+ AudioData *loadWaveFile(char *file);
+ 
+diff -up libofa-0.9.3/examples/wavefile.cpp.gcc47 libofa-0.9.3/examples/wavefile.cpp
+--- libofa-0.9.3/examples/wavefile.cpp.gcc47	2012-01-14 09:35:24.344146841 -0600
++++ libofa-0.9.3/examples/wavefile.cpp	2012-01-14 16:00:54.414981160 -0600
+@@ -11,6 +11,7 @@
+ #include "io.h"
+ #endif
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ static bool readBytes(int fd, unsigned char *buf, int size) {
+     int ct = 0;