Sat Aug 3 02:13:05 PDT 2013

2 files changed, 42 insertions, 10 deletions

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
+