Update to 18.3rc1pre4-2

2 files changed, 248 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 641b374af862..0a050a32a05b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Apr 27 10:03:53 UTC 2019
+# Sun Apr 28 22:16:00 UTC 2019
 pkgbase = kodi-devel
 	pkgver = 18.3rc1pre4
-	pkgrel = 1
-	url = http://kodi.tv
+	pkgrel = 2
+	url = https://kodi.tv
 	arch = x86_64
 	license = GPL2
 	makedepends = afpfs-ng
@@ -12,10 +12,8 @@ pkgbase = kodi-devel
 	makedepends = curl
 	makedepends = doxygen
 	makedepends = glew
-	makedepends = git
 	makedepends = gperf
 	makedepends = hicolor-icon-theme
-	makedepends = jasper
 	makedepends = java-runtime
 	makedepends = libaacs
 	makedepends = libass
@@ -30,7 +28,6 @@ pkgbase = kodi-devel
 	makedepends = libnfs
 	makedepends = libplist
 	makedepends = libpulse
-	makedepends = libssh
 	makedepends = libva
 	makedepends = libvdpau
 	makedepends = libxrandr
@@ -39,25 +36,24 @@ pkgbase = kodi-devel
 	makedepends = lzo
 	makedepends = mesa
 	makedepends = nasm
-	makedepends = nss-mdns
+	makedepends = python2-pycryptodome
 	makedepends = python2-pillow
 	makedepends = python2-pybluez
 	makedepends = python2-simplejson
-	makedepends = rtmpdump
 	makedepends = shairplay
 	makedepends = smbclient
-	makedepends = speex
-	makedepends = swig
 	makedepends = taglib
 	makedepends = tinyxml
-	makedepends = unzip
+	makedepends = swig
 	makedepends = upower
-	makedepends = yajl
-	makedepends = zip
-	makedepends = git
 	makedepends = giflib
 	makedepends = rapidjson
 	makedepends = ghostscript
+	makedepends = git
+	makedepends = wayland-protocols
+	makedepends = waylandpp
+	makedepends = libxkbcommon
+	makedepends = libinput
 	noextract = libdvdcss-1.4.2-Leia-Beta-5.tar.gz
 	noextract = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
 	noextract = libdvdread-6.0.0-Leia-Alpha-3.tar.gz
@@ -67,10 +63,10 @@ pkgbase = kodi-devel
 	noextract = fstrcmp-0.7.D001.tar.gz
 	noextract = flatbuffers-1.9.0.tar.gz
 	source = kodi-18.2-Leia.tar.gz::https://github.com/xbmc/xbmc/archive/18.2-Leia.tar.gz
-	source = ffmpeg-4.0.3-Leia-18.2.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.0.3-Leia-18.2.tar.gz
 	source = libdvdcss-1.4.2-Leia-Beta-5.tar.gz::https://github.com/xbmc/libdvdcss/archive/1.4.2-Leia-Beta-5.tar.gz
 	source = libdvdnav-6.0.0-Leia-Alpha-3.tar.gz::https://github.com/xbmc/libdvdnav/archive/6.0.0-Leia-Alpha-3.tar.gz
 	source = libdvdread-6.0.0-Leia-Alpha-3.tar.gz::https://github.com/xbmc/libdvdread/archive/6.0.0-Leia-Alpha-3.tar.gz
+	source = ffmpeg-4.0.3-Leia-18.2.tar.gz::https://github.com/xbmc/FFmpeg/archive/4.0.3-Leia-18.2.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/fmt-5.1.0.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/crossguid-8f399e8bd4.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
@@ -82,10 +78,10 @@ pkgbase = kodi-devel
 	source = 003-PR15974.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15974.patch
 	source = 004-PR15978.patch::https://patch-diff.githubusercontent.com/raw/xbmc/xbmc/pull/15978.patch
 	sha256sums = 07b8cffc396473523a51354dc95dfffb54a6a456b82cda7ad67dc2c052d99f64
