Update to 18.0.r86.gfee377153ba-1

1 files changed, 164 insertions, 60 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 792e5dfbf0a1..fa6f914cc919 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,8 @@
-# Maintainer: Lenovsky <lenovsky@pm.me>
+# Maintainer graysky <graysky AT archlinux DOT us>
+# Contributor: Lenovsky <lenovsky@pm.me>
+# Contributor: M-Reimer <manuel.reimer AT gmx DOT de>
+# Contributor: Arthur Borsboom <arthurborsboom@gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
 # Contributor: DonVla <donvla@users.sourceforge.net>
 # Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de>
@@ -10,7 +14,7 @@
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Maxime Gauduin <alucryd@gmail.com>
+# Contributor: dhead666 <myfoolishgames@gmail.com>
 #
 # 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
@@ -18,42 +22,124 @@
 pkgbase=kodi-git
 pkgname=('kodi-git' 'kodi-eventclients-git' 'kodi-tools-texturepacker-git' 'kodi-dev-git')
 _gitname='xbmc'
-pkgver=18.0a3.r161.gfc9faf32d5f
+pkgver=18.0.r86.gfee377153ba
 pkgrel=1
-arch=('i686' 'x86_64')
+_codename=Leia
+# Found on their respective github release pages. One can check them against
+# what is pulled down when not specifying them in the cmake step.
+# $CHROOT/build/kodi-devel/src/kodi-build/build/download
+#
+# https://github.com/xbmc/FFmpeg/tags
+# https://github.com/xbmc/libdvdcss/tags
+# https://github.com/xbmc/libdvdnav/tags
+# https://github.com/xbmc/libdvdread/tags
+#
+# fmt and crossguid can be found http://mirrors.kodi.tv/build-deps/sources/
+#
+_ffmpeg_version="4.0.3-$_codename-RC5"
+_libdvdcss_version="1.4.2-$_codename-Beta-5"
+_libdvdnav_version="6.0.0-$_codename-Alpha-3"
+_libdvdread_version="6.0.0-$_codename-Alpha-3"
+_fmt_version="5.1.0"
+_crossguid_version="8f399e8bd4"
+_fstrcmp_version="0.7.D001"
+_flatbuffers_version="1.9.0"
+arch=('x86_64')
 url="http://kodi.tv"
 license=('GPL2')
