Date: Friday, February 27, 2015 @ 18:34:33 Author: giovanni Revision: 232094
upgpkg: vlc 2.2.0-1 upstream release Modified: vlc/trunk/PKGBUILD Deleted: vlc/trunk/vlc-2.0.7-vaapi-compat.patch vlc/trunk/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch vlc/trunk/vlc-2.1.5-ffmpeg-2.4.patch ------------------------------------------------------------+ PKGBUILD | 19 +------- vlc-2.0.7-vaapi-compat.patch | 11 ---- vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch | 26 ----------- vlc-2.1.5-ffmpeg-2.4.patch | 15 ------ 4 files changed, 4 insertions(+), 67 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-27 17:11:40 UTC (rev 232093) +++ PKGBUILD 2015-02-27 17:34:33 UTC (rev 232094) @@ -4,8 +4,8 @@ # Contributor: Martin Sandsmark <martin.sandsm...@kde.org> pkgname=vlc -pkgver=2.1.5 -pkgrel=5 +pkgver=2.2.0 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -56,23 +56,12 @@ 'usr/share/vlc/lua/http/dialogs/.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.1.5-ffmpeg-2.4.patch' - 'vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch') -md5sums=('3941b561f590cc95ca5e795213cba2f2' - '6df10774bb7acf20e09d6139e5c7839e' - '068a1b792064bb1aff0765a3ffa8a27a' - '787a854f3acde37cd6e76a8fa8e6f1d0') +source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('faeceb614bf3946e5f90ef0d1f51db45') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - 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 - 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 } Deleted: vlc-2.0.7-vaapi-compat.patch =================================================================== --- vlc-2.0.7-vaapi-compat.patch 2015-02-27 17:11:40 UTC (rev 232093) +++ vlc-2.0.7-vaapi-compat.patch 2015-02-27 17:34:33 UTC (rev 232094) @@ -1,11 +0,0 @@ -diff -rupN a/modules/codec/avcodec/vaapi.c b/modules/codec/avcodec/vaapi.c ---- a/modules/codec/avcodec/vaapi.c 2013-01-22 09:51:40.000000000 +0000 -+++ b/modules/codec/avcodec/vaapi.c 2013-07-27 17:23:37.965202118 +0000 -@@ -47,6 +47,7 @@ - - #include <X11/Xlib.h> - #include <va/va_x11.h> -+#include <va/va_compat.h> - - typedef struct - { Deleted: vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch =================================================================== --- vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch 2015-02-27 17:11:40 UTC (rev 232093) +++ vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch 2015-02-27 17:34:33 UTC (rev 232094) @@ -1,26 +0,0 @@ -From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <r...@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 - Deleted: vlc-2.1.5-ffmpeg-2.4.patch =================================================================== --- vlc-2.1.5-ffmpeg-2.4.patch 2015-02-27 17:11:40 UTC (rev 232093) +++ vlc-2.1.5-ffmpeg-2.4.patch 2015-02-27 17:34:33 UTC (rev 232094) @@ -1,15 +0,0 @@ -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}"