diff options
| author | root <root@rshg047.dnsready.net> | 2011-06-28 23:10:22 +0000 |
|---|---|---|
| committer | root <root@rshg047.dnsready.net> | 2011-06-28 23:10:22 +0000 |
| commit | 108636e69eaeef67f4e7263c7f26105e25979e89 (patch) | |
| tree | 94f902b30c95dbddd8f514c4d3645700f80ed101 /extra/vlc | |
| parent | 0a595245dd258cc0ad9a5de2b292cf1b1a94f51a (diff) | |
Tue Jun 28 23:10:22 UTC 2011
Diffstat (limited to 'extra/vlc')
| -rw-r--r-- | extra/vlc/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/vlc/vlc-1.1.10-libavformat.patch | 29 |
2 files changed, 39 insertions, 4 deletions
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 95361e280..c861b3ac6 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 127816 2011-06-18 16:12:17Z ibiru $ +# $Id: PKGBUILD 129407 2011-06-27 11:36:20Z stephane $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> 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 @@ conflicts=('vlc-plugin') 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 \ diff --git a/extra/vlc/vlc-1.1.10-libavformat.patch b/extra/vlc/vlc-1.1.10-libavformat.patch new file mode 100644 index 000000000..4bec72334 --- /dev/null +++ b/extra/vlc/vlc-1.1.10-libavformat.patch @@ -0,0 +1,29 @@ +From 21260bbb732d9de5540f809e1a54bde740f12a95 Mon Sep 17 00:00:00 2001 +From: Laurent Aimar <fenrir@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@videolan.org> +(cherry picked from commit 4fc3bd15a3844e41a75760fa8e100feecea969a5) + +Signed-off-by: Jean-Baptiste Kempf <jb@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 |