diff options
author | dhead666 | 2015-06-11 13:03:01 +0300 |
---|---|---|
committer | dhead666 | 2015-06-11 13:07:57 +0300 |
commit | 5fbedcc061ce6f97f8924746e55db5a07e78550a (patch) | |
tree | ee4e370ee76f5d87499a91072fab5c6b7872feaa | |
parent | 4865a896aa550d14aef034d1ce370f43abddf408 (diff) | |
download | aur-5fbedcc061ce6f97f8924746e55db5a07e78550a.tar.gz |
bump to 15.0b1
-rw-r--r-- | .SRCINFO | 106 | ||||
-rw-r--r-- | 0001-rsxs-gcc5-fix.patch | 40 | ||||
-rw-r--r-- | PKGBUILD | 231 | ||||
-rw-r--r-- | kodi-devel.install | 24 | ||||
-rw-r--r-- | kodi.install | 13 |
5 files changed, 335 insertions, 79 deletions
@@ -1,38 +1,80 @@ pkgbase = kodi-devel - pkgdesc = kodi Entertainment Center - pkgver = 14.0b1 + pkgver = 15.0b1 pkgrel = 1 url = http://xbmc.org - install = kodi.install arch = i686 arch = x86_64 - license = GPL2 + groups = kodi-devel + license = GPL + license = LGPL makedepends = afpfs-ng + makedepends = bluez-libs makedepends = boost makedepends = cmake + makedepends = curl + makedepends = cwiid makedepends = doxygen makedepends = git + makedepends = glew makedepends = gperf + makedepends = hicolor-icon-theme makedepends = jasper makedepends = java-runtime + makedepends = lame + makedepends = libaacs + makedepends = libass + makedepends = libbluray + makedepends = libcdio makedepends = libcec + makedepends = libgl + makedepends = libmariadbclient + makedepends = libmicrohttpd + makedepends = libmodplug + makedepends = libmpeg2 makedepends = libnfs makedepends = libplist + makedepends = libpulse + makedepends = libsamplerate + makedepends = libssh + makedepends = libva + makedepends = libvdpau + makedepends = libvorbis + makedepends = libxrandr + makedepends = libxslt + makedepends = lzo + makedepends = mesa makedepends = nasm + makedepends = python2-pillow + makedepends = python2-simplejson + makedepends = rtmpdump + makedepends = sdl2 makedepends = shairplay + makedepends = smbclient makedepends = swig + makedepends = taglib + makedepends = tinyxml makedepends = unzip makedepends = upower + makedepends = xorg-xdpyinfo + makedepends = yajl makedepends = zip + source = https://github.com/xbmc/xbmc/archive/15.0b1-Isengard.tar.gz + source = 0001-rsxs-gcc5-fix.patch + sha256sums = 2075e80ea7193f69f5c87721c65b8439c4ed29389709d0ee6f5db52d0c3b33ad + sha256sums = 96810302a15b215f4aea7854932a70ecd203bbe1730153cc6221ad20e69281bd + +pkgname = kodi-devel + pkgdesc = Kodi Media Center monthly development releases + install = kodi-devel.install depends = bluez-libs depends = curl depends = glew depends = hicolor-icon-theme depends = lame + depends = libaacs depends = libass depends = libbluray depends = libcdio - depends = libmad depends = libmariadbclient depends = libmicrohttpd depends = libmodplug @@ -42,35 +84,75 @@ pkgbase = kodi-devel depends = libssh depends = libva depends = libvdpau + depends = libvorbis depends = libxrandr depends = libxslt depends = lzo depends = mesa depends = python2-pillow + depends = python2-simplejson depends = rtmpdump - depends = sdl_image + depends = sdl2 depends = smbclient depends = taglib depends = tinyxml depends = xorg-xdpyinfo depends = yajl + optdepends = gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED optdepends = afpfs-ng: Apple shares support + optdepends = bluez: Blutooth support + optdepends = kodi-devel-audiodecoder-modplug: Modplug decoder addon for Kodi + optdepends = kodi-devel-audiodecoder-nosefart: Nosefart decoder addon for Kodi + optdepends = kodi-devel-audiodecoder-snesapu: SPC decoder addon for Kodi + optdepends = kodi-devel-audiodecoder-stsound: YM decoder addon for Kodi + optdepends = kodi-devel-audiodecoder-timidity: Timidity decoder addon for Kodi + optdepends = kodi-devel-audiodecoder-vgmstream: VGM decoder addon for Kodi + optdepends = kodi-devel-audioencoder-flac: Flac encoder addon for Kodi + optdepends = kodi-devel-audioencoder-lame: Lame MP3 encoder addon for Kodi + optdepends = kodi-devel-audioencoder-vorbis: Vorbis encoder addon for Kodi + optdepends = kodi-devel-audioencoder-wav: Wav encoder addon for Kodi + optdepends = kodi-devel-pvr-argustv: ARGUS TV PVR client addon for Kodi + optdepends = kodi-devel-pvr-demo: Demo PVR addon for Kodi + optdepends = kodi-devel-pvr-dvblink: DVBLink PVR client addon for Kodi + optdepends = kodi-devel-pvr-dvbviewer: DVBViewer PVR client addon for Kodi + optdepends = kodi-devel-pvr-filmon: Filmon client PVR addon for Kodi + optdepends = kodi-devel-pvr-hts: Tvheadend HTSP PVR client addon for Kodi + optdepends = kodi-devel-pvr-iptvsimple: IPTV Simple PVR client addon for Kodi + optdepends = kodi-devel-pvr-mediaportal-tvserver: MediaPortal PVR client addon for Kodi + optdepends = kodi-devel-pvr-mythtv: MythTV PVR client addon for Kodi + optdepends = kodi-devel-pvr-nextpvr: NextPVR PVR client addon for Kodi + optdepends = kodi-devel-pvr-njoy: Njoy N7 PVR client addon for Kodi + optdepends = kodi-devel-pvr-pctv: PCTV PVR client addon for Kodi + optdepends = kodi-devel-pvr-stalker: Stalker Middleware PVR client addon for Kodi + optdepends = kodi-devel-pvr-vbox: VBox TV Gateway PVR client addon for Kodi + optdepends = kodi-devel-pvr-vdr-vnsi: VDR VNSI PVR client addon for Kodi + optdepends = kodi-devel-pvr-vuplus: VuPlus PVR client addon for Kodi + optdepends = kodi-devel-pvr-wmc: Windows Media Center client PVR addon for Kodi + optdepends = libcec: Pulse-Eight USB-CEC adapter support optdepends = libnfs: NFS shares support optdepends = libplist: AirPlay support - optdepends = libcec: Pulse-Eight USB-CEC adapter support optdepends = lirc: Remote controller support + optdepends = lsb-release: log distro information in crashlog optdepends = pulseaudio: PulseAudio support optdepends = shairplay: AirPlay support optdepends = udisks: Automount external drives optdepends = unrar: Archives support optdepends = unzip: Archives support optdepends = upower: Display battery level - optdepends = xorg-xinit: kodi standalone provides = xbmc + provides = kodi conflicts = xbmc - replaces = xbmc-devel - source = kodi-14.0b1.tar.gz::https://github.com/xbmc/xbmc/archive/14.0b1-Helix.tar.gz - sha256sums = 49cc3a91fba54d2c06cc877dad51e3c1cada772c6cc129a558045ef281d6b3f2 + conflicts = xbmc-pulse + conflicts = xbmc-svn + conflicts = xbmc-git-xvba + conflicts = xbmc-git + conflicts = kodi + conflicts = kodi-git -pkgname = kodi-devel +pkgname = kodi-devel-eventclients + pkgdesc = Kodi Event Clients + depends = cwiid + conflicts = kodi-eventclients + conflicts = kodi-eventclients-devel + replaces = kodi-eventclients-devel diff --git a/0001-rsxs-gcc5-fix.patch b/0001-rsxs-gcc5-fix.patch new file mode 100644 index 000000000000..bdb82cacfa14 --- /dev/null +++ b/0001-rsxs-gcc5-fix.patch @@ -0,0 +1,40 @@ +From 2d792707c7ad60c598616183bd1e7c41382961c3 Mon Sep 17 00:00:00 2001 +From: Michael Cronenworth <mike@cchtml.com> +Date: Tue, 19 May 2015 16:43:36 -0500 +Subject: [PATCH] Always declare gnu89 inline standard + +GCC5 switches the minimum inline standard requirements from gnu89 to gnu11. +--- + xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h | 4 ---- + xbmc/screensavers/rsxs-0.9/lib/argp.h | 2 +- + 2 files changed, 1 insertion(+), 5 deletions(-) + +diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h +index ff4f575..92eda3b 100644 +--- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h ++++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h +@@ -198,11 +198,7 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); + #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 +diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp.h b/xbmc/screensavers/rsxs-0.9/lib/argp.h +index ae7fa04..c83c75e2 100644 +--- a/xbmc/screensavers/rsxs-0.9/lib/argp.h ++++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h +@@ -559,7 +559,7 @@ extern void *__argp_input (const struct argp *__restrict __argp, + # endif + + # ifndef ARGP_EI +-# define ARGP_EI extern __inline__ ++# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline)) + # endif + + ARGP_EI void @@ -1,74 +1,197 @@ -# Maintainer: Maxime Gauduin <alucryd@archlinux.org> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Brad Fanella <bradfanella@archlinux.us> -# Contributor: [vEX] <niechift.vex@gmail.com> -# Contributor: Zeqadious <zeqadious@gmail.com> -# Contributor: BlackIkeEagle <ike.devolder@gmail.com> -# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> - -pkgname=kodi-devel -pkgver=14.0b1 +# Maintainer: dhead666 <myfoolishgames@gmail.com> +# https://github.com/dhead666/archlinux-pkgbuilds +# +# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > +# Contributor: DonVla <donvla@users.sourceforge.net> +# Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de> +# Contributor: Ralf Barth <archlinux dot org at haggy dot org> +# Contributor: B & monty - Thanks for your hints :) +# +# Original credits go to Edgar Hucek <gimli at dark-green dot com> +# for his xbmc-vdpau-vdr PKGBUILD at https://archvdr.svn.sourceforge.net/svnroot/archvdr/trunk/archvdr/xbmc-vdpau-vdr/PKGBUILD +# +# The PKGBUILD includes easy ways to: +# 1) build from specific commit (without having to clone the whole repository) +# 2) test new features by adding a list of Github's PR numbers + +pkgbase=kodi-devel +pkgname=('kodi-devel' 'kodi-devel-eventclients') +_gitname=xbmc + +# when building specific commit: 1) pkgver=commit_sha 2) _gitver=$pkgver +pkgver=15.0b1 +#_gitver=$pkgver +_gitver=$pkgver-Isengard + +_pkgsrcname=$_gitname-$_gitver pkgrel=1 -pkgdesc='kodi Entertainment Center' arch=('i686' 'x86_64') -url='http://xbmc.org' -license=('GPL2') -depends=('bluez-libs' 'curl' 'glew' 'hicolor-icon-theme' 'lame' 'libass' - 'libbluray' 'libcdio' 'libmad' 'libmariadbclient' 'libmicrohttpd' - 'libmodplug' 'libmpeg2' 'libpulse' 'libsamplerate' 'libssh' 'libva' - 'libvdpau' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'python2-pillow' - 'rtmpdump' 'sdl_image' 'smbclient' 'taglib' 'tinyxml' 'xorg-xdpyinfo' - 'yajl') -makedepends=('afpfs-ng' 'boost' 'cmake' 'doxygen' 'git' 'gperf' 'jasper' - 'java-runtime' 'libcec' 'libnfs' 'libplist' 'nasm' 'shairplay' - 'swig' 'unzip' 'upower' 'zip') -optdepends=('afpfs-ng: Apple shares support' - 'libnfs: NFS shares support' - 'libplist: AirPlay support' - 'libcec: Pulse-Eight USB-CEC adapter support' - 'lirc: Remote controller support' - 'pulseaudio: PulseAudio support' - 'shairplay: AirPlay support' - 'udisks: Automount external drives' - 'unrar: Archives support' - 'unzip: Archives support' - 'upower: Display battery level' - 'xorg-xinit: kodi standalone') -replaces=('xbmc-devel') -provides=('xbmc') -conflicts=('xbmc') -install='kodi.install' -source=("kodi-$pkgver.tar.gz::https://github.com/xbmc/xbmc/archive/${pkgver}-Helix.tar.gz") -sha256sums=('49cc3a91fba54d2c06cc877dad51e3c1cada772c6cc129a558045ef281d6b3f2') +url="http://xbmc.org" +license=('GPL' 'LGPL') +groups=('kodi-devel') + +makedepends=( + 'afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen' 'git' 'glew' + 'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'lame' 'libaacs' 'libass' + 'libbluray' 'libcdio' 'libcec' 'libgl' 'libmariadbclient' 'libmicrohttpd' + 'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libsamplerate' 'libssh' + 'libva' 'libvdpau' 'libvorbis' 'libxrandr' 'libxslt' 'lzo' 'mesa' 'nasm' 'python2-pillow' + 'python2-simplejson' 'rtmpdump' 'sdl2' 'shairplay' 'smbclient' 'swig' 'taglib' + 'tinyxml' 'unzip' 'upower' 'xorg-xdpyinfo' 'yajl' 'zip' +) + +source=("https://github.com/xbmc/xbmc/archive/$_gitver.tar.gz" "0001-rsxs-gcc5-fix.patch") +sha256sums=( + '2075e80ea7193f69f5c87721c65b8439c4ed29389709d0ee6f5db52d0c3b33ad' + '96810302a15b215f4aea7854932a70ecd203bbe1730153cc6221ad20e69281bd') + +_prefix='/usr' prepare() { - cd xbmc-${pkgver}-Helix + msg "Starting make..." + + cd "${srcdir}/$_pkgsrcname" + + # test new features by adding Github PR numbers, e.g. prlist=('6615') + prlist=('') + if [[ $prlist != '' ]]; then + msg "Adding new features to test..." + for pr in $prlist; do + curl -o $srcdir/$pr.patch https://github.com/xbmc/xbmc/pull/$pr.patch + patch -p1 -i $srcdir/$pr.patch + done + fi find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" + 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 + # texturepacker cannot build statically + sed '/--enable-static/d' -i tools/depends/native/TexturePacker/Makefile + + # 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 + + patch -p1 -i "$srcdir/0001-rsxs-gcc5-fix.patch" } build() { - cd xbmc-${pkgver}-Helix + cd "${srcdir}/$_pkgsrcname" + + msg "Starting make..." - export PYTHON_VERSION='2' + # Configure Kodi + # + # Note on external-libs: + # - We cannot use external python because Arch's python was built with + # UCS2 unicode support, whereas kodi expects UCS4 support + # - According to an kodi dev using external/system ffmpeg with kodi is "pure stupid" :D + msg2 "Bootstrapping Kodi" ./bootstrap - ./configure \ - --prefix='/usr' \ - --exec-prefix='/usr' \ - --disable-non-free \ - --disable-debug \ - --disable-static + + #./configure --help + #return 1 + + msg2 "Configuring Kodi" + export PYTHON_VERSION=2 # external python v2 + ./configure --prefix=$_prefix --exec-prefix=$_prefix \ + --disable-optimizations \ + --enable-avahi \ + --enable-libbluray \ + --with-lirc-device=/run/lirc/lircd \ + ac_cv_lib_bluetooth_hci_devid=no \ + ac_cv_type__Bool=yes + + # Now (finally) build make } -package() { - cd xbmc-${pkgver}-Helix +package_kodi-devel() { + pkgdesc="Kodi Media Center monthly development releases" + provides=('xbmc' 'kodi') + conflicts=('xbmc' 'xbmc-pulse' 'xbmc-svn' 'xbmc-git-xvba' 'xbmc-git' 'kodi' 'kodi-git') + + depends=( + 'bluez-libs' 'curl' 'glew' 'hicolor-icon-theme' 'lame' 'libaacs' + 'libass' 'libbluray' 'libcdio' 'libmariadbclient' 'libmicrohttpd' 'libmodplug' + 'libmpeg2' 'libpulse' 'libsamplerate' 'libssh' 'libva' 'libvdpau' 'libvorbis' + 'libxrandr' 'libxslt' 'lzo' 'mesa' 'python2-pillow' 'python2-simplejson' + 'rtmpdump' 'sdl2' 'smbclient' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' + ) + + optdepends=( + 'gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED' + 'afpfs-ng: Apple shares support' + 'bluez: Blutooth support' + 'kodi-devel-audiodecoder-modplug: Modplug decoder addon for Kodi' + 'kodi-devel-audiodecoder-nosefart: Nosefart decoder addon for Kodi' + 'kodi-devel-audiodecoder-snesapu: SPC decoder addon for Kodi' + 'kodi-devel-audiodecoder-stsound: YM decoder addon for Kodi' + 'kodi-devel-audiodecoder-timidity: Timidity decoder addon for Kodi' + 'kodi-devel-audiodecoder-vgmstream: VGM decoder addon for Kodi' + 'kodi-devel-audioencoder-flac: Flac encoder addon for Kodi' + 'kodi-devel-audioencoder-lame: Lame MP3 encoder addon for Kodi' + 'kodi-devel-audioencoder-vorbis: Vorbis encoder addon for Kodi' + 'kodi-devel-audioencoder-wav: Wav encoder addon for Kodi' + 'kodi-devel-pvr-argustv: ARGUS TV PVR client addon for Kodi' + 'kodi-devel-pvr-demo: Demo PVR addon for Kodi' + 'kodi-devel-pvr-dvblink: DVBLink PVR client addon for Kodi' + 'kodi-devel-pvr-dvbviewer: DVBViewer PVR client addon for Kodi' + 'kodi-devel-pvr-filmon: Filmon client PVR addon for Kodi' + 'kodi-devel-pvr-hts: Tvheadend HTSP PVR client addon for Kodi' + 'kodi-devel-pvr-iptvsimple: IPTV Simple PVR client addon for Kodi' + 'kodi-devel-pvr-mediaportal-tvserver: MediaPortal PVR client addon for Kodi' + 'kodi-devel-pvr-mythtv: MythTV PVR client addon for Kodi' + 'kodi-devel-pvr-nextpvr: NextPVR PVR client addon for Kodi' + 'kodi-devel-pvr-njoy: Njoy N7 PVR client addon for Kodi' + 'kodi-devel-pvr-pctv: PCTV PVR client addon for Kodi' + 'kodi-devel-pvr-stalker: Stalker Middleware PVR client addon for Kodi' + 'kodi-devel-pvr-vbox: VBox TV Gateway PVR client addon for Kodi' + 'kodi-devel-pvr-vdr-vnsi: VDR VNSI PVR client addon for Kodi' + 'kodi-devel-pvr-vuplus: VuPlus PVR client addon for Kodi' + 'kodi-devel-pvr-wmc: Windows Media Center client PVR addon for Kodi' + 'libcec: Pulse-Eight USB-CEC adapter support' + 'libnfs: NFS shares support' + 'libplist: AirPlay support' + 'lirc: Remote controller support' + 'lsb-release: log distro information in crashlog' + 'pulseaudio: PulseAudio support' + 'shairplay: AirPlay support' + 'udisks: Automount external drives' + 'unrar: Archives support' + 'unzip: Archives support' + 'upower: Display battery level' + ) + install="$pkgname.install" - make DESTDIR="${pkgdir}" install - install -m 755 tools/TexturePacker/TexturePacker "${pkgdir}"/usr/lib/xbmc/ + cd $_pkgsrcname + msg2 "Running make install" + make DESTDIR="$pkgdir" install + + # Tools + msg2 "Tools" + install -Dm755 $srcdir/$_pkgsrcname/tools/TexturePacker/TexturePacker \ + ${pkgdir}${_prefix}/lib/kodi/ + + # Licenses + msg2 "Copy licenses" + install -dm755 ${pkgdir}${_prefix}/share/licenses/${pkgname} + for licensef in LICENSE.GPL copying.txt; do + mv ${pkgdir}${_prefix}/share/doc/kodi/${licensef} \ + ${pkgdir}${_prefix}/share/licenses/${pkgname} + done } -# vim: ts=2 sw=2 et: +package_kodi-devel-eventclients() { + pkgdesc="Kodi Event Clients" + depends=('cwiid') + conflicts=('kodi-eventclients' 'kodi-eventclients-devel') + replaces=('kodi-eventclients-devel') + + cd "$srcdir/$_pkgsrcname" + + make DESTDIR="$pkgdir" eventclients WII_EXTRA_OPTS=-DCWIID_OLD +} diff --git a/kodi-devel.install b/kodi-devel.install new file mode 100644 index 000000000000..06e9c8960372 --- /dev/null +++ b/kodi-devel.install @@ -0,0 +1,24 @@ +post_install() { + update_icons + update_autostart +} + +post_upgrade() { + update_icons + update_autostart +} + +post_remove() { + update_icons + update_autostart +} + +update_icons() { + type -p gtk-update-icon-cache > /dev/null 2>&1 && /usr/bin/gtk-update-icon-cache -qtf /usr/share/icons/hicolor + type -p update-desktop-database > /dev/null 2>&1 && /usr/bin/update-desktop-database -q /usr/share/applications + return 0 +} + +update_autostart() { + echo "To autostart Kodi standalone read: https://wiki.archlinux.org/index.php/Kodi#Autostarting_at_boot_or_ondemand" +} diff --git a/kodi.install b/kodi.install deleted file mode 100644 index 11027f6eaf68..000000000000 --- a/kodi.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -ftq usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: |