diff options
Diffstat (limited to 'libre/kodi')
| -rw-r--r-- | libre/kodi/PKGBUILD | 35 | ||||
| -rw-r--r-- | libre/kodi/kodi-14.0-dvddemux-ffmpeg.patch | 13 | ||||
| -rw-r--r-- | libre/kodi/kodi-14.0-gcc5.patch | 25 |
3 files changed, 12 insertions, 61 deletions
diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD index 453d0d18f..e75f194b2 100644 --- a/libre/kodi/PKGBUILD +++ b/libre/kodi/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ts=2 sw=2 et: -# $Id: PKGBUILD 134391 2015-05-31 07:36:09Z idevolder $ +# $Id: PKGBUILD 137372 2015-07-24 12:44:05Z idevolder $ # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com > # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us> @@ -15,9 +15,9 @@ _prefix=/usr _pkgbase=kodi-libre pkgbase=kodi pkgname=kodi -pkgver=14.2 -_codename=Helix -pkgrel=5.parabola1 +pkgver=15.0 +_codename=Isengard +pkgrel=1.parabola1 arch=('i686' 'x86_64') url="http://kodi.tv" license=('GPL2') @@ -26,25 +26,22 @@ makedepends=( 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass' 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva' - 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'nasm' 'nss-mdns' 'python2-pillow' - 'python2-pybluez' 'python2-simplejson' 'rtmpdump' 'sdl2' 'sdl_image' - 'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip' + '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' ) mksource=( "$pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz" ) source=( "https://repo.parabola.nu/other/$_pkgbase/$_pkgbase-$pkgver-$_codename.tar.gz" - "kodi-14.0-dvddemux-ffmpeg.patch" - "kodi-14.0-gcc5.patch" ) mksha256sums=( - 'd9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4' + '27dba173cfe74b323f4dbaa72ae2bfe5961f76c27bddcd5210253be91cae0dff' ) sha256sums=( - '8d024625fd7c963785cad07f77049c2a89560f6474ca4db83153c7df7b9759f2' - '01453e18987b01ad40c9ae423a7e47422e537b648e74f5c942f132c37e6370f8' - '598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777' + 'feff6278b4b6570f053c954bbe0ab0df34dbd5db5cadfdd37fea43b03306a437' ) mksource() { @@ -61,18 +58,10 @@ 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 - # disable wiiremote due to incompatibility with bluez-5.29 - sed '/WiiRemote/d' -i tools/EventClients/Makefile.in - sed '/mkdir -p $(DESTDIR)$(bindir)/i \ -install:' -i tools/EventClients/Makefile.in msg2 "Use addons.xml from Parabola server (without nonfree addons support)" sed -i -e 's|mirrors[.]kodi[.]tv/addons/gotham/addons.xml|repo.parabola.nu/other/kodi-libre/addons/gotham/addons.xml|' addons/repository.xbmc.org/addon.xml sed -i -e 's|mirrors[.]kodi[.]tv/addons/helix/addons.xml|repo.parabola.nu/other/kodi-libre/addons/helix/addons.xml|' addons/repository.xbmc.org/addon.xml - sed -i -e 's|mirrors[.]kodi[.]tv/addons/frodo/addons.xml|repo.parabola.nu/other/kodi-libre/addons/frodo/addons.xml|' addons/repository.xbmc.org/addon.xml - - patch -p0 -i "$srcdir/kodi-14.0-dvddemux-ffmpeg.patch" - patch -p1 -i "$srcdir/kodi-14.0-gcc5.patch" - + sed -i -e 's|mirrors[.]kodi[.]tv/addons/isengard/addons.xml|repo.parabola.nu/other/kodi-libre/addons/isengard/addons.xml|' addons/repository.xbmc.org/addon.xml } build() { @@ -93,7 +82,7 @@ build() { --enable-shared-libraries \ --with-lirc-device=/run/lirc/lircd \ --disable-non-free \ - ac_cv_lib_bluetooth_hci_devid=no + ac_cv_type__Bool=yes # Now (finally) build make diff --git a/libre/kodi/kodi-14.0-dvddemux-ffmpeg.patch b/libre/kodi/kodi-14.0-dvddemux-ffmpeg.patch deleted file mode 100644 index 0c6d627d2..000000000 --- a/libre/kodi/kodi-14.0-dvddemux-ffmpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- 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/libre/kodi/kodi-14.0-gcc5.patch b/libre/kodi/kodi-14.0-gcc5.patch deleted file mode 100644 index e4c1e52f7..000000000 --- a/libre/kodi/kodi-14.0-gcc5.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/xbmc/screensavers/rsxs-0.9/lib/argp.h.orig 2015-03-26 13:25:20.000000000 -0500 -+++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h 2015-05-19 16:05:20.992493851 -0500 -@@ -559,7 +559,7 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline)) - # endif - - ARGP_EI void ---- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h.orig 2015-03-26 13:25:20.000000000 -0500 -+++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h 2015-05-19 16:02:25.775456866 -0500 -@@ -198,11 +198,7 @@ - #endif - - #ifndef ARGP_FS_EI --#ifdef __clang__ - #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) --#else --#define ARGP_FS_EI extern inline --#endif - #endif - - ARGP_FS_EI size_t |