[arch-commits] Commit in vlc/trunk (PKGBUILD vlc-1.1.10-libavformat.patch)

[Stéphane Gaudreault]

    Date: Monday, June 27, 2011 @ 07:36:20
  Author: stephane
Revision: 129407

upgpkg: vlc 1.1.10-5
Fix ByteIOContext init on recent libavformat (FS#24872), libmtp 1.1.0 rebuild take 2

Added:
  vlc/trunk/vlc-1.1.10-libavformat.patch
Modified:
  vlc/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   12 +++++++++---
 vlc-1.1.10-libavformat.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-27 11:23:00 UTC (rev 129406)
+++ PKGBUILD	2011-06-27 11:36:20 UTC (rev 129407)
@@ -5,7 +5,7 @@
 
 pkgname=vlc
 pkgver=1.1.10
-pkgrel=4
+pkgrel=5
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -34,13 +34,19 @@
 replaces=('vlc-plugin')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('066cb94b1e3aa848d828121354d6be4d')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
+        vlc-1.1.10-libavformat.patch)
+md5sums=('066cb94b1e3aa848d828121354d6be4d'
+         '9b82571a594e08e67fbae9c96c3f3ed7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
+
+  # FS#24872
+  patch -Np1 -i ../vlc-1.1.10-libavformat.patch
+
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \

Added: vlc-1.1.10-libavformat.patch
===================================================================
--- vlc-1.1.10-libavformat.patch	                        (rev 0)
+++ vlc-1.1.10-libavformat.patch	2011-06-27 11:36:20 UTC (rev 129407)
@@ -0,0 +1,29 @@
+From 21260bbb732d9de5540f809e1a54bde740f12a95 Mon Sep 17 00:00:00 2001
+From: Laurent Aimar <fenrir at videolan.org>
+Date: Tue, 7 Jun 2011 00:43:56 +0200
+Subject: [PATCH] Fix ByteIOContext init on recent libavformat
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+(cherry picked from commit 4fc3bd15a3844e41a75760fa8e100feecea969a5)
+
+Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
+---
+ modules/demux/avformat/demux.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c
+index fbb0b28..bd7c166 100644
+--- a/modules/demux/avformat/demux.c
++++ b/modules/demux/avformat/demux.c
+@@ -210,6 +210,9 @@ int OpenDemux( vlc_object_t *p_this )
+        */
+        p_sys->url.is_streamed = 1;
+        p_sys->io.is_streamed = 1;
++#if defined(AVIO_SEEKABLE_NORMAL)
++       p_sys->io.seekable = 0;
++#endif
+     }
+
+
+--
+1.7.2.5