git » vlc.git » commit 2939bf7

diff --git a/PKGBUILD b/PKGBUILD
index 44d3df3..73e92b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
 
 pkgname=vlc
-pkgver=1.1.12
-pkgrel=5
+pkgver=1.1.13
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -38,18 +38,14 @@ backup=('usr/share/vlc/http/.hosts'
         'usr/share/vlc/lua/http/dialogs/.hosts')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        'bp-set-channel-map-pulseaudio-1.0.patch')
-md5sums=('91de1ad308c947e35380f9d747ff5713'
-         'bae24e02207364d76a1a118644de484e')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('9678fb7a04808b6e0de63746d35e4bb1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
-  patch -Np1 -i ${srcdir}/bp-set-channel-map-pulseaudio-1.0.patch
-
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \
diff --git a/bp-set-channel-map-pulseaudio-1.0.patch b/bp-set-channel-map-pulseaudio-1.0.patch
deleted file mode 100644
index e63b3f9..0000000
--- a/bp-set-channel-map-pulseaudio-1.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 15a821886296a8efe5f8b9015b6e9c5ae5e3ae79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Tue, 11 Oct 2011 19:19:21 +0300
-Subject: Set channel map when using PulseAudio 1.0
-
-(cherry picked from commit ca2cb5f01340252a85ad5bed877e84407f092b21)
----
- modules/audio_output/pulse.c |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
-index d67dc31..18ee280 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -640,6 +640,7 @@ static int Open(vlc_object_t *obj)
-         formatv[formatc]->encoding = encoding;
-         pa_format_info_set_rate(formatv[formatc], ss.rate);
-         pa_format_info_set_channels(formatv[formatc], ss.channels);
-+        pa_format_info_set_channel_map(formatv[formatc], &map);
-         formatc++;
-     }
- 
-@@ -649,6 +650,7 @@ static int Open(vlc_object_t *obj)
-     pa_format_info_set_sample_format(formatv[formatc], ss.format);
-     pa_format_info_set_rate(formatv[formatc], ss.rate);
-     pa_format_info_set_channels(formatv[formatc], ss.channels);
-+    pa_format_info_set_channel_map(formatv[formatc], &map);
-     formatc++;
- 
-     /* Create a playback stream */
--- 
-1.7.4.1
-