-	sha256sums = 68535cc2a000946b62ce4be6edf7dda7900bd524f22bcb826800b94f4a873314
 	sha256sums = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
 	sha256sums = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
 	sha256sums = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf
+	sha256sums = 68535cc2a000946b62ce4be6edf7dda7900bd524f22bcb826800b94f4a873314
 	sha256sums = 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44
 	sha256sums = 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10
 	sha256sums = e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476
@@ -99,57 +95,104 @@ pkgbase = kodi-devel
 
 pkgname = kodi-devel
 	pkgdesc = Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media
-	depends = bluez-libs
-	depends = curl
 	depends = desktop-file-utils
-	depends = freetype2
-	depends = fribidi
 	depends = hicolor-icon-theme
+	depends = mesa
+	depends = python2-pycryptodome
+	depends = python2-pillow
+	depends = python2-simplejson
+	depends = xorg-xdpyinfo
+	depends = kodi-devel-bin
+	optdepends = afpfs-ng: Apple shares support
+	optdepends = bluez: Blutooth support
+	optdepends = python2-pybluez: Bluetooth support
+	optdepends = libplist: AirPlay support
+	optdepends = pulseaudio: PulseAudio support
+	optdepends = shairplay: AirPlay support
+	optdepends = upower: Display battery level
+	provides = xbmc
+	conflicts = xbmc
+	replaces = xbmc
+
+pkgname = kodi-devel-bin
+	pkgdesc = x11 kodi binary
+	depends = bluez-libs
+	depends = curl
+	depends = lcms2
 	depends = libass
+	depends = libbluray
 	depends = libcdio
-	depends = libjpeg-turbo
-	depends = mariadb-libs
+	depends = libcec
 	depends = libmicrohttpd
+	depends = libnfs
 	depends = libpulse
-	depends = libssh
 	depends = libva
 	depends = libvdpau
 	depends = libxrandr
+	depends = libxslt
+	depends = lirc
+	depends = mariadb-libs
+	depends = python2
+	depends = smbclient
+	depends = taglib
+	depends = tinyxml
+	depends = kodi-devel
+
+pkgname = kodi-devel-wayland
+	pkgdesc = wayland kodi binary
+	depends = bluez-libs
+	depends = curl
+	depends = lcms2
+	depends = libass
+	depends = libbluray
+	depends = libcdio
 	depends = libcec
+	depends = libmicrohttpd
 	depends = libnfs
+	depends = libpulse
+	depends = libva
+	depends = libxkbcommon
 	depends = libxslt
 	depends = lirc
-	depends = lzo
-	depends = mesa
-	depends = python2-pillow
-	depends = python2-simplejson
+	depends = mariadb-libs
+	depends = python2
 	depends = smbclient
-	depends = speex
 	depends = taglib
 	depends = tinyxml
-	depends = xorg-xdpyinfo
-	depends = yajl
+	depends = waylandpp
+	depends = kodi-devel
+	provides = kodi-devel-bin
+
+pkgname = kodi-devel-gbm
+	pkgdesc = gbm kodi binary
+	depends = bluez-libs
+	depends = curl
+	depends = lcms2
+	depends = libass
 	depends = libbluray
-	optdepends = afpfs-ng: Apple shares support
-	optdepends = bluez: Blutooth support
-	optdepends = python2-pybluez: Bluetooth support
-	optdepends = libplist: AirPlay support
-	optdepends = lsb-release: log distro information in crashlog
-	optdepends = pulseaudio: PulseAudio support
-	optdepends = shairplay: AirPlay support
-	optdepends = unrar: Archives support
-	optdepends = unzip: Archives support
-	optdepends = upower: Display battery level
-	provides = kodi=18.3rc1pre4
-	conflicts = kodi
-	replaces = kodi-pre-release
+	depends = libcdio
+	depends = libcec
+	depends = libinput
+	depends = libmicrohttpd
+	depends = libnfs
+	depends = libpulse
+	depends = libva
+	depends = libxkbcommon
+	depends = libxslt
+	depends = lirc
+	depends = mariadb-libs
+	depends = python2
+	depends = smbclient
+	depends = taglib
+	depends = tinyxml
+	depends = kodi-devel
+	provides = kodi-devel-bin
 
 pkgname = kodi-devel-eventclients
 	pkgdesc = Kodi Event Clients
 	optdepends = python2: most eventclients are implemented in python2
 	provides = kodi-eventclients=18.3rc1pre4
 	conflicts = kodi-eventclients
