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

Conflicts:
	community-testing/hostapd/PKGBUILD
	community-testing/hostapd/config.bz2
	community-testing/hostapd/hostap_allow-linking-with-libnl-3.2.patch
	community-testing/hostapd/hostapd
	community-testing/hostapd/hostapd.conf.d
	community-testing/hostapd/hostapd.install
	community-testing/ipvsadm/PKGBUILD
	community-testing/ipvsadm/ipvsadm.conf
	community-testing/ipvsadm/ipvsadm.rc
	community-testing/ipvsadm/ipvsadm.rules
	community-testing/keepalived/PKGBUILD
	community-testing/keepalived/ip_vs_moved.patch
	community-testing/keepalived/keepalived.conf
	community-testing/keepalived/keepalived.rc
	community-testing/knemo/PKGBUILD
	community-testing/knemo/knemo.install
	community-testing/simh/LICENSE
	community-testing/simh/PKGBUILD
	community-testing/simh/simh.install
	community/fityk/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/sage-mathematics/PKGBUILD
	community/xylib/PKGBUILD
	core/kmod/0001-libkmod-module-probe-fix-infinite-loop-with-softdeps.patch
	extra/kradio/PKGBUILD
	extra/phonon-gstreamer/PKGBUILD
	extra/phonon-vlc/PKGBUILD
	testing/bluez/PKGBUILD
	testing/bluez/bluetooth.conf.d
	testing/bluez/fix-a2dp.patch
	testing/bluez/rc.bluetooth
	testing/crda/PKGBUILD
	testing/crda/crda.install
	testing/crda/crda.rc
	testing/crda/libnl32.patch
	testing/iw/PKGBUILD
	testing/kismet/PKGBUILD
	testing/kismet/kismet.changelog
	testing/kismet/kismet.install
	testing/libnl/PKGBUILD
	testing/libnl1/PKGBUILD
	testing/libnl1/fix-compilation.patch
	testing/libpcap/PKGBUILD
	testing/libpcap/libnl32.patch
	testing/net-snmp/PKGBUILD
	testing/net-snmp/libnl32.patch
	testing/net-snmp/snmpd.confd
	testing/net-snmp/snmpd.rc
	testing/networkmanager/NetworkManager.conf
	testing/networkmanager/PKGBUILD
	testing/networkmanager/disable_set_hostname.patch
	testing/networkmanager/networkmanager.install
	testing/ntrack/PKGBUILD
	testing/ntrack/libnl3.patch
	testing/wpa_supplicant/PKGBUILD
	testing/wpa_supplicant/config
	testing/wpa_supplicant/dbus.patch
	testing/wpa_supplicant/hostap_allow-linking-with-libnl-3.2.patch

2 files changed, 7 insertions, 43 deletions

diff --git a/extra/kradio/PKGBUILD b/extra/kradio/PKGBUILD
index a3c3ed9e2..9ea1e9712 100644
--- a/extra/kradio/PKGBUILD
+++ b/extra/kradio/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 142630 2011-11-12 17:15:25Z ibiru $
+# $Id: PKGBUILD 150326 2012-02-16 21:21:15Z eric $
 # Maintainer : Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kradio
-pkgver=4.0.2
-pkgrel=3
+pkgver=4.0.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
 pkgdesc="A comfortable KDE radio application"
 url="http://kradio.sourceforge.net/"
 depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
 makedepends=('pkg-config' 'automoc4' 'cmake')
-install=kradio.install
-source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc} kradio-ffmpeg.diff)
 options=(!libtool)
+install=kradio.install
+source=(http://downloads.sourceforge.net/sourceforge/kradio/kradio4-$pkgver.tar.bz2{,.asc})
+md5sums=('f495ce341150ab04515d217bd8c36a32'
+         '42259fac62e427b8c86b7a5e5d4b18bf')
 
 build() {
   cd "$srcdir"
-  (cd ${pkgname}4-$pkgver ; patch -p1 -i "$srcdir/kradio-ffmpeg.diff")
   mkdir build
   cd build
   cmake ../${pkgname}4-$pkgver -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
@@ -27,6 +28,3 @@ package() {
   cd "$srcdir/build"
   make DESTDIR="$pkgdir" install
 }
-md5sums=('18fea3e2bc7100882075187c6a89f7bd'
-         '5f407eb75536f39e79c77a70613e8704'
-         '7d31a4f54602bc109f39cc0a7a1dc50c')
diff --git a/extra/kradio/kradio-ffmpeg.diff b/extra/kradio/kradio-ffmpeg.diff
deleted file mode 100644
index 27d224fec..000000000
--- a/extra/kradio/kradio-ffmpeg.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-X-Git-Url: http://kradio.git.sourceforge.net/git/gitweb.cgi?p=kradio%2Fkradio;a=blobdiff_plain;f=plugins%2Finternetradio%2Fdecoder_thread.cpp;h=c74d6e20578faf3b5dee877aa6de0c9269f49ad9;hp=4cd6cc0543200e9e274e38fa8badb63556a419c3;hb=4f4ec44f49d83b85702bb002455a57374245d825;hpb=c5dea0c01bf5cc16f49cf3d58b837b2fab02d988
-
-diff --git a/plugins/internetradio/decoder_thread.cpp b/plugins/internetradio/decoder_thread.cpp
-index 4cd6cc0..c74d6e2 100644
---- a/plugins/internetradio/decoder_thread.cpp
-+++ b/plugins/internetradio/decoder_thread.cpp
-@@ -373,7 +373,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
- 
-     //av_log_set_level(255);
-     m_av_pFormatCtx = avformat_alloc_context();
--    memset(m_av_pFormatCtx, 0, sizeof(*m_av_pFormatCtx));
-     m_av_pFormatCtx->probesize = m_maxProbeSize;
-     m_av_pFormatCtx->max_analyze_duration = m_maxAnalyzeTime * AV_TIME_BASE;
- 
-@@ -475,7 +474,6 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-         m_av_pFormatCtx_opened = true;
-     }
-     else {
--
- //         IErrorLogClient::staticLogDebug("InternetRadioDecoder::openAVStream: av_open_input_file start");
-         if (av_open_input_file(&m_av_pFormatCtx, stream.toUtf8(), iformat, 0, &av_params) != 0) {
-             if (warningsNotErrors) {
-@@ -535,7 +533,11 @@ void InternetRadioDecoder::openAVStream(const QString &stream, bool warningsNotE
-     m_av_audioStream = -1;
-     for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
- //         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
-+#if LIBAVCODEC_VERSION_MAJOR < 53
-         if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
-+#else
-+        if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
-+#endif
-             m_av_audioStream = i;
-             break;
-         }