diff --git a/srcpkgs/kodi/patches/dvddemux-ffmpeg.patch b/srcpkgs/kodi/patches/dvddemux-ffmpeg.patch index f381899076..4f09af45f9 100644 --- a/srcpkgs/kodi/patches/dvddemux-ffmpeg.patch +++ b/srcpkgs/kodi/patches/dvddemux-ffmpeg.patch @@ -3,13 +3,13 @@ http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/kodi-14.0-dvddemux-ffmpeg.patch? --- 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 @@ +@@ -542,10 +542,6 @@ void CDVDDemuxFFmpeg::Flush() { - // naughty usage of an internal ffmpeg function - if (m_pFormatContext) -- av_read_frame_flush(m_pFormatContext); +- avformat_flush(m_pFormatContext); - m_currentPts = DVD_NOPTS_VALUE; diff --git a/srcpkgs/kodi/patches/use-static-lib-for-texturepacker.patch b/srcpkgs/kodi/patches/use-static-lib-for-texturepacker.patch deleted file mode 100644 index f2bf070e8a..0000000000 --- a/srcpkgs/kodi/patches/use-static-lib-for-texturepacker.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tools/TexturePacker/Makefile.in.orig 2014-05-05 14:06:10.574102302 +0200 -+++ tools/TexturePacker/Makefile.in 2014-05-05 14:06:30.389236221 +0200 -@@ -20,7 +20,7 @@ CXXFLAGS_FOR_BUILD += \ - -I@abs_top_srcdir@/xbmc/linux - - LDFLAGS_FOR_BUILD += -lSDL_image -lSDL -llzo2 --LDFLAGS_FOR_BUILD += -L@abs_top_srcdir@/lib/libsquish -lsquish-native -+LDFLAGS_FOR_BUILD += @abs_top_srcdir@/lib/libsquish/libsquish.a - - ifeq ($(findstring Darwin,$(shell uname -s)),Darwin) - DEFINES += -DTARGET_DARWIN diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template index 6b5c553285..bb7bed3b7d 100644 --- a/srcpkgs/kodi/template +++ b/srcpkgs/kodi/template @@ -1,14 +1,15 @@ # Template file for 'kodi' pkgname=kodi -version=14.2 -revision=2 -wrksrc="xbmc-${version}-Helix" +version=15.0 +revision=1 +_codename="-Isengard" +wrksrc="xbmc-${version}${_codename}" short_desc="A software media player and entertainment hub for digital media" maintainer="Juan RP " -homepage="http://www.kodi.tv" +homepage="http://www.kodi.tv/" license="GPL-2" -distfiles="https://github.com/xbmc/xbmc/archive/${version}-Helix.tar.gz" -checksum=d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4 +distfiles="https://github.com/xbmc/xbmc/archive/${version}${_codename}.tar.gz" +checksum=27dba173cfe74b323f4dbaa72ae2bfe5961f76c27bddcd5210253be91cae0dff lib32disabled=yes broken_as_needed=yes @@ -26,12 +27,12 @@ makedepends=" libXrandr-devel avahi-libs-devel pulseaudio-devel samba-devel tiff-devel libmysqlclient-devel libmpeg2-devel wavpack-devel zlib-devel lzo-devel libXmu-devel glew-devel fribidi-devel sqlite-devel libcdio-devel freetype-devel - jasper-devel faac-devel SDL_image-devel faad2-devel libmodplug-devel libressl-devel + jasper-devel faac-devel SDL2_image-devel faad2-devel libmodplug-devel libressl-devel 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 librtmp-devel tinyxml-devel taglib-devel libcap-devel lame-devel libbluray-devel libnfs-devel ffmpeg-devel - libcec-devel libxslt-devel gnutls-devel libssh-devel libmicrohttpd-devel" + giflib-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 lame librtmp libnfs>=1.9.7 libplist>=1.12" @@ -56,7 +57,7 @@ do_configure() { --enable-pulse --enable-dvdcss --enable-optical-drive \ --enable-rtmp --enable-samba --enable-nfs --enable-ssh \ --enable-airplay --enable-ffmpeg-libvorbis --enable-udev \ - --enable-avahi --enable-libcec --enable-libbluray \ + --enable-avahi --enable-libbluray \ --enable-texturepacker --enable-external-libraries \ --with-ffmpeg=shared }