Merge branch 'master' of ssh://parabolagnulinux.org:1863/abslibre

19 files changed, 152 insertions, 117 deletions

diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index b9572d2ad..e8e763670 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -6,11 +6,11 @@
 # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=linux-libre-xen
-pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # Build stock -LIBRE kernel
+pkgname=('linux-libre-xen' 'linux-libre-xen-headers' 'linux-libre-xen-docs') # Build stock -LIBRE kernel with Xen guest support
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux-libre}
 _basekernel=3.2
-pkgver=${_basekernel}.8
+pkgver=${_basekernel}.9
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://linux-libre.fsfla.org/"
@@ -29,10 +29,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-li
         'i915-gpu-finish.patch'
         'ext4-options.patch')
 md5sums=('27c641c4f6785fc647cdd3e44963a55c'
-         'a97a83d5b003b3c9d87250e4eace45ce'
-         '1149b265c194f243c9249372602f0ac8'
-         'e3a0f760de97df1f8852893507a0eef4'
-         '67463f7a6e88305d7cd14a430e9efe92'
+         '8e601878ccdd37111cc84500ebd81387'
+         'aafbddba8ddeca5f13bac26cd5167a6c'
+         '81dce3388fcb0b1e8aa1070ccbfb5d62'
+         'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
@@ -103,7 +103,7 @@ build() {
 }
 
 package_linux-libre-xen() {
-  pkgdesc="The Linux-libre Kernel and modules"
+  pkgdesc="The Linux-libre Kernel and modules with Xen guest support"
   groups=('base')
   depends=('coreutils' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
diff --git a/kernels/linux-libre-xen/config.i686 b/kernels/linux-libre-xen/config.i686
index b2a825481..c901ed38d 100644
--- a/kernels/linux-libre-xen/config.i686
+++ b/kernels/linux-libre-xen/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.8-libre Kernel Configuration
+# Linux/i386 3.2.9-libre Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/kernels/linux-libre-xen/config.x86_64 b/kernels/linux-libre-xen/config.x86_64
index 2899a7467..8aa7d7fd6 100644
--- a/kernels/linux-libre-xen/config.x86_64
+++ b/kernels/linux-libre-xen/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.8-libre Kernel Configuration
+# Linux/x86_64 3.2.9-libre Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index b73d4aa77..63985389f 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.2.8-1-LIBRE-XEN
+KERNEL_VERSION=3.2.9-1-LIBRE-XEN
 
 post_install () {
   # updating module dependencies
@@ -17,7 +17,7 @@ post_install () {
     [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf"
     if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then
       # add compat symlinks for the initramfs images
-      ln -sf initramfs-linux-libre${KERNEL_NAME}.img /boot/kernel26${KERNEL_NAME}.img
+      ln -sf initramfs-linux-libre${KERNEL_NAME}.img boot/kernel26${KERNEL_NAME}.img
       ln -sf initramfs-linux-libre${KERNEL_NAME}-fallback.img \
         boot/kernel26${KERNEL_NAME}-fallback.img
       ln -sf vmlinuz-linux-libre${KERNEL_NAME} /boot/vmlinuz26${KERNEL_NAME}
diff --git a/kernels/linux-libre-xen/linux-libre-xen.preset b/kernels/linux-libre-xen/linux-libre-xen.preset
index e524930e8..6d5019d92 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.preset
+++ b/kernels/linux-libre-xen/linux-libre-xen.preset
@@ -1,4 +1,4 @@
-# mkinitcpio preset file for the 'linux' package
+# mkinitcpio preset file for the 'linux-libre-xen' package
 
 ALL_config="/etc/mkinitcpio.conf"
 ALL_kver="/boot/vmlinuz-linux-libre-xen"
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 48e36633f..f3f344e30 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,11 +1,12 @@
-# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
-# $Id: PKGBUILD 147790 2012-01-28 10:33:05Z andrea $
+# $Id$
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -14,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2"
     "konq-about-fsdg.diff")
-sha1sums=('25151b551793164c5eb1cb303d3031e63a6122e3'
+sha1sums=('7df527a537b5431ab551339338ea289c32ec43be'
           'f41541371414dcbe5e76687835e648112b3ff364')
 pkgdesc='KDE File Manager & Web Browser'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 0ebd5b60e..7fcc8e77e 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,12 @@
 # $Id: PKGBUILD 149297 2012-02-06 17:49:28Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.8.0
-pkgrel=3.1
+pkgver=4.8.1
+pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -23,7 +24,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.
         'kde-applications-menu.patch'
         'fix-knotify-filepath.patch'
         'khtml-fsdg.diff')
-sha1sums=('5e4744405734e6c3ce572ef7d16054390692b38a'
+sha1sums=('ec393b096003f1dd57c5e2987381b086ba1b363e'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
           'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-libre/PKGBUILD b/libre/kdenetwork-libre/PKGBUILD
index e744b22ef..2917b5f6f 100644
--- a/libre/kdenetwork-libre/PKGBUILD
+++ b/libre/kdenetwork-libre/PKGBUILD
@@ -1,6 +1,7 @@
-# $Id: PKGBUILD 150223 2012-02-15 09:34:48Z andrea $
+# $Id: PKGBUILD 152429 2012-03-06 21:02:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-filesharing'
@@ -10,7 +11,7 @@ pkgname=('kdenetwork-filesharing'
          'kdenetwork-kppp'
          'kdenetwork-krdc'
          'kdenetwork-krfb')
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -20,22 +21,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
 	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn'
     'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
     'libktorrent' 'libmms' 'mediastreamer')
-source=("http://repo.parabolagnulinux.org/other/${pkgbase}-libre-${pkgver}.tar.xz")
-sha1sums=('2472128aef671e3474505cf65397dfc7ef9f79bb')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
+sha1sums=('e914a1d990ff42ec88cf37ffc897ae9df9b1fa45')
 
 # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
-mksource() {
-    [ -f "${pkgbase}-${pkgver}.tar.bz2" ] || wget "http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-    tar xf "${pkgbase}-${pkgver}.tar.bz2"
-    cd "${pkgbase}-${pkgver}"
-    sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.txt
-    rm -rf kopete/protocols/skype
-    sed 's/, Skype//' -i ./doc/kopete/index.docbook
-    cd ..
-    tar cJf "${pkgbase}-libre-${pkgver}.tar.xz" "${pkgbase}-${pkgver}"
-}
 
 build() {
+    cd "${srcdir}/${pkgbase}-${pkgver}"
+        sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' kopete/protocols/CMakeLists.txt
+        rm -rf kopete/protocols/skype
+        sed 's/, Skype//' -i ./doc/kopete/index.docbook
+
     cd "${srcdir}"
 	mkdir build
 	cd build
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 737c0cb55..d5e9fb378 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 147905 2012-01-28 10:36:46Z andrea $
+# $Id: PKGBUILD 152399 2012-03-06 18:32:16Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.8.0
+pkgver=4.8.1
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -18,7 +19,7 @@ replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.bz2")
-sha1sums=('99756e0896938371d6d7036fb3d5d0d152de29c3')
+sha1sums=('403622ede8e28ed417c677ac8d71b1221582cff5')
 
 build() {
   cd "${srcdir}"
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 8ee55b4ba..b3ee94095 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 144935 2011-12-11 03:21:39Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor: bitlord
+# Contributor (Parabola): bitlord
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgbasename=liferea
 pkgname=liferea-libre
-pkgver=1.6.6b
+pkgver=1.8.1b
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -13,35 +14,18 @@ provides=("liferea=$pkgver")
 replaces=('liferea')
 conflicts=('liferea')
 license=('GPL')
-depends=('gconf' 'libwebkit' 'libxslt' 'libglade' 'sqlite3' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'intltool' 'lua' 'libnotify')
-optdepends=('lua: for lua scripting support'
-            'libnotify: for notification support')
+depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme')
+makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz
-        libnotify-0.7.patch
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-md5sums=('3e6a113a30f8d813c3a7ece4691d5afe'
-         'fca97e3316c1c51e0179c4c7dcce47a2'
-         'e138b67a6bc62d4ba0eb64b781105bf0')
-
-# source PKGBUILD ; mksource
-mksource() {
-    wget http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz \
-         -O - | tar xzf -
-
-    pushd liferea-$pkgver >/dev/null
-    patch -Np1 -i "../remove-non-free-suggestions.patch" || return 1
-    popd >/dev/null
-
-    tar cvzf $pkgname-$pkgver.tar.gz liferea-$pkgver/
-    rm -rvf liferea-$pkgver/
-}
+md5sums=('70f27bfda41ff5b3b4e49c49c9dc88af'
+         'e2fdcbc485ce6ff7956c8527be152ca6')
 
 build() {
   cd "${srcdir}/liferea-${pkgver}"
-  patch -Np1 -i "$srcdir/libnotify-0.7.patch"
+  patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
   make
 }
diff --git a/libre/liferea-libre/remove-non-free-suggestions.patch b/libre/liferea-libre/remove-non-free-suggestions.patch
index 8d1809122..325017567 100644
--- a/libre/liferea-libre/remove-non-free-suggestions.patch
+++ b/libre/liferea-libre/remove-non-free-suggestions.patch
@@ -1,6 +1,6 @@
---- liferea-1.6.6b/src/ui/ui_prefs.c_orig	2011-06-23 01:33:39.761555322 +0200
-+++ liferea-1.6.6b/src/ui/ui_prefs.c	2011-06-23 01:38:02.121556890 +0200
-@@ -76,24 +76,10 @@
+--- liferea-1.8.0/src/browser.c_orig	2011-11-28 19:50:57.000000000 -0200
++++ liferea-1.8.0/src/browser.c	2012-03-07 14:49:31.862987204 -0200
+@@ -35,24 +35,16 @@
  		NULL, NULL
  	},
  	{
@@ -9,8 +9,12 @@
 -		NULL, "mozilla -remote openURL(%s)",
 -		NULL, "mozilla -remote 'openURL(%s,new-window)'",
 -		NULL, "mozilla -remote 'openURL(%s,new-tab)'"
--	},
--	{
++		"iceweasel", "Iceweasel", "iceweasel %s",
++		NULL, "iceweasel \"%s\"",
++		NULL, "iceweasel -new-window \"%s\"",
++		NULL, "iceweasel -new-tab \"%s\""
+ 	},
+ 	{
 -		/* tested with Firefox 1.5 and 2.0 */
 -		"firefox", "Firefox","firefox \"%s\"",
 -		NULL, "firefox -a firefox -remote \"openURL(%s)\"",
@@ -22,10 +26,10 @@
 -		"opera \"%s\"", "opera -remote \"openURL(%s)\"",
 -		"opera -newwindow \"%s\"", NULL,
 -		"opera -newpage \"%s\"", NULL
-+		"icecat", "IceCat","icecat \"%s\"",
-+		NULL, "icecat -a icecat -remote \"openURL(%s)\"",
-+		NULL, "icecat -a icecat -remote 'openURL(%s,new-window)'",
-+		NULL, "icecat -a icecat -remote 'openURL(%s,new-tab)'"
++		"icecat", "Icecat", "icecat %s",
++		NULL, "icecat \"%s\"",
++		NULL, "icecat -new-window \"%s\"",
++		NULL, "icecat -new-tab \"%s\""
  	},
  	{
  		"epiphany", "Epiphany","epiphany \"%s\"",
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
new file mode 100644
index 000000000..49963eb05
--- /dev/null
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+
+# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
+
+pkgname=linux-libre-api-headers
+pkgver=3.1.6
+_basever=3.1
+pkgrel=2
+pkgdesc="Kernel Libre headers sanitized for use in userspace"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/libc"
+license=('GPL2')
+provides=("linux-api-headers=${pkgver}" "kernel-headers=${pkgver}")
+conflicts=('linux-api-headers' 'kernel-headers')
+replaces=('linux-api-headers' 'kernel-headers')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basever}-libre/linux-${_basever}-libre.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-libre/patch-${_basever}-libre-${pkgver}-libre.xz")
+md5sums=('d73df15ab1d36fe3c102755d8f42117f'
+         'cb42276bca126c676c51d02d74bf7fe7')
+
+build() {
+  cd ${srcdir}/linux-${_basever}
+  [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${_basever}-libre-${pkgver}-libre
+
+  make mrproper
+  make headers_check
+}
+
+package() {
+  cd ${srcdir}/linux-${_basever}
+  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
+
+  # use headers from libdrm
+  rm -rf ${pkgdir}/usr/include/drm
+  
+  # clean-up unnecessary files generated during install
+  find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f
+}
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 63463cc0a..a3a4a283c 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -11,7 +11,7 @@ _basekernel=3.0
 _sublevel=23
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.22 # nearly always the same as pkgver
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -140,7 +140,6 @@ build() {
 
 package_linux-libre-lts() {
   pkgdesc="The Linux-libre Kernel and modules - stable longtime supported kernel package suitable for servers"
-  groups=('base')
   depends=('coreutils' 'module-init-tools>=3.16')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26-lts' "linux-lts=$pkgver")
diff --git a/libre/mplayer-libre/.directory b/libre/mplayer-libre/.directory
new file mode 100644
index 000000000..724f09760
--- /dev/null
+++ b/libre/mplayer-libre/.directory
@@ -0,0 +1,2 @@
+[Dolphin]
+Timestamp=2012,3,7,11,33,38
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 3ca302e09..22142fa75 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,43 +1,49 @@
-# $Id: PKGBUILD 134009 2011-07-31 18:23:34Z ibiru $
+# $Id: PKGBUILD 152227 2012-03-05 09:38:48Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
+# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 # libvdpau is currently useful only with proprietary software
 
 _pkgbase=mplayer
 pkgbase=mplayer-libre
 pkgname=('mplayer-libre' 'mencoder-libre')
-pkgver=34426
-pkgrel=3
+pkgver=34799
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient'
-'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' 'speex'
-'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray')
+'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils'  'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx'
+'libpulse' 'fribidi' 'unzip-libre' 'mesa' 'live-media' 'yasm' 'git' 'fontconfig' 'mpg123' 'ladspa' 'libass' 'libbluray' 'libcdio')
 license=('GPL')
 url="http://www.mplayerhq.hu/"
 options=(!buildflags !emptydirs)
-source=(ftp://ftp.archlinux.org/other/${_pkgbase}/${_pkgbase}-${pkgver}.tar.xz mplayer.desktop)
-md5sums=('ff81117293e76b59e54debc439d8e612'
-         'c0d6ef795cf6de48e3b87ff7c23f0319')
+source=(ftp://ftp.archlinux.org/other/$_pkgbase/$_pkgbase-$pkgver.tar.xz mplayer.desktop
+        live-media.patch)
+md5sums=('e8bd960bcdb48fdc5a1f45390dc13c53'
+         'c0d6ef795cf6de48e3b87ff7c23f0319'
+         'b6c057633ff7001ee0c102b5f81ec1e3')
 
 build() {
-    cd ${srcdir}/${_pkgbase}
+    cd "$srcdir/$_pkgbase"
+
+    patch -Np0 -i "$srcdir/live-media.patch"
 
     ./configure --prefix=/usr \
         --enable-runtime-cpudetection \
         --disable-gui \
         --disable-arts \
         --disable-liblzo \
-        --enable-speex \
+        --disable-speex \
         --disable-openal \
         --disable-libdv \
         --disable-musepack \
         --disable-esd \
         --disable-mga \
         --disable-ass-internal \
-        --disable-vdpau \
+        --disable-cdparanoia \
         --enable-xvmc \
         --enable-radio \
+        --enable-radio-capture \
         --language=all \
         --confdir=/etc/mplayer
     [ "$CARCH" = "i686" ] &&  sed 's|-march=i486|-march=i686|g' -i config.mak
@@ -46,39 +52,37 @@ build() {
 }
 
 package_mplayer-libre() {
-    pkgdesc="A movie player for linux (no unfree faac support)"
+    pkgdesc="A movie player for GNU/Linux (no unfree faac support)"
     install=mplayer.install
     backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
     depends=('desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx' 'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'  'libgl'
-    'libxinerama' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
-    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray')
+    'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore' 'opencore-amr' 'jack' 'cdparanoia' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga' 'fribidi'
+    'libjpeg' 'faad2' 'libxvmc' 'schroedinger' 'mpg123' 'libass' 'libxxf86vm' 'libbluray' 'libcdio')
     provides=("mplayer=$pkgver")
     replaces=('mplayer')
     conflicts=('mplayer')
 
-    cd "${srcdir}/${_pkgbase}"
+    cd "$srcdir/$_pkgbase"
 
-    make DESTDIR="${pkgdir}" install-mplayer install-mplayer-man
-    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}/etc/mplayer/"
-    install -dm755 "${pkgdir}/usr/share/mplayer/"
-    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}/usr/share/mplayer/subfont.ttf"
-    rm -rf "${pkgdir}/usr/share/mplayer/font"
+    make DESTDIR="$pkgdir" install-mplayer install-mplayer-man
+    install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/"
+    install -dm755 "$pkgdir/usr/share/mplayer/"
+    ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf"
+    rm -rf "$pkgdir/usr/share/mplayer/font"
     #desktop file  FS#14770
-    install -Dm644 "${srcdir}/mplayer.desktop" "${pkgdir}/usr/share/applications/mplayer.desktop"
-    install -Dm644 etc/mplayer.png "${pkgdir}/usr/share/pixmaps/mplayer.png"
+    install -Dm644 "$srcdir/mplayer.desktop" "$pkgdir/usr/share/applications/mplayer.desktop"
+    install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png"
 }
 
 package_mencoder-libre() {
     pkgdesc="Free command line video decoding, encoding and filtering tool (without unfree faac support)"
     depends=('enca' 'a52dec' 'libvpx' 'x264' 'libmng' 'libdca' 'bzip2' 'lame' 'alsa-lib' 'fontconfig' 'giflib' 'libpng' 'smbclient' 'xvidcore' 'opencore-amr' 'cdparanoia'
-    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray')
+    'libmad' 'libtheora' 'fribidi' 'libjpeg' 'faad2' 'schroedinger' 'mpg123' 'libass' 'libbluray' 'libcdio')
     provides=("mencoder=$pkgver")
     replaces=('mencoder')
     conflicts=('mencoder')
 
-    cd "${srcdir}/${_pkgbase}"
-    make DESTDIR="${pkgdir}" install-mencoder install-mencoder-man
+    cd "$srcdir/$_pkgbase"
+    make DESTDIR="$pkgdir" install-mencoder install-mencoder-man
     find "$pkgdir/usr/share/man" -name 'mplayer.1' -exec bash -c 'mv "$1" "${1/mplayer/mencoder}"' _ {} \;
 }
-md5sums=('ff81117293e76b59e54debc439d8e612'
-         '647b9f4ab5284a7fef3f84f992214e77')
diff --git a/libre/mplayer-libre/live-media.patch b/libre/mplayer-libre/live-media.patch
new file mode 100644
index 000000000..b704b5381
--- /dev/null
+++ b/libre/mplayer-libre/live-media.patch
@@ -0,0 +1,13 @@
+Index: libmpdemux/demux_rtp.cpp
+===================================================================
+--- libmpdemux/demux_rtp.cpp	(revision 34798)
++++ libmpdemux/demux_rtp.cpp	(working copy)
+@@ -19,6 +19,8 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
++#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
++
+ extern "C" {
+ // on MinGW, we must include windows.h before the things it conflicts
+ #ifdef __MINGW32__    // with.  they are each protected from
diff --git a/libre/mplayer-libre/mplayer.desktop b/libre/mplayer-libre/mplayer.desktop
index e3229d042..07acea13f 100644
--- a/libre/mplayer-libre/mplayer.desktop
+++ b/libre/mplayer-libre/mplayer.desktop
@@ -14,7 +14,7 @@ Comment[zh]=多媒体播放器
 Comment[pl]=Odtwarzaj filmy i muzykę
 Icon=mplayer
 TryExec=mplayer
-Exec=mplayer -really-quiet %F
+Exec=mplayer %F
 Terminal=false
 NoDisplay=true
 Categories=GTK;AudioVideo;Audio;Video;Player;TV;
diff --git a/libre/mplayer-libre/mplayer.install b/libre/mplayer-libre/mplayer.install
index f98ba7338..660593cf5 100644
--- a/libre/mplayer-libre/mplayer.install
+++ b/libre/mplayer-libre/mplayer.install
@@ -3,9 +3,9 @@ post_install() {
 }
 
 post_upgrade() {
-    post_install $1
+    post_install
 }
 
 post_remove() {
-    post_install $1
+    post_install
 }
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index 65fc932ef..fd3ebc7c1 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -7,31 +7,21 @@ pkgver=$(date +%Y%m%d)
 pkgrel=1
 pkgdesc="Parabola GNU/Linux mirror list for use by pacman"
 arch=('any')
-url="http://repo.parabolagnulinux.org/files/mirrorlist"
+url="http://repo.parabolagnulinux.org/mirrorlist.txt"
 license=('GPL')
 groups=('base')
-#backup=(etc/pacman.d/mirrorlist)
-source=(mirrorlist)
+backup=(etc/pacman.d/mirrorlist)
+source=(mirrorlist::${url})
 conflicts=(pacman-mirrorlist)
 replaces=(pacman-mirrorlist)
 provides=(pacman-mirrorlist)
+md5sums=('e070f8d2639fdb742d0bfb21d27820d1')
 
 # keep an upgrade path for older installations
 PKGEXT='.pkg.tar.gz'
 
-# NOTE on building this package:
-# * Go to the trunk/ directory
-# * Run bash -c ". PKGBUILD; updatelist"
-# * Update the checksums, update pkgver
-# * Build the package
-
-updatelist() {
-  wget -O mirrorlist http://repo.parabolagnulinux.org/files/mirrorlist
-}
-
 build() {
   mkdir -p $pkgdir/etc/pacman.d
   install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/
 }
 
-md5sums=('6440731bd17b4b6da3927e4882783946')