diff options
| -rw-r--r-- | abs/extra/kodi/PKGBUILD | 33 | ||||
| -rw-r--r-- | abs/extra/kodi/__changelog | 2 | ||||
| -rw-r--r-- | abs/extra/kodi/hdhr_uPnP.diff | 16 | ||||
| -rw-r--r-- | abs/extra/kodi/kodi.install | 4 |
4 files changed, 18 insertions, 37 deletions
diff --git a/abs/extra/kodi/PKGBUILD b/abs/extra/kodi/PKGBUILD index 2898d21..6623868 100644 --- a/abs/extra/kodi/PKGBUILD +++ b/abs/extra/kodi/PKGBUILD @@ -9,12 +9,10 @@ # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Maxime Gauduin <alucryd@gmail.com> -_prefix=/usr - pkgbase=kodi pkgname=('kodi' 'kodi-eventclients') -pkgver=15.1 -_codename=Isengard +pkgver=16.1 +_codename=Jarvis pkgrel=2 arch=('i686' 'x86_64') url="http://kodi.tv" @@ -22,18 +20,17 @@ license=('GPL2') makedepends=( 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass' - 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' + 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmysqlclient' 'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libssh' 'libva' 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'nasm' 'nss-mdns' 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image' 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' - 'yajl' 'zip' + 'yajl' 'zip' 'mesa' 'dcadec' 'libcrossguid' ) source=( "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" 'kodi.sh' 'kodi_lib.conf' - 'hdhr_uPnP.diff' ) prepare() { @@ -43,7 +40,8 @@ prepare() { sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl sed 's/python/python2/' -i tools/Linux/kodi.sh.in sed 's/shell python/shell python2/' -i tools/EventClients/Makefile.in - patch -Np1 -i ${srcdir}/hdhr_uPnP.diff + + # patches } build() { @@ -57,7 +55,7 @@ build() { # Configuring XBMC export PYTHON_VERSION=2 # external python v2 - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + ./configure --prefix=/usr --exec-prefix=/usr \ --disable-debug \ --enable-optimizations \ --enable-libbluray \ @@ -79,10 +77,10 @@ package_kodi() { depends=( 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'mesa-demos' 'xorg-xdpyinfo' - 'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio' - 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libssh' + 'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libass' 'libcdio' + 'libjpeg-turbo' 'libmysqlclient' 'libmicrohttpd' 'libssh' 'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' - 'yajl' + 'yajl' 'mesa' 'dcadec' 'desktop-file-utils' ) optdepends=( 'afpfs-ng: Apple shares support' @@ -113,10 +111,10 @@ package_kodi() { # we will leave /usr/{include,lib,share}/xbmc for now # Licenses - install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} + install -dm755 ${pkgdir}/usr/share/licenses/${pkgname} for licensef in LICENSE.GPL copying.txt; do - mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \ - ${pkgdir}${_prefix}/share/licenses/${pkgname} + mv ${pkgdir}/usr/share/doc/kodi/${licensef} \ + ${pkgdir}/usr/share/licenses/${pkgname} done # LinHES stuff @@ -136,7 +134,6 @@ package_kodi-eventclients() { make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD } -md5sums=('d8acb0ef061b3e2fef88146cea1f4443' +md5sums=('79358ad5f77f42c5498a9412d5a78dd5' 'f6adc8e06d7076143ca2ad118126b158' - 'f04d1c89f5108c6aba36cf708a74cc95' - 'c09cc882da2ad0c1f042fb86a5b47d20') + 'f04d1c89f5108c6aba36cf708a74cc95') diff --git a/abs/extra/kodi/__changelog b/abs/extra/kodi/__changelog index 53d67ec..6069eb3 100644 --- a/abs/extra/kodi/__changelog +++ b/abs/extra/kodi/__changelog @@ -2,4 +2,4 @@ PKGBUILD - remove libpulse dep and remove --enable-pulse config option PKGBUILD - Add /usr/LH/bin/kodi.sh PKGBUILD - Add /etc/gen_lib_xml.d/kodi_lib.conf kodi.install - add gen_lib_xml.py to post_install and post_remove -PKGBUILD - Add hdhr_uPnP.diff +PKGBUILD - change dep libmariadbclient to libmysqlclient diff --git a/abs/extra/kodi/hdhr_uPnP.diff b/abs/extra/kodi/hdhr_uPnP.diff deleted file mode 100644 index 7ad89e1..0000000 --- a/abs/extra/kodi/hdhr_uPnP.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/xbmc/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp -index c308649..25af47e 100644 ---- a/xbmc/filesystem/CurlFile.cpp -+++ b/xbmc/filesystem/CurlFile.cpp -@@ -1528,8 +1528,9 @@ bool CCurlFile::CReadState::FillBuffer(unsigned int want) - msg->data.result == CURLE_RECV_ERROR) && - !m_bFirstLoop) - CURLresult = msg->data.result; -- else if ( (msg->data.result == CURLE_HTTP_RANGE_ERROR || -- httpCode == 416 /* = Requested Range Not Satisfiable */) && -+ else if ( (msg->data.result == CURLE_HTTP_RANGE_ERROR || -+ httpCode == 416 /* = Requested Range Not Satisfiable */ || -+ httpCode == 406 /* = Not Acceptable (fixes issues with non compliant HDHomerun servers */) && - m_bFirstLoop && - m_filePos == 0 && - m_sendRange) diff --git a/abs/extra/kodi/kodi.install b/abs/extra/kodi/kodi.install index d28289b..01c138d 100644 --- a/abs/extra/kodi/kodi.install +++ b/abs/extra/kodi/kodi.install @@ -1,6 +1,6 @@ post_install() { update_icons - gen_lib_xml.py + gen_lib_xml.py } post_upgrade() { @@ -9,7 +9,7 @@ post_upgrade() { post_remove() { update_icons - gen_lib_xml.py + gen_lib_xml.py } update_icons() { |