diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch | 26 | ||||
| -rw-r--r-- | vlc-2.1.5-ffmpeg-2.4.patch | 15 |
4 files changed, 58 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = vlc-decklink pkgdesc = A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module) pkgver = 2.1.5 - pkgrel = 1 + pkgrel = 5 url = http://www.videolan.org/vlc/ install = vlc.install arch = i686 @@ -96,8 +96,12 @@ pkgbase = vlc-decklink backup = usr/share/vlc/lua/http/dialogs/.hosts source = http://download.videolan.org/vlc/2.1.5/vlc-2.1.5.tar.xz source = vlc-2.0.7-vaapi-compat.patch + source = vlc-2.1.5-ffmpeg-2.4.patch + source = vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch md5sums = 3941b561f590cc95ca5e795213cba2f2 md5sums = 6df10774bb7acf20e09d6139e5c7839e + md5sums = 068a1b792064bb1aff0765a3ffa8a27a + md5sums = 787a854f3acde37cd6e76a8fa8e6f1d0 pkgname = vlc-decklink @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 216742 2014-07-09 13:17:31Z giovanni $ +# $Id: PKGBUILD 226292 2014-11-15 14:56:22Z bpiotrowski $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> @@ -6,7 +6,7 @@ _pkgname=vlc pkgname=vlc-decklink pkgver=2.1.5 -pkgrel=1 +pkgrel=5 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (with decklink module)" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -61,14 +61,21 @@ backup=('usr/share/vlc/lua/http/.hosts' options=('!emptydirs') install=vlc.install source=("http://download.videolan.org/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.xz" - 'vlc-2.0.7-vaapi-compat.patch') + 'vlc-2.0.7-vaapi-compat.patch' + 'vlc-2.1.5-ffmpeg-2.4.patch' + 'vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch') md5sums=('3941b561f590cc95ca5e795213cba2f2' - '6df10774bb7acf20e09d6139e5c7839e') + '6df10774bb7acf20e09d6139e5c7839e' + '068a1b792064bb1aff0765a3ffa8a27a' + '787a854f3acde37cd6e76a8fa8e6f1d0') prepare() { cd "${srcdir}/${_pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch" + patch -p1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch" + patch -p1 -i "${srcdir}/vlc-2.1.5-ffmpeg-2.4.patch" + patch -p1 -i "${srcdir}/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch" + autoreconf -fi # dirty hack because of VLC's configure [ -d decklink-sdk ] || mkdir decklink-sdk diff --git a/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch b/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch new file mode 100644 index 000000000000..f15de1268a7b --- /dev/null +++ b/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch @@ -0,0 +1,26 @@ +From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> +Date: Wed, 30 Jul 2014 19:05:43 +0300 +Subject: [PATCH] avformat: initialize probe data (fixes #11851) + +(cherry picked from commit 49bd1c657d960ba107d9db8752f716139a938eee) +--- + modules/demux/avformat/demux.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c +index bdd77fd..7349db2 100644 +--- a/modules/demux/avformat/demux.c ++++ b/modules/demux/avformat/demux.c +@@ -157,7 +157,7 @@ int OpenDemux( vlc_object_t *p_this ) + { + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; +- AVProbeData pd; ++ AVProbeData pd = { }; + AVInputFormat *fmt = NULL; + unsigned int i; + int64_t i_start_time = -1; +-- +2.1.0 + diff --git a/vlc-2.1.5-ffmpeg-2.4.patch b/vlc-2.1.5-ffmpeg-2.4.patch new file mode 100644 index 000000000000..2bd0949ecf10 --- /dev/null +++ b/vlc-2.1.5-ffmpeg-2.4.patch @@ -0,0 +1,15 @@ +diff --git a/configure.ac b/configure.ac +index a684338..053713a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec, + [ --enable-avcodec libavcodec codec (default enabled)]) + AS_IF([test "${enable_avcodec}" != "no"], [ + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ +- PKG_CHECK_EXISTS([libavcodec < 56],, [ +- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.]) ++ PKG_CHECK_EXISTS([libavcodec < 57],, [ ++ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" |