-makedepends=('afpfs-ng' 'bluez-libs' 'boost' 'cmake' 'curl' 'cwiid' 'doxygen'
-             'git' 'ffmpeg' 'flatbuffers' 'fmt' 'glew' 'gperf' 'hicolor-icon-theme' 'jasper'
-             'java-runtime' 'libaacs' 'libass' 'libbluray' 'libcdio' 'libcec' 'libgl'
-             'libmariadbclient' 'libmicrohttpd' 'libmodplug' 'libmpeg2' 'libnfs' 'libplist'
-             'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm' 'nss-mdns' 'python2-pillow'
-             'python2-pybluez' 'python2-simplejson' 'rapidjson' 'rtmpdump' 'shairplay'
-             'smbclient' 'swig' 'taglib' 'tinyxml' 'upower')
-source=("$_gitname::git+https://github.com/xbmc/xbmc.git#branch=master")
-sha256sums=('SKIP')
+makedepends=(
+  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' 'glew' 'git'
+  'gperf' 'hicolor-icon-theme' 'jasper' 'java-runtime' 'libaacs' 'libass'
+  'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
+  'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libssh' 'libva'
+  'libvdpau' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm' 'nss-mdns'
+  'python2-pillow' 'python2-pybluez' 'python2-simplejson' 'rtmpdump'
+  'shairplay' 'smbclient' 'speex' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower'
+  'yajl' 'zip' 'git' 'giflib' 'rapidjson' 'ghostscript'
+)
+source=(
+  "git://github.com/xbmc/xbmc.git#branch=master"
+  "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz"
+  "libdvdcss-$_libdvdcss_version.tar.gz::https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version.tar.gz"
+  "libdvdnav-$_libdvdnav_version.tar.gz::https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version.tar.gz"
+  "libdvdread-$_libdvdread_version.tar.gz::https://github.com/xbmc/libdvdread/archive/$_libdvdread_version.tar.gz"
+  "http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz"
+  "http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz"
+  "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
+  "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
+  'cpuinfo'
+  '00-fix.building.with.mariadb.patch::https://github.com/wsnipex/xbmc/commit/cd20c8eb8a0394db1f028b118c4ca9b91b7e746a.patch'
+)
+noextract=(
+  "libdvdcss-$_libdvdcss_version.tar.gz"
+  "libdvdnav-$_libdvdnav_version.tar.gz"
+  "libdvdread-$_libdvdread_version.tar.gz"
+  "ffmpeg-$_ffmpeg_version.tar.gz"
+  "fmt-$_fmt_version.tar.gz"
+  "crossguid-$_crossguid_version.tar.gz"
+  "fstrcmp-$_fstrcmp_version.tar.gz"
+  "flatbuffers-$_flatbuffers_version.tar.gz"
+)
+sha256sums=('SKIP'
+            '9a971662e44353c120f2ccf87655571998956e699a2dd800ec708b8b928a53c8'
+            '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
+            '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
+            'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
+            '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44'
+            '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
+            'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
+            '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
+            '27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1'
+            '849daf1d5b081ef6d0e428bbc7d448799fc43a8ac9e79cd7513de0eb5a91b0bb')
 
 pkgver() {
-  cd "$srcdir/$_gitname"
+  cd "$_gitname"
   git describe --long --tags | sed 's/\([^-]*-\)/r/2;s/-/./g'
 }
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir kodi-build
+
+  cd "$_gitname"
+
+  # detect if building in arch chroot using $pkgname rather than hard coding it into a patch
+  if [[ "$srcdir" =~ ^\/build.* ]]; then
+    local _find="exec_program(cat ARGS \"/proc/cpuinfo\" OUTPUT_VARIABLE CPUINFO)"
+    local _replace="exec_program(cat ARGS \"/build/$pkgname/src/cpuinfo\" OUTPUT_VARIABLE CPUINFO)"
+    sed -i s"|$_find|$_replace|" cmake/modules/FindSSE.cmake
+  fi
+
+  patch -Np1 -i ../00-fix.building.with.mariadb.patch
 }
 
 build() {
-  cd "$_gitname"
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+  cd kodi-build
+
+  ### Optionally uncomment and setup to your liking
+  # export CFLAGS+=" -march=native"
+  # export CXXFLAGS="${CFLAGS}"
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DENABLE_EVENTCLIENTS=ON \
-    -DLIRC_DEVICE=/run/lirc/lircd \
-    -DENABLE_INTERNAL_FFMPEG="no" \
-    -DWITH_FFMPEG="yes" \
-    .
-  make VERBOSE=1
+    -DENABLE_INTERNAL_FFMPEG=ON \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DENABLE_INTERNAL_CROSSGUID=ON \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -DENABLE_MARIADBCLIENT=ON \
+    -DENABLE_MYSQLCLIENT=OFF \
+    -Dlibdvdcss_URL="$srcdir/libdvdcss-$_libdvdcss_version.tar.gz" \
+    -Dlibdvdnav_URL="$srcdir/libdvdnav-$_libdvdnav_version.tar.gz" \
+    -Dlibdvdread_URL="$srcdir/libdvdread-$_libdvdread_version.tar.gz" \
+    -DFFMPEG_URL="$srcdir/ffmpeg-$_ffmpeg_version.tar.gz" \
+    -DFMT_URL="$srcdir/fmt-$_fmt_version.tar.gz" \
+    -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
+    -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
+    -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
+    ../xbmc
+  make
   make preinstall
 }
 