-	replaces = kodi-pre-release-eventclients
 
 pkgname = kodi-devel-tools-texturepacker
 	pkgdesc = Kodi Texturepacker tool
@@ -159,7 +202,6 @@ pkgname = kodi-devel-tools-texturepacker
 	depends = lzo
 	provides = kodi-tools-texturepacker=18.3rc1pre4
 	conflicts = kodi-tools-texturepacker
-	replaces = kodi-pre-release-tools-texturepacker
 
 pkgname = kodi-devel-dev
 	pkgdesc = Kodi dev files
@@ -167,5 +209,4 @@ pkgname = kodi-devel-dev
 	provides = kodi-dev=18.3rc1pre4
 	conflicts = kodi-dev
 	conflicts = kodi-pre-release-dev
-	replaces = kodi-pre-release-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index b77e92d23479..114e7f9e69a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,48 @@
 # 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: 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 :)
-# Contributor: Maxime Gauduin <alucryd@archlinux.org>
 # Contributor: marzoul
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # 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-devel' 'kodi-devel-bin' 'kodi-devel-wayland' 'kodi-devel-gbm'
+  'kodi-devel-eventclients' 'kodi-devel-tools-texturepacker' 'kodi-devel-dev'
+)
 pkgver=18.3rc1pre4
 _major=18.2
-pkgrel=1
+pkgrel=2
+arch=('x86_64')
+url="https://kodi.tv"
+license=('GPL2')
+makedepends=(
+  'afpfs-ng' 'bluez-libs' 'cmake' 'curl' 'doxygen' 'glew'
+  'gperf' 'hicolor-icon-theme' 'java-runtime' 'libaacs' 'libass'
+  'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
+  'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
+  'libvdpau' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
+  'python2-pycryptodome' 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
+  'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
+  'upower' 'giflib' 'rapidjson' 'ghostscript' 'git'
+  # wayland
+  'wayland-protocols' 'waylandpp' 'libxkbcommon'
+  # gbm
+  'libinput'
+)
+
 _codename=Leia
 #_tag="$pkgver-$_codename"
 _tag="$_major-$_codename"
@@ -40,33 +57,21 @@ _tag="$_major-$_codename"
 #
 # fmt and crossguid can be found http://mirrors.kodi.tv/build-deps/sources/
 #
-_ffmpeg_version="4.0.3-$_codename-18.2"
 _libdvdcss_version="1.4.2-$_codename-Beta-5"
 _libdvdnav_version="6.0.0-$_codename-Alpha-3"
 _libdvdread_version="6.0.0-$_codename-Alpha-3"
