From a80d7bee59e27c4303f663c78c0e8f3e7134f091 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Wed, 29 Jul 2015 19:53:41 +0200 Subject: [PATCH] - updated to 15.0 --- dvddemux-ffmpeg.patch | 16 ---------------- dvdread.patch | 6 +++--- kodi.spec | 17 ++++++----------- 3 files changed, 9 insertions(+), 30 deletions(-) delete mode 100644 dvddemux-ffmpeg.patch diff --git a/dvddemux-ffmpeg.patch b/dvddemux-ffmpeg.patch deleted file mode 100644 index f381899..0000000 --- a/dvddemux-ffmpeg.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/dvdread.patch b/dvdread.patch index b34700d..1b17355 100644 --- a/dvdread.patch +++ b/dvdread.patch @@ -37,10 +37,10 @@ index 8bc4795..1fc31a4 100644 %: %.ac autoreconf -vif $(@D) -@rm -rf $(@D)/autom4te.cache -diff --git a/configure.in b/configure.in +diff --git a/configure.ac b/configure.ac index beb8aac..343292e 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -2860,27 +2860,9 @@ --with-pic ], [$SKIP_CONFIG_DVDCSS]) diff --git a/kodi.spec b/kodi.spec index 2b4955f..fc505d1 100644 --- a/kodi.spec +++ b/kodi.spec @@ -56,19 +56,18 @@ %bcond_without system_ffmpeg # build with system ffmpeg %bcond_without system_dvdread # build with system dvdread -%define codename Helix +%define codename Isengard Summary: Kodi is a free and open source media-player and entertainment hub Name: kodi -Version: 14.0 -Release: 0.3 +Version: 15.0 +Release: 0.1 License: GPL v2+ and GPL v3+ Group: Applications/Multimedia Source0: http://mirrors.kodi.tv/releases/source/%{version}-%{codename}.tar.gz -# Source0-md5: 9717c539789789b8aeaf1dcfdb9f2c69 -Source1: https://github.com/xbmc/FFmpeg/archive/2.4.4-%{codename}.tar.gz -# Source1-md5: 19b5d29ef6b5a6fc202c652fe3905d9b +# Source0-md5: d3bd3dc9fd705bcf59d8c91199994537 +Source1: https://github.com/xbmc/FFmpeg/archive/2.6.3-%{codename}.tar.gz +# Source1-md5: 31c6cd81c44cce93358b6d9357772aec Patch0: jpeglib-boolean.patch -Patch1: dvddemux-ffmpeg.patch Patch2: dvdread.patch URL: http://kodi.tv/ BuildRequires: Mesa-libGLU-devel @@ -195,17 +194,13 @@ all common digital media files from local and network storage media. %prep %setup -q -n xbmc-%{version}-%{codename} %patch0 -p1 -%{?with_system_ffmpeg:%patch1 -p0} %{?with_system_dvdread:%patch2 -p1} rm -r lib/cximage-6.0/zlib #rm -r lib/libhdhomerun rm -r lib/libmpeg2 rm -r xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2 -rm -r lib/enca rm -r lib/libbluray -rm -r lib/libmicrohttpd -rm -r lib/libmodplug rm -r lib/librtmp rm -r lib/win32 %{?with_system_dvdread:rm -r lib/libdvd/libdvdread} -- 2.44.0