Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=84c91333c5a06c8bbb880168d768dbd83cec4efb
commit 84c91333c5a06c8bbb880168d768dbd83cec4efb Author: kikadf <[email protected]> Date: Sun Mar 1 15:12:37 2015 +0100 vlc-2.2.0-1-x86_64 * Version bump diff --git a/source/xmultimedia/vlc/FrugalBuild b/source/xmultimedia/vlc/FrugalBuild index 8e81ac3..4fd9b87 100644 --- a/source/xmultimedia/vlc/FrugalBuild +++ b/source/xmultimedia/vlc/FrugalBuild @@ -8,9 +8,9 @@ options+=('asneeded') : ${USE_DEVEL="n"} pkgname=vlc -pkgver=2.1.5 +pkgver=2.2.0 pkgextraver= -pkgrel=3 +pkgrel=1 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; depends=('e2fsprogs' 'libxpm>=3.5.8-1' 'libxdmcp' 'libshout' 'avahi' \ @@ -50,12 +50,8 @@ archs=('i686' 'x86_64') up2date="Flasttar http://download.videolan.org/pub/videolan/vlc/last/"; if ! Fuse DEVEL; then - source=(http://download.videolan.org/pub/videolan/vlc/$pkgver/$pkgname-$pkgver$pkgextraver.tar.xz - vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch - vlc-2.1.5-ffmpeg-2.4.patch) - sha1sums=('7f1cb6324a04cf393896bbb5976ca9febd7b3efc' \ - 'bd51cbe232adc72697bfd49834b6f31327e90b85' \ - '9896793e605b5646a49506796dd2c28307635791') + source=(http://download.videolan.org/pub/videolan/vlc/$pkgver/$pkgname-$pkgver$pkgextraver.tar.xz) + sha1sums=('11f0384980052c7ed73753af2073965f59b27cd2') else pkgver=2.0.0 pkgextraver=-rc1 @@ -123,7 +119,6 @@ subarchs=("${subarchs[@]}" 'i686 x86_64') build() { Fpatchall - autoreconf -fi || Fdie Fsed '#include <va/va_x11.h>' '#include <va/va_x11.h>\n#include <va/va_compat.h>' modules/codec/avcodec/vaapi.c Fsed 'truetype/freefont' 'X11/TTF' modules/text_renderer/freetype.c Fmake diff --git a/source/xmultimedia/vlc/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch b/source/xmultimedia/vlc/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch deleted file mode 100644 index f15de12..0000000 --- a/source/xmultimedia/vlc/vlc-2.1.5-avformat-initialize-probe-data-fixes-11851.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1e31a5a18bb0087f9e625919a805d64a2af40bbe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <[email protected]> -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/source/xmultimedia/vlc/vlc-2.1.5-ffmpeg-2.4.patch b/source/xmultimedia/vlc/vlc-2.1.5-ffmpeg-2.4.patch deleted file mode 100644 index 2bd0949..0000000 --- a/source/xmultimedia/vlc/vlc-2.1.5-ffmpeg-2.4.patch +++ /dev/null @@ -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}" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