@@ -62,34 +148,39 @@ build() {
 
 package_kodi-git() {
   pkgdesc="A software media player and entertainment hub for digital media (master branch)"
-  depends=('bluez-libs' 'desktop-file-utils' 'ffmpeg' 'fstrcmp' 'glew'
-           'hicolor-icon-theme' 'libcdio' 'libcec' 'libmariadbclient' 'libmicrohttpd'
-           'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'python2-pillow' 'python2-simplejson'
-           'smbclient' 'taglib' 'tinyxml' 'xorg-xdpyinfo')
-  optdepends=('gdb: for meaningful backtraces in case of trouble - STRONGLY RECOMMENDED'
-              'afpfs-ng: Apple shares support'
-              'bluez: Blutooth support'
-              'python2-pybluez: Bluetooth support'
-              'libnfs: NFS shares support'
-              'libplist: AirPlay support'
-              'lsb-release: log distro information in crashlog'
-              'pulseaudio: PulseAudio support'
-              'shairplay: AirPlay support'
-              'unrar: Archives support'
-              'unzip: Archives support'
-              'upower: Display battery level')
-  provides=("kodi=${pkgver}" "xbmc=${pkgver}")
-  conflicts=('kodi' 'xbmc')
-  replaces=('xbmc-git' 'xbmc-svn')
-
-  _components=('kodi' 'kodi-bin')
+  depends=(
+    'bluez-libs' 'curl' 'desktop-file-utils' 'freetype2' 'fribidi'
+    'hicolor-icon-theme' 'libass' 'libcdio' 'libjpeg-turbo' 'mariadb-libs'
+    'libmicrohttpd' 'libpulse' 'libssh' 'libva' 'libvdpau' 'libxrandr' 'libcec' 'libnfs'
+    'libxslt' 'lirc' 'lzo' 'mesa' 'python2-pillow' 'python2-simplejson' 'smbclient'
+    'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' 'libbluray'
+  )
+  optdepends=(
+    'afpfs-ng: Apple shares support'
+    'bluez: Blutooth support'
+    'python2-pybluez: Bluetooth support'
+    'libplist: AirPlay support'
+    'lsb-release: log distro information in crashlog'
+    'pulseaudio: PulseAudio support'
+    'shairplay: AirPlay support'
+    'unrar: Archives support'
+    'unzip: Archives support'
+    'upower: Display battery level'
+  )
+  provides=("kodi=${pkgver}")
+  conflicts=('kodi')
 
-  cd "$_gitname"
+  _components=(
+  'kodi'
+  'kodi-bin'
+  )
+
+  cd kodi-build
   # install eventclients
   for _cmp in ${_components[@]}; do
-    DESTDIR="$pkgdir" /usr/bin/cmake \
-      -DCMAKE_INSTALL_COMPONENT="$_cmp" \
-      -P cmake_install.cmake
+  DESTDIR="$pkgdir" /usr/bin/cmake \
+    -DCMAKE_INSTALL_COMPONENT="$_cmp" \
+     -P cmake_install.cmake
   done
 
   # python2 is being used
@@ -98,18 +189,21 @@ package_kodi-git() {
 }
 
 # kodi-eventclients
-# components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-wiiremote kodi-eventclients-xbmc-send
+# components: kodi-eventclients-common kodi-eventclients-ps3 kodi-eventclients-wiiremote kodi-eventclients-kodi-send
 
 package_kodi-eventclients-git() {
   pkgdesc="Kodi Event Clients (master branch)"
   provides=("kodi-eventclients=${pkgver}")
   conflicts=('kodi-eventclients')
-  depends=('cwiid')
+  optdepends=('python2: most eventclients are implemented in python2')
 
-  _components=('kodi-eventclients-common' 'kodi-eventclients-ps3' 'kodi-eventclients-wiiremote'
-               'kodi-eventclients-xbmc-send')
+  _components=(
+    'kodi-eventclients-common'
+    'kodi-eventclients-ps3'
+    'kodi-eventclients-kodi-send'
+  )
 
-  cd "$_gitname"
+  cd kodi-build
   # install eventclients
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -129,11 +223,13 @@ package_kodi-tools-texturepacker-git() {
   pkgdesc="Kodi Texturepacker tool (master branch)"
   provides=("kodi-tools-texturepacker=${pkgver}")
   conflicts=('kodi-tools-texturepacker')
-  depends=('giflib' 'libjpeg-turbo' 'libpng' 'lzo')
+  depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
 
-  _components=('kodi-tools-texturepacker')
+  _components=(
+    'kodi-tools-texturepacker'
+  )
 
-  cd "$_gitname"
+  cd kodi-build
   # install eventclients
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -149,13 +245,21 @@ package_kodi-dev-git() {
   pkgdesc="Kodi dev files (master branch)"
   provides=("kodi-dev=${pkgver}")
   conflicts=('kodi-dev')
-  depends=('kodi')
+  depends=('kodi-git')
 
-  _components=('kodi-addon-dev' 'kodi-audio-dev' 'kodi-eventclients-dev' 'kodi-game-dev'
-               'kodi-inputstream-dev' 'kodi-peripheral-dev' 'kodi-pvr-dev' 'kodi-screensaver-dev'
-               'kodi-visualization-dev')
+  _components=(
+    'kodi-addon-dev'
+    'kodi-audio-dev'
+    'kodi-eventclients-dev'
+    'kodi-game-dev'
+    'kodi-inputstream-dev'
+    'kodi-peripheral-dev'
+    'kodi-pvr-dev'
+    'kodi-screensaver-dev'
+    'kodi-visualization-dev'
+  )
 
-  cd "$_gitname"
+  cd kodi-build
   # install eventclients
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \