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

[Giovanni Scafora]

    Date: Saturday, July 16, 2011 @ 06:50:22
  Author: giovanni
Revision: 131876

upgpkg: vlc 1.1.11-1
upstream release

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-16 10:37:07 UTC (rev 131875)
+++ PKGBUILD	2011-07-16 10:50:22 UTC (rev 131876)
@@ -4,8 +4,8 @@
 # Contributor: Martin Sandsmark <martin.sandsmark at kde.org>
 
 pkgname=vlc
-pkgver=1.1.10
-pkgrel=6
+pkgver=1.1.11
+pkgrel=1
 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
 arch=('i686' 'x86_64')
 url="http://www.videolan.org/vlc/"
@@ -34,19 +34,14 @@
 replaces=('vlc-plugin')
 options=('!libtool')
 install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
-        vlc-1.1.10-libavformat.patch)
-md5sums=('066cb94b1e3aa848d828121354d6be4d'
-         '9b82571a594e08e67fbae9c96c3f3ed7')
+source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i -e 's:truetype/freefont:TTF:g' modules/misc/freetype.c
 
-  # FS#24872
-  patch -Np1 -i ${srcdir}/vlc-1.1.10-libavformat.patch
-
   ./configure --prefix=/usr \
               --disable-rpath \
               --enable-faad \

Deleted: vlc-1.1.10-libavformat.patch
===================================================================
--- vlc-1.1.10-libavformat.patch	2011-07-16 10:37:07 UTC (rev 131875)
+++ vlc-1.1.10-libavformat.patch	2011-07-16 10:50:22 UTC (rev 131876)
@@ -1,29 +0,0 @@
-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