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

Conflicts:
	community/chmsee/PKGBUILD
	community/flumotion/PKGBUILD
	community/gnash/PKGBUILD
	community/kadu/PKGBUILD
	community/mythplugins/PKGBUILD
	community/performous/PKGBUILD
	community/sleuthkit/PKGBUILD
	community/virtualbox/PKGBUILD
	community/wbar/PKGBUILD
	core/attr/PKGBUILD
	core/binutils/PKGBUILD
	core/heimdal/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/acpid/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/boost/PKGBUILD
	extra/bs/PKGBUILD
	extra/bzr/PKGBUILD
	extra/cvsps/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/fetchmail/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gptfdisk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libftdi/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libx86/PKGBUILD
	extra/lsdvd/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/scim/PKGBUILD
	extra/socat/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vbetool/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xchat-gnome/xchat-gnome.install
	libre/kernel26-libre/PKGBUILD
	libre/pacman/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install
	multilib/nspluginwrapper/PKGBUILD
	testing/libgweather/libgweather.install
	testing/mesa/PKGBUILD

3 files changed, 66 insertions, 23 deletions

diff --git a/extra/moc/PKGBUILD b/extra/moc/PKGBUILD
index cbe919280..2df733cc2 100644
--- a/extra/moc/PKGBUILD
+++ b/extra/moc/PKGBUILD
@@ -1,11 +1,9 @@
-# $Id: PKGBUILD 107458 2011-01-25 20:51:09Z remy $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: dorphell <dorphell@gmx.net>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# $Id: PKGBUILD 124292 2011-05-19 04:47:01Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=moc
 pkgver=2.4.4
-pkgrel=3
+pkgrel=4
 pkgdesc="An ncurses console audio player with support for the mp3, ogg, and wave formats"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://moc.daper.net/"
@@ -18,27 +16,32 @@ optdepends=('speex: for using the speex plugin'
 	    'libmpcdec: for using the musepack plugin' 
             'wavpack: for using the wavpack plugin' 
 	    'libmodplug: for using the modplug plugin')
-options=('!libtool' 'force')
-source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('647c770a5542a4ae5437386807a89796')
-sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db')
+options=('!libtool')
+source=(ftp://ftp.daper.net/pub/soft/moc/stable/${pkgname}-${pkgver}.tar.bz2 \
+        gcc-undefined-symbols.diff curl-streams.diff)
+md5sums=('647c770a5542a4ae5437386807a89796'
+         'efacb8559e9145e15b0c25f8fa2a9d79'
+         'bb9be1e80762851c57075c99a612af2f')
+sha1sums=('e56ee13aa17c177f0afc42efe3804ebbbf46d4db'
+          'a811a4ac7e049914aab528d3f06a6be6634c2720'
+          'a58ca952d7f3b0ede19b95c53da96c090d0a94c4')
 
 build() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
-	sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
-	# Disabling aac to use the external ffmpeg to play them (FS#13164)
-	./configure --prefix=/usr --without-rcc --without-aac \
-	    --with-oss  --with-alsa  --with-jack --with-mp3 \
-	    --with-musepack --with-vorbis --with-flac --with-wavpack \
-	    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
-	    --with-samplerate --with-curl
-	make
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 -i ../gcc-undefined-symbols.diff
+  patch -p1 -i ../curl-streams.diff
+  sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' decoder_plugins/ffmpeg/ffmpeg.c
+  sed -i 's|avcodec_decode_audio|avcodec_decode_audio2|' decoder_plugins/ffmpeg/ffmpeg.c
+# Disabling aac to use the external ffmpeg to play them (FS#13164)
+  ./configure --prefix=/usr --without-rcc --without-aac \
+    --with-oss  --with-alsa  --with-jack --with-mp3 \
+    --with-musepack --with-vorbis --with-flac --with-wavpack \
+    --with-sndfile --with-modplug --with-ffmpeg --with-speex \
+    --with-samplerate --with-curl
+  make
 }
 
 package() {
-	cd ${srcdir}/${pkgname}-${pkgver}
-
-	make DESTDIR=${pkgdir} install
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/moc/curl-streams.diff b/extra/moc/curl-streams.diff
new file mode 100644
index 000000000..2dbc38d54
--- /dev/null
+++ b/extra/moc/curl-streams.diff
@@ -0,0 +1,28 @@
+diff -u moc-2.4.4/io_curl.c moc-2.4.4/io_curl.c
+--- a/io_curl.c	2007-07-08 08:54:45.000000000 +0200
++++ b/io_curl.c	2011-05-18 09:09:40.000000000 +0200
+@@ -338,6 +338,8 @@
+ 			fd_set read_fds, write_fds, exc_fds;
+ 			int max_fd;
+ 			int ret;
++         long milliseconds;
++         struct timeval timeout;
+ 
+ 			logit ("Doing select()...");
+ 
+@@ -356,8 +358,14 @@
+ 			if (s->curl.wake_up_pipe[0] > max_fd)
+ 				max_fd = s->curl.wake_up_pipe[0];
+ 
++         curl_multi_timeout(s->curl.multi_handle, &milliseconds);
++         if(milliseconds <= 0)
++           milliseconds = 1000; /* just a cautionary default */
++         timeout.tv_sec = milliseconds / 1000;
++         timeout.tv_usec = (milliseconds % 1000) * 1000;
++
+ 			ret = select (max_fd + 1, &read_fds, &write_fds,
+-					&exc_fds, NULL);
++					&exc_fds, &timeout);
+ 
+ 			if (ret < 0 && errno == EINTR) {
+ 				logit ("Interrupted");
diff --git a/extra/moc/gcc-undefined-symbols.diff b/extra/moc/gcc-undefined-symbols.diff
new file mode 100644
index 000000000..09e9b8bda
--- /dev/null
+++ b/extra/moc/gcc-undefined-symbols.diff
@@ -0,0 +1,12 @@
+--- decoder.c~	2011-05-08 09:28:28.077137883 +0200
++++ decoder.c	2011-05-10 21:40:48.887941968 +0200
+@@ -259,6 +259,9 @@
+ 	for (i = 0; i < plugins_num; i++)
+ 		if (plugins[i].decoder->destroy)
+ 			plugins[i].decoder->destroy ();
++	for (i = 0; i < plugins_num; i++)
++		if (plugins[i].handle)
++                    lt_dlclose(plugins[i].handle);
+ 
+ 	if (lt_dlexit())
+ 		logit ("lt_exit() failed: %s", lt_dlerror());