From 12cef3cd277aa3badb0ad4bd6d6682360437d93f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 6 Feb 2015 16:34:44 +0100 Subject: [PATCH] kodi: build with ffmpeg=shared (use system ffmpeg libraries). --- srcpkgs/kodi/patches/dvddemux-ffmpeg.patch | 16 ++++++++++++++++ srcpkgs/kodi/template | 7 ++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/kodi/patches/dvddemux-ffmpeg.patch diff --git a/srcpkgs/kodi/patches/dvddemux-ffmpeg.patch b/srcpkgs/kodi/patches/dvddemux-ffmpeg.patch new file mode 100644 index 0000000000..f381899076 --- /dev/null +++ b/srcpkgs/kodi/patches/dvddemux-ffmpeg.patch @@ -0,0 +1,16 @@ +origin: +http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/kodi-14.0-dvddemux-ffmpeg.patch?revision=1.1&root=free&view=markup + +--- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp.orig 2014-08-01 11:18:24.000000000 -0500 ++++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp 2014-08-24 15:36:34.844966866 -0500 +@@ -519,10 +519,6 @@ + + void CDVDDemuxFFmpeg::Flush() + { +- // naughty usage of an internal ffmpeg function +- if (m_pFormatContext) +- av_read_frame_flush(m_pFormatContext); +- + m_currentPts = DVD_NOPTS_VALUE; + + m_pkt.result = -1; diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 60a91ebd8e..0a2f35c716 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,7 +1,7 @@ # Template file for 'kodi' pkgname=kodi version=14.1 -revision=2 +revision=3 wrksrc="xbmc-${version}-Helix" short_desc="A software media player and entertainment hub for digital media" maintainer="Juan RP " @@ -30,7 +30,7 @@ makedepends=" libmad-devel fontconfig-devel libXinerama-devel libsamplerate-devel libmms-devel enca-devel boost-devel libcurl-devel libva-devel libvdpau-devel libass-devel libbluetooth-devel yajl-devel libplist-devel>=1.12 librtmp-devel tinyxml-devel - taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel + taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel ffmpeg-devel libcec-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel" # The following dependencies are dlopen(3)ed. depends="libbluray libmad libvorbis libcurl libflac libmodplug libass libmpeg2 @@ -51,7 +51,8 @@ do_configure() { --enable-rtmp --enable-samba --enable-nfs --enable-ssh \ --enable-airplay --enable-ffmpeg-libvorbis --enable-udev \ --enable-avahi --enable-libcec --enable-libbluray \ - --enable-texturepacker --enable-external-libraries + --enable-texturepacker --enable-external-libraries \ + --with-ffmpeg=shared } do_build() { make ${makejobs}