kodi-rpi: update to 15.0.

This commit is contained in:
Enno Boland 2015-07-23 22:07:57 +02:00
parent 978bc322d3
commit d37605daf7
3 changed files with 30 additions and 27 deletions

View File

@ -0,0 +1,24 @@
--- configure.ac.orig 2015-07-23 23:49:37.887069973 +0200
+++ configure.ac 2015-07-23 23:51:40.074074325 +0200
@@ -2170,15 +2170,12 @@ else
final_message="$final_message\n Bluray:\tNo"
fi
-# we don't compile with default upstream squish, so we use our own one
-# even on non unified deps platforms
-if test "$cross_compiling" != "yes"; then
- make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}
- export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"
-fi
-PKG_CHECK_MODULES([SQUISH], [squish],
- [INCLUDES="$INCLUDES $SQUISH_CFLAGS" LIBS="$LIBS $SQUISH_LIBS"],
- AC_MSG_ERROR("squish not found"))
+make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}
+SQUISH_CFLAGS="-I${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/include "
+SQUISH_LIBS="-L${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib -lsquish "
+INCLUDES="$INCLUDES $SQUISH_CFLAGS"
+LIBS="$LIBS $SQUISH_LIBS"
+
if test "x$use_texturepacker" != "xno"; then
AC_PATH_PROG([TEXTUREPACKER], [TexturePacker], ["none"],

View File

@ -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;

View File

@ -1,26 +1,22 @@
# Template file for 'kodi-rpi'
pkgname=kodi-rpi
version=14.2
version=15.0
revision=1
wrksrc="xbmc-${version}-Helix"
_codename="Isengard"
wrksrc="xbmc-${version}-${_codename}"
short_desc="A software media player and entertainment hub for digital media (RPi)"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
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
only_for_archs="armv6l armv7l"
# Due to bootstrap requiring java, it's only possible currently to cross
# compile it from x86.
if [ "$XBPS_MACHINE" != "i686" -a "$XBPS_MACHINE" != "x86_64" ]; then
msg_error "${pkgname}-${version}: can only be cross built on x86."
fi
hostmakedepends="
automake libtool pkg-config gperf cmake zip unzip nasm yasm
swig gettext-devel libltdl-devel python-devel libmysqlclient-devel
SDL_image-devel lzo-devel openjdk-jre"
SDL2_image-devel lzo-devel openjdk-jre"
makedepends="
libudev-devel pcre-devel expat-devel libpng-devel libjpeg-turbo-devel
avahi-libs-devel alsa-lib-devel samba-devel tiff-devel libmysqlclient-devel
@ -92,7 +88,6 @@ do_configure() {
--with-ffmpeg=shared
sed -e "s,\$(DVDREAD_CFLAGS),,g;s,AR=ar,AR=$AR,g;s,LD=ld,LD=$LD,g;s,RANLIB=ranlib,RANLIB=$RANLIB,g" -i lib/libdvd/libdvd{nav,read}/Makefile
sed -e 's,-L/usr/lib,,g' -i lib/cmyth/Makefile
}
do_build() {
make ${makejobs}