[arch-commits] Commit in vlc/trunk (2 files)

[Bartłomiej Piotrowski]

    Date: Friday, August 2, 2013 @ 11:52:13
  Author: bpiotrowski
Revision: 191971

Fix build with live-media 2013.07.16.

Added:
  vlc/trunk/vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
Modified:
  vlc/trunk/PKGBUILD

-----------------------------------------------------+
 PKGBUILD                                            |    7 +++-
 vlc-2.0.8-Fix-live555-breakage-in-last-update.patch |   29 ++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-02 08:44:12 UTC (rev 191970)
+++ PKGBUILD	2013-08-02 09:52:13 UTC (rev 191971)
@@ -57,14 +57,17 @@
 options=('!libtool' '!emptydirs')
 install=vlc.install
 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.7-vaapi-compat.patch
+        vlc-2.0.8-Fix-live555-breakage-in-last-update.patch)
 md5sums=('e5000677181406d026ffe448633d1ca0'
-         '6df10774bb7acf20e09d6139e5c7839e')
+         '6df10774bb7acf20e09d6139e5c7839e'
+         'e592efe7bb65291a84f99cfaa3a9f8a2')
 
 prepare() {
   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

Added: vlc-2.0.8-Fix-live555-breakage-in-last-update.patch
===================================================================
--- vlc-2.0.8-Fix-live555-breakage-in-last-update.patch	                        (rev 0)
+++ vlc-2.0.8-Fix-live555-breakage-in-last-update.patch	2013-08-02 09:52:13 UTC (rev 191971)
@@ -0,0 +1,29 @@
+From ea444abae1d09b751314b24f6352e55be335621d Mon Sep 17 00:00:00 2001
+From: Jean-Baptiste Kempf <jb at 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
+