diff options
| -rw-r--r-- | multimedia/kodi/kodi.SlackBuild | 15 | ||||
| -rw-r--r-- | multimedia/kodi/kodi.info | 10 |
2 files changed, 13 insertions, 12 deletions
diff --git a/multimedia/kodi/kodi.SlackBuild b/multimedia/kodi/kodi.SlackBuild index 2dfca03e07..6bc6becc0a 100644 --- a/multimedia/kodi/kodi.SlackBuild +++ b/multimedia/kodi/kodi.SlackBuild @@ -24,7 +24,8 @@ PRGNAM=kodi SRCNAM=xbmc -VERSION=${VERSION:-14.0} +VERSION=${VERSION:-14.2} +FFMPEGVER=${FFMPEGVER:-2.4.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,14 +62,14 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION-Helix -tar xvf $CWD/$VERSION-Helix.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION-Helix.tar.gz 2>/dev/null || tar xvf $CWD/$VERSION-Helix.tar.gz cd $SRCNAM-$VERSION-Helix -tar xvf $CWD/$SRCNAM-pvr-addons-Helix_rc3.tar.gz || tar xvf $CWD/Helix_rc3.tar.gz +tar xvf $CWD/$SRCNAM-pvr-addons-Helix_rc3.tar.gz 2>/dev/null || tar xvf $CWD/Helix_rc3.tar.gz # Don't have the Makefile download ffmpeg during install. -if [ -f "$CWD/FFmpeg-2.4.4-Helix.tar.gz" ]; then - ln -s $CWD/FFmpeg-2.4.4-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix.tar.gz -elif [ -f "$CWD/2.4.4-Helix.tar.gz" ]; then - ln -s $CWD/2.4.4-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix.tar.gz +if [ -f "$CWD/FFmpeg-${FFMPEGVER}-Helix.tar.gz" ]; then + ln -s $CWD/FFmpeg-${FFMPEGVER}-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-Helix.tar.gz +elif [ -f "$CWD/${FFMPEGVER}-Helix.tar.gz" ]; then + ln -s $CWD/${FFMPEGVER}-Helix.tar.gz tools/depends/target/ffmpeg/ffmpeg-${FFMPEGVER}-Helix.tar.gz else echo "FFMPEG wasn't found. Please download it and have it available" echo "in the source directory ${CWD}." diff --git a/multimedia/kodi/kodi.info b/multimedia/kodi/kodi.info index 2f833f2fb3..d3e1cdd76f 100644 --- a/multimedia/kodi/kodi.info +++ b/multimedia/kodi/kodi.info @@ -1,12 +1,12 @@ PRGNAM="kodi" -VERSION="14.0" +VERSION="14.2" HOMEPAGE="http://xbmc.org/" -DOWNLOAD="http://mirrors.kodi.tv/releases/source/14.0-Helix.tar.gz \ +DOWNLOAD="https://github.com/xbmc/xbmc/archive/14.2-Helix.tar.gz \ https://github.com/opdenkamp/xbmc-pvr-addons/archive/Helix_rc3.tar.gz \ - https://github.com/xbmc/FFmpeg/archive/2.4.4-Helix.tar.gz" -MD5SUM="9717c539789789b8aeaf1dcfdb9f2c69 \ + https://github.com/xbmc/FFmpeg/archive/2.4.6-Helix.tar.gz" +MD5SUM="aa534c483cdd6cda71e5350c2094175b \ 5fd7b09f11e0fb6c3a8874d4ed20a694 \ - 19b5d29ef6b5a6fc202c652fe3905d9b" + 92f6208f6908ef1586bf34764ebeb073" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk libass libmpeg2 libmodplug yajl tinyxml" |