+_ffmpeg_version="4.0.3-$_codename-18.2"
 _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' '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=(
   "${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"
+  "ffmpeg-$_ffmpeg_version.tar.gz::https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_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"
@@ -89,10 +94,10 @@ noextract=(
   "flatbuffers-$_flatbuffers_version.tar.gz"
 )
 sha256sums=('07b8cffc396473523a51354dc95dfffb54a6a456b82cda7ad67dc2c052d99f64'
-            '68535cc2a000946b62ce4be6edf7dda7900bd524f22bcb826800b94f4a873314'
             '38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d'
             '071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a'
             'a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf'
+            '68535cc2a000946b62ce4be6edf7dda7900bd524f22bcb826800b94f4a873314'
             '73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44'
             '3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10'
             'e4018e850f80700acee8da296e56e15b1eef711ab15157e542e7d7e1237c3476'
@@ -105,8 +110,12 @@ sha256sums=('07b8cffc396473523a51354dc95dfffb54a6a456b82cda7ad67dc2c052d99f64'
             '779caa109dafade71f3b67b1b4c80af364fcccd148e8ee3d09b79270941f27de')
 
 prepare() {
-  [[ -d kodi-build ]] && rm -rf kodi-build
-  mkdir kodi-build
+  [[ -d kodi-build-x11 ]] && rm -rf kodi-build-x11
+  mkdir kodi-build-x11
+  [[ -d kodi-build-wayland ]] && rm -rf kodi-build-wayland
+  mkdir kodi-build-wayland
+  [[ -d kodi-build-gbm ]] && rm -rf kodi-build-gbm
+  mkdir kodi-build-gbm
 
   cd "xbmc-$_tag"
 
@@ -138,12 +147,12 @@ prepare() {
 }
 
 build() {
-  cd kodi-build
-
   ### Optionally uncomment and setup to your liking
   # export CFLAGS+=" -march=native"
   # export CXXFLAGS="${CFLAGS}"
 
+  msg2 "building kodi-x11"
+  cd "$srcdir/kodi-build-x11"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DENABLE_EVENTCLIENTS=ON \
@@ -152,8 +161,30 @@ build() {
     -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" \
     -DENABLE_MARIADBCLIENT=ON \
     -DENABLE_MYSQLCLIENT=OFF \
+    ../"xbmc-$_tag"
+  make
+  make preinstall
+
+  msg2 "building kodi-wayland"
+  cd "$srcdir/kodi-build-wayland"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DENABLE_EVENTCLIENTS=ON \
+    -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" \
@@ -162,45 +193,66 @@ build() {
     -DCROSSGUID_URL="$srcdir/crossguid-$_crossguid_version.tar.gz" \
     -DFSTRCMP_URL="$srcdir/fstrcmp-$_fstrcmp_version.tar.gz" \
     -DFLATBUFFERS_URL="$srcdir/flatbuffers-$_flatbuffers_version.tar.gz" \
+    -DCORE_PLATFORM_NAME=wayland \
+    -DWAYLAND_RENDER_SYSTEM=gl \
+    ../"xbmc-$_tag"
+  make
+  make preinstall
+
+  msg2 "building kodi-gbm"
+  cd "$srcdir/kodi-build-gbm"
+  cmake -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DENABLE_EVENTCLIENTS=ON \
+    -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" \
+    -DCORE_PLATFORM_NAME=gbm \
+    -DGBM_RENDER_SYSTEM=gles \
     ../"xbmc-$_tag"
   make
   make preinstall
 }
 
 # kodi
-# components: kodi, kodi-bin
+# components: kodi
 
 package_kodi-devel() {
   pkgdesc="Alpha, Beta, or RC versions of the software media player and entertainment hub for digital media"
   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'
+    'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodome'
+    'python2-pillow' 'python2-simplejson' 'xorg-xdpyinfo'
+    'kodi-devel-bin'
   )
   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')
-  replaces=('kodi-pre-release')
+  provides=('xbmc')
+  conflicts=('xbmc')
+  replaces=('xbmc')
 
   _components=(
-  'kodi'
-  'kodi-bin'
+    'kodi'
+    'kodi-bin'
   )
 
-  cd kodi-build
+  cd kodi-build-x11
   # install eventclients
   for _cmp in ${_components[@]}; do
   DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -210,7 +262,62 @@ package_kodi-devel() {
 
   # python2 is being used
   cd "$pkgdir"
-  grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
+  grep -lR '#!.*python' * | \
+    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
+
+  # remove x11 binaries
+  rm "$pkgdir/usr/lib/kodi/"{kodi-x11,kodi-xrandr}
+}
+
+# kodi-x11
+# components: kodi-bin
+
+package_kodi-devel-bin() {
+  pkgdesc="x11 kodi binary"
+  depends=(
+    'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
+    'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr'
+    'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
+    'tinyxml' 'kodi-devel'
+  )
+
+  cd kodi-build-x11
+  install -Dm755 kodi-x11 "$pkgdir/usr/lib/kodi/kodi-x11"
+  install -Dm755 kodi-xrandr "$pkgdir/usr/lib/kodi/kodi-xrandr"
+}
+
+# kodi-wayland
+# components: kodi-bin
+
+package_kodi-devel-wayland() {
+  pkgdesc="wayland kodi binary"
+  provides=('kodi-devel-bin')
+  depends=(
+    'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
+    'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
+    'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib' 'tinyxml'
+    'waylandpp' 'kodi-devel'
+  )
+
+  cd kodi-build-wayland
+  install -Dm755 kodi-wayland "$pkgdir/usr/lib/kodi/kodi-wayland"
+}
+
+# kodi-gbm
+# components: kodi-bin
+
+package_kodi-devel-gbm() {
+  pkgdesc="gbm kodi binary"
+  provides=('kodi-devel-bin')
+  depends=(
+    'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
+    'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'
+    'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
+    'tinyxml' 'kodi-devel'
+  )
+
+  cd kodi-build-gbm
+  install -Dm755 kodi-gbm "$pkgdir/usr/lib/kodi/kodi-gbm"
 }
 
 # kodi-eventclients
@@ -220,7 +327,6 @@ package_kodi-devel-eventclients() {
   pkgdesc="Kodi Event Clients"
   provides=("kodi-eventclients=${pkgver}")
   conflicts=('kodi-eventclients')
-  replaces=('kodi-pre-release-eventclients')
   optdepends=('python2: most eventclients are implemented in python2')
 
   _components=(
@@ -229,7 +335,7 @@ package_kodi-devel-eventclients() {
     'kodi-eventclients-kodi-send'
   )
 
-  cd kodi-build
+  cd kodi-build-x11
   # install eventclients
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -239,7 +345,8 @@ package_kodi-devel-eventclients() {
 
   # python2 is being used
   cd "$pkgdir"
-  grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
+  grep -lR '#!.*python' * | \
+    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }
 
 # kodi-tools-texturepacker
@@ -249,14 +356,13 @@ package_kodi-devel-tools-texturepacker() {
   pkgdesc="Kodi Texturepacker tool"
   provides=("kodi-tools-texturepacker=${pkgver}")
   conflicts=('kodi-tools-texturepacker')
-  replaces=('kodi-pre-release-tools-texturepacker')
   depends=('libpng' 'giflib' 'libjpeg-turbo' 'lzo')
 
   _components=(
     'kodi-tools-texturepacker'
   )
 
-  cd kodi-build
+  cd kodi-build-x11
   # install eventclients
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -266,14 +372,15 @@ package_kodi-devel-tools-texturepacker() {
 }
 
 # kodi-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
+# 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
 
 package_kodi-devel-dev() {
   pkgdesc="Kodi dev files"
+  depends=('kodi-devel')
   provides=("kodi-dev=${pkgver}")
   conflicts=('kodi-dev' 'kodi-pre-release-dev')
-  replaces=('kodi-pre-release-dev')
-  depends=('kodi-devel')
 
   _components=(
     'kodi-addon-dev'
@@ -287,7 +394,7 @@ package_kodi-devel-dev() {
     'kodi-visualization-dev'
   )
 
-  cd kodi-build
+  cd kodi-build-x11
   # install eventclients
   for _cmp in ${_components[@]}; do
     DESTDIR="$pkgdir" /usr/bin/cmake \
@@ -297,5 +404,6 @@ package_kodi-devel-dev() {
 
   # python2 is being used
   cd "$pkgdir"
-  grep -lR '#!.*python' * | while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
+  grep -lR '#!.*python' * | \
+    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }