Sat Aug 3 02:13:05 PDT 2013

13 files changed, 58 insertions, 134 deletions

diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 0acf19815..93148e7a0 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $
+# $Id: PKGBUILD 191974 2013-08-02 17:22:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=2.6.3
+pkgver=2.7
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
 source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
         'mercurial.profile')
-md5sums=('99e311b2202057a259899f67b425e087'
+md5sums=('61093c08ca5d8d1310382d17764f0c43'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index bc0ca0964..75dc33e40 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190837 2013-07-18 12:47:47Z lcarlier $
+# $Id: PKGBUILD 191957 2013-08-01 23:15:05Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=9.1.5
+pkgver=9.1.6
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
@@ -14,7 +14,7 @@ license=('custom')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('4ed2af5943141a85a21869053a2fc2eb'
+md5sums=('443a2a352667294b53d56cb1a74114e9'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index 0c792edca..7fca81c86 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191903 2013-08-01 06:53:36Z bpiotrowski $
+# $Id: PKGBUILD 191959 2013-08-02 00:36:31Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -7,7 +7,7 @@
 
 pkgname=mpd
 pkgver=0.17.4
-pkgrel=4
+pkgrel=5
 pkgdesc='Flexible, powerful, server-side application for playing music'
 url='http://www.musicpd.org/'
 license=('GPL')
@@ -37,6 +37,7 @@ build() {
 		--enable-jack \
 		--enable-lastfm \
 		--enable-soundcloud \
+		--enable-pipe-output \
 		--enable-pulse \
 		--disable-sidplay \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD
index 2c93a076c..4259a905c 100644
--- a/extra/ntp/PKGBUILD
+++ b/extra/ntp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 190827 2013-07-18 07:23:31Z bisson $
+# $Id: PKGBUILD 191962 2013-08-02 03:24:15Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 
 pkgname=ntp
 pkgver=4.2.6.p5
 _realver=4.2.6p5
-pkgrel=15
+pkgrel=17
 pkgdesc='Network Time Protocol reference implementation'
 url='http://www.ntp.org/'
 license=('custom')
@@ -19,8 +19,8 @@ source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
         'ntpdate.service')
 sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
           'd3496dbeb7d531dd6ab071dbce3262c3c9618d8b'
-          'ffbabfaab90f1ba4dc769c84fbbfe89c5c01ee95'
-          '0cb9dbd285e2e8ac51ff47dee08af69e12a09855'
+          'ff8370719f003f184563b7d6068c03086678482f'
+          'e1c48cba549b7d21501aadf513926e463884c090'
 )
 
 install=install
diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service
index 4e3290858..45239877f 100644
--- a/extra/ntp/ntpd.service
+++ b/extra/ntp/ntpd.service
@@ -6,7 +6,6 @@ After=network.target nss-lookup.target
 Type=forking
 PrivateTmp=true
 ExecStart=/usr/bin/ntpd -g -u ntp:ntp
-ControlGroup=cpu:/
 Restart=always
 
 [Install]
diff --git a/extra/ntp/ntpdate b/extra/ntp/ntpdate
deleted file mode 100755
index a8e746785..000000000
--- a/extra/ntp/ntpdate
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-case "$1" in
-	start)
-		stat_busy "Starting NTP Client"
-		if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
-			add_daemon ntpdate
-			stat_done
-		else
-			stat_fail
-			exit 1
-		fi
-		;;
-	stop)
-		stat_busy "Stopping NTP Client"
-		rm_daemon ntpdate
-		stat_done
-		;;
-	restart)
-		$0 stop
-		$0 start
-		;;
-	*)
-		echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/extra/ntp/ntpdate.service b/extra/ntp/ntpdate.service
index 82d72d8b6..094dd42c8 100644
--- a/extra/ntp/ntpdate.service
+++ b/extra/ntp/ntpdate.service
@@ -6,7 +6,6 @@ After=network.target nss-lookup.target
 Type=oneshot
 PrivateTmp=true
 ExecStart=/usr/bin/ntpd -q -g -u ntp:ntp
-ControlGroup=cpu:/
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/truecrypt/PKGBUILD b/extra/truecrypt/PKGBUILD
deleted file mode 100644
index e0de53cba..000000000
--- a/extra/truecrypt/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 171369 2012-11-17 11:36:42Z eric $
-# Maintainer: Paul Mattal <paul.archlinux.org>
-
-pkgname=truecrypt
-pkgver=7.1a
-pkgrel=1
-epoch=1
-pkgdesc="Free open-source cross-platform disk encryption software"
-url="http://www.truecrypt.org/"
-arch=('i686' 'x86_64')
-license=('custom') # TrueCrypt License v2.6
-depends=('fuse>=2.8.0' 'wxgtk>=2.8.9' 'libsm' 'device-mapper')
-makedepends=('nasm')
-optdepends=('sudo: mounting encrypted volumes as nonroot users')
-conflicts=('truecrypt-utils')
-replaces=('truecrypt-utils')
-# N.B. Truecrypt's web-based source download is incompatible with
-# makepkg. Source has been placed on ftp.archlinux.org instead
-source=(ftp://ftp.archlinux.org/other/tc/truecrypt-${pkgver}.tar.gz{,.sig} \
-        'ftp://ftp.archlinux.org/other/tc/pkcs-2.20.tar.gz' \
-        "${pkgname}.desktop" \
-	"${pkgname}-arch-detection.patch") 
-md5sums=('102d9652681db11c813610882332ae48'
-         '5bca3d15b35d0725ff3317e568062ad8'
-         'ce6a707b79411e82e8e558aa03e764b0'
-         '183b9bf04a943454d4e216130bcbac01'
-         '00ea70fa8437de877b31b027ac2b4060')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-source"
-
-  # Work around buggy CPU type detection
-  patch -Np1 -i ../${pkgname}-arch-detection.patch
-  
-  # Build
-  make PKCS11_INC="${srcdir}/pkcs-2.20" LFLAGS+="-ldl"
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-source"
-
-  # Install Binary
-  install -D -m755 Main/${pkgname} "${pkgdir}/usr/bin/${pkgname}"
-
-  # Install Desktop file and Icon
-  install -D -m644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -D -m644 Resources/Icons/TrueCrypt-48x48.xpm "${pkgdir}/usr/share/pixmaps/truecrypt.xpm"
-
-  # Install License
-  install -D -m644 License.txt "${pkgdir}/usr/share/licenses/${pkgname}/License.txt"
-}
diff --git a/extra/truecrypt/truecrypt-arch-detection.patch b/extra/truecrypt/truecrypt-arch-detection.patch
deleted file mode 100644
index bc16a2a36..000000000
--- a/extra/truecrypt/truecrypt-arch-detection.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN truecrypt-7.0a-source/Makefile truecrypt-7.0a-source.fixed/Makefile
---- truecrypt-7.0a-source/Makefile	2010-09-05 10:32:10.000000000 -0400
-+++ truecrypt-7.0a-source.fixed/Makefile	2011-07-05 21:41:50.296437879 -0400
-@@ -120,10 +120,7 @@
- 
- export CPU_ARCH ?= unknown
- 
--ARCH = $(shell uname -p)
--ifeq "$(ARCH)" "unknown"
--	ARCH = $(shell uname -m)
--endif
-+ARCH = $(shell uname -m)
- 
- ifneq (,$(filter i386 i486 i586 i686 x86,$(ARCH)))
- 	CPU_ARCH = x86
diff --git a/extra/truecrypt/truecrypt.desktop b/extra/truecrypt/truecrypt.desktop
deleted file mode 100644
index 53626f29f..000000000
--- a/extra/truecrypt/truecrypt.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Exec=truecrypt
-Icon=truecrypt
-Comment=On-the-fly encryption
-Terminal=false
-Name=TrueCrypt
-StartupNotify=true
-Categories=System;
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index 94c1c843f..3e636d515 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191910 2013-08-01 06:53:43Z bpiotrowski $
+# $Id: PKGBUILD 191972 2013-08-02 09:52:35Z bpiotrowski $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=2.0.8
+pkgver=2.0.8.a
 pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
@@ -56,22 +56,25 @@ backup=('usr/share/vlc/lua/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool' '!emptydirs')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
-        vlc-2.0.7-vaapi-compat.patch)
-md5sums=('3b0e465b0990097b65abaf3e25589957'
-         '6df10774bb7acf20e09d6139e5c7839e')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
+        vlc-2.0.7-vaapi-compat.patch
+        vlc-2.0.8-Fix-live555-breakage-in-last-update.patch)
+md5sums=('e5000677181406d026ffe448633d1ca0'
+         '6df10774bb7acf20e09d6139e5c7839e'
+         'e592efe7bb65291a84f99cfaa3a9f8a2')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
 
   patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
+  patch -Np1 -i ../vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
   sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
 
   CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
   PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" \
@@ -98,12 +101,12 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver/.a}"
 
   make DESTDIR="${pkgdir}" install
 
   for res in 16 32 48 128; do
-    install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+    install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \
         "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
   done
 }
diff --git a/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
new file mode 100644
index 000000000..3006cbc8d
--- /dev/null
+++ b/extra/vlc/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
@@ -0,0 +1,29 @@
+From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb@videolan.org>
+Date: Thu, 25 Jul 2013 01:14:32 +0200
+Subject: [PATCH] Fix live555 breakage in last update
+
+---
+ modules/demux/live555.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
+index 9e02630..7a1ab16 100644
+--- a/modules/demux/live555.cpp
++++ b/modules/demux/live555.cpp
+@@ -243,7 +243,11 @@ public:
+                    char const* applicationName, portNumBits tunnelOverHTTPPortNum,
+                    demux_sys_t *p_sys) :
+                    RTSPClient( env, rtspURL, verbosityLevel, applicationName,
+-                   tunnelOverHTTPPortNum )
++                   tunnelOverHTTPPortNum
++#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1373932800
++                   , -1
++#endif
++                   )
+     {
+         this->p_sys = p_sys;
+     }
+-- 
+1.8.3.4
+
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index eadc50e7c..775010075 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191911 2013-08-01 06:53:44Z bpiotrowski $
+# $Id: PKGBUILD 191968 2013-08-02 08:00:53Z bpiotrowski $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=x264
 pkgver=20130702
-pkgrel=1
+pkgrel=2
 pkgdesc="free library for encoding H264/AVC video streams"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/developers/x264.html"
@@ -15,8 +15,6 @@ makedepends=('yasm' 'git')
 source=(git://git.videolan.org/x264.git#commit=585324fee3)
 md5sums=('SKIP')
 
-[[ "$CARCH" == "i686" ]] && _asm='--disable-asm'
-
 pkgver() {
   cd $pkgname
   git log -1 --format="%cd" --date=short | sed 's|-||g'
@@ -26,8 +24,7 @@ build() {
   cd $pkgname
 
   ./configure --enable-shared \
-    --enable-pic \
-    $_asm
+    --enable-pic
   make
 }