diff options
Diffstat (limited to 'libre/kodi')
| -rw-r--r-- | libre/kodi/PKGBUILD | 38 | ||||
| -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, 60 insertions, 16 deletions
diff --git a/libre/kodi/PKGBUILD b/libre/kodi/PKGBUILD index 3ce917c5e..4a680d5ea 100644 --- a/libre/kodi/PKGBUILD +++ b/libre/kodi/PKGBUILD @@ -1,5 +1,5 @@ # vim:set ts=2 sw=2 et: -# $Id: PKGBUILD 131315 2015-04-13 22:40:45Z foutrelis $ +# $Id: PKGBUILD 134198 2015-05-26 20:45:06Z 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> @@ -17,30 +17,34 @@ pkgbase=kodi pkgname=kodi pkgver=14.2 _codename=Helix -pkgrel=3.parabola1 +pkgrel=4.parabola1 arch=('i686' 'x86_64') url="http://kodi.tv" 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' - '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' + 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'ffmpeg' + 'git' 'glew' 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' + 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' 'libmpeg2' + 'libnfs' 'libplist' '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' ) 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' ) sha256sums=( '8d024625fd7c963785cad07f77049c2a89560f6474ca4db83153c7df7b9759f2' + '01453e18987b01ad40c9ae423a7e47422e537b648e74f5c942f132c37e6370f8' + '598f36cea0f63440e5755d88752552240fc5cd2b98e4f80a9feeb9605c917777' ) mksource() { @@ -65,6 +69,10 @@ install:' -i tools/EventClients/Makefile.in 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" + } build() { @@ -82,7 +90,7 @@ build() { --disable-debug \ --enable-optimizations \ --enable-libbluray \ - --enable-external-libraries \ + --with-ffmpeg=shared \ --with-lirc-device=/run/lirc/lircd \ --disable-non-free \ ac_cv_lib_bluetooth_hci_devid=no @@ -99,12 +107,10 @@ package_kodi() { # depends expeced in FEH.py # 'mesa-demos' 'xorg-xdpyinfo' depends=( - 'python2-pillow' 'python2-pybluez' 'python2-simplejson' - 'mesa-demos' 'xorg-xdpyinfo' - 'bluez-libs' 'fribidi' 'glew' 'hicolor-icon-theme' 'libcdio' - 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh' - 'libva' 'libxrandr' 'libxslt' 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' - 'yajl' + 'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'mesa-demos' + 'xorg-xdpyinfo' 'bluez-libs' 'ffmpeg' 'glew' 'hicolor-icon-theme' 'libcdio' + 'libjpeg-turbo' 'libmariadbclient' 'libmicrohttpd' 'libxrandr' 'libxslt' + 'lzo' 'sdl2' 'smbclient' 'taglib' 'tinyxml' 'yajl' ) optdepends=( 'afpfs-ng: Apple shares support' diff --git a/libre/kodi/kodi-14.0-dvddemux-ffmpeg.patch b/libre/kodi/kodi-14.0-dvddemux-ffmpeg.patch new file mode 100644 index 000000000..0c6d627d2 --- /dev/null +++ b/libre/kodi/kodi-14.0-dvddemux-ffmpeg.patch @@ -0,0 +1,13 @@ +--- 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 new file mode 100644 index 000000000..e4c1e52f7 --- /dev/null +++ b/libre/kodi/kodi-14.0-gcc5.patch @@ -0,0 +1,25 @@ +--- 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 |