Update to 18.0rc2-1

1 files changed, 117 insertions, 47 deletions

diff --git a/PKGBUILD b/PKGBUILD
index baa4be021c48..67640bb4e7aa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # vim:set ts=2 sw=2 et:
 # Maintainer:  Marcin (CTRL) Wieczorek <marcin@marcin.co>
+# Maintainer graysky <graysky AT archlinux DOT us>
+# 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: graysky <graysky AT archlinux DOT us>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 # Contributor: Ulf Winkelvos <ulf [at] winkelvos [dot] de>
 # Contributor: Ralf Barth <archlinux dot org at haggy dot org>
@@ -16,46 +17,120 @@
 # Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
 # Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: dhead666 <myfoolishgames@gmail.com>
-# Contributor: Maxime Gauduin <alucryd@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
 
 pkgbase=kodi-devel
 pkgname=('kodi-devel' 'kodi-devel-eventclients' 'kodi-devel-tools-texturepacker' 'kodi-devel-dev')
-_pkgname=kodi
-pkgver=18.0a1
-_codename=Leia
+pkgver=18.0rc2
 pkgrel=1
-arch=('i686' 'x86_64')
-url="https://github.com/xbmc/xbmc"
+_codename=Leia
+_tag="$pkgver-$_codename"
+# 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/
+#
+_rtype=Alpha
+_ffmpeg_version="4.0.3-$_codename-Beta"5
+_libdvdcss_version="1.4.2-$_codename-Beta"-5
+_libdvdnav_version="6.0.0-$_codename-$_rtype"-3
+_libdvdread_version="6.0.0-$_codename-$_rtype"-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' 'glew'
+  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' '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'
-  'shairplay' 'smbclient' 'swig' 'taglib' 'tinyxml' 'unzip' 'upower' 'yajl' 'zip'
-  'mesa' 'libcrossguid' 'fmt' 'rapidjson'
+  '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=("$_pkgname-$pkgver-$_codename.tar.gz::https://github.com/xbmc/xbmc/archive/$pkgver-$_codename.tar.gz")
-sha512sums=('2e1648ca9e9ddae8a723d1ac554091d03925bab095399ff8808d24c1264fb5f6c6398a8b29c28840085795a41907e9fce9dfb11ed9144f1ba5d9d42ad9cb1f4e')
+source=(
+  "${pkgbase%%-*}-$_tag.tar.gz::https://github.com/xbmc/xbmc/archive/$_tag.tar.gz"
+  "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"
+  'cheat-sse-build.patch'
+  'cpuinfo'
+)
+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=('17e95081680d8aaad1693518ebc9703b2402f2ca6fbff8614e53b19d6b922a37'
+            'f25559d4b803321483b28ac9b513671200bdc8e3531c02f0affdd622846a9c5e'
+            '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
+            '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
+            'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
+            '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44'
+            '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
+            'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
+            '5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3'
+            '304d4581ef024bdb302ed0f2dcdb9c8dea03f78ba30d2a52f4a0d1c8fc4feecd'
+            '27387e49043127f09c5ef0a931fffb864f5730e79629100a6e210b68a1b9f2c1')
 
 prepare() {
   [[ -d kodi-build ]] && rm -rf kodi-build
   mkdir kodi-build
+
+  cd "xbmc-$_tag"
+
+  # detect if building in arch chroot
+  if [[ "$srcdir" =~ ^\/build.* ]]; then
+    patch -Np1 -i "$srcdir/cheat-sse-build.patch"
+  fi
 }
 
 build() {
   cd kodi-build
-  cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+
+  ### 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 \
-    ../"xbmc-$pkgver-$_codename"
+    -DENABLE_INTERNAL_FFMPEG=ON \
+    -DENABLE_INTERNAL_FMT=ON \
+    -DENABLE_INTERNAL_CROSSGUID=ON \
+    -DENABLE_INTERNAL_FSTRCMP=ON \
+    -DENABLE_INTERNAL_FLATBUFFERS=ON \
+    -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-$_tag"
   make
   make preinstall
 }
@@ -64,13 +139,13 @@ build() {
 # components: kodi, kodi-bin
 
 package_kodi-devel() {
-  pkgdesc="A software media player and entertainment hub for digital media"
+  pkgdesc="Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media"
   depends=(
-    'python2-pillow' 'python2-simplejson' 'xorg-xdpyinfo' 'bluez-libs'
-    'fribidi' 'freetype2' 'glew' 'hicolor-icon-theme' 'libcdio' 'libjpeg-turbo'
-    'libmariadbclient' 'libmicrohttpd' 'libpulse' 'libssh' 'libva' 'libvdpau'
-    'libxrandr' 'libxslt' 'lzo' 'smbclient' 'taglib' 'tinyxml' 'yajl' 'mesa'
-    'desktop-file-utils'
+    'bluez-libs' 'desktop-file-utils' 'freetype2' 'fribidi'
+    'hicolor-icon-theme' 'libass' 'libcdio' 'libjpeg-turbo' 'libmariadbclient'
+    'libmicrohttpd' 'libpulse' 'libssh' 'libva' 'libvdpau' 'libxrandr' 'libcec'
+    'libxslt' 'lirc' 'lzo' 'mesa' 'python2-pillow' 'python2-simplejson' 'smbclient'
+    'speex' 'taglib' 'tinyxml' 'xorg-xdpyinfo' 'yajl' 'libbluray'
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
@@ -78,8 +153,6 @@ package_kodi-devel() {
     'python2-pybluez: Bluetooth support'
     'libnfs: NFS shares support'
     'libplist: AirPlay support'
-    'libcec: Pulse-Eight USB-CEC adapter support'
-    'lirc: Remote controller support'
     'lsb-release: log distro information in crashlog'
     'pulseaudio: PulseAudio support'
     'shairplay: AirPlay support'
@@ -87,9 +160,9 @@ package_kodi-devel() {
     'unzip: Archives support'
     'upower: Display battery level'
   )
-  provides=('xbmc' 'kodi')
-  conflicts=('xbmc' 'kodi')
-  replaces=('xbmc' 'kodi')
+  provides=("kodi=${pkgver}")
+  conflicts=('kodi' 'kodi-git' 'kodi-pre-release')
+  replaces=('kodi-pre-release')
 
   _components=(
   'kodi'
@@ -99,16 +172,9 @@ package_kodi-devel() {
   cd kodi-build
   # install eventclients
   for _cmp in ${_components[@]}; do
-    DESTDIR="$pkgdir" /usr/bin/cmake \
-      -DCMAKE_INSTALL_COMPONENT="$_cmp" \
-      -P cmake_install.cmake
-  done
-
-  # Licenses
-  install -dm755 "$pkgdir/usr/share/licenses/$_pkgname"
-  for licensef in LICENSE.GPL copying.txt; do
-    mv "$pkgdir/usr/share/doc/kodi/$licensef" \
-      "$pkgdir/usr/share/licenses/$_pkgname"
+  DESTDIR="$pkgdir" /usr/bin/cmake \
+    -DCMAKE_INSTALL_COMPONENT="$_cmp" \
+     -P cmake_install.cmake
   done
 
   # python2 is being used
@@ -117,19 +183,19 @@ package_kodi-devel() {
 }
 
 # 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-devel-eventclients() {
   pkgdesc="Kodi Event Clients"
-  conflicts=('kodi-eventclients')
-
-  depends=('cwiid')
+  provides=("kodi-eventclients=${pkgver}")
+  conflicts=('kodi-eventclients' 'kodi-pre-release-eventclients')
+  replaces=('kodi-pre-release-eventclients')
+  optdepends=('python2: most eventclients are implemented in python2')
 
   _components=(
     'kodi-eventclients-common'
     'kodi-eventclients-ps3'
-    'kodi-eventclients-wiiremote'
-    'kodi-eventclients-xbmc-send'
+    'kodi-eventclients-kodi-send'
   )
 
   cd kodi-build
@@ -150,8 +216,10 @@ package_kodi-devel-eventclients() {
 
 package_kodi-devel-tools-texturepacker() {
   pkgdesc="Kodi Texturepacker tool"
+  provides=("kodi-tools-texturepacker=${pkgver}")
+  conflicts=('kodi-tools-texturepacker' 'kodi-pre-release-tools-texturepacker')
+  replaces=('kodi-pre-release-tools-texturepacker')
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
-  conflicts=('kodi-tools-texturepacker')
 
   _components=(
     'kodi-tools-texturepacker'
@@ -171,8 +239,10 @@ package_kodi-devel-tools-texturepacker() {
 
 package_kodi-devel-dev() {
   pkgdesc="Kodi dev files"
+  provides=("kodi-dev=${pkgver}")
+  conflicts=('kodi-dev' 'kodi-pre-release-dev')
+  replaces=('kodi-pre-release-dev')
   depends=('kodi-devel')
-  conflicts=('kodi-dev')
 
   _components=(
     'kodi-addon-dev'