Add support for building with clang

2 files changed, 22 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90edea8b12aa..d1ee7331e96f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r57584.8cbbb961201
+	pkgver = r57879.9b7e77c70d6
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -127,7 +127,7 @@ pkgname = kodi-git-common
 	optdepends = python-pybluez: Bluetooth support
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = upower: Display battery level
-	provides = kodi-common=r57584.8cbbb961201
+	provides = kodi-common=r57879.9b7e77c70d6
 	conflicts = kodi-common
 	replaces = kodi-common
 
@@ -135,7 +135,7 @@ pkgname = kodi-git-x11
 	pkgdesc = x11 kodi binary
 	depends = kodi-git-common
 	depends = libxrandr
-	provides = kodi=r57584.8cbbb961201
+	provides = kodi=r57879.9b7e77c70d6
 	replaces = kodi
 
 pkgname = kodi-git-wayland
@@ -143,7 +143,7 @@ pkgname = kodi-git-wayland
 	depends = kodi-git-common
 	depends = libxkbcommon
 	depends = waylandpp
-	provides = kodi=r57584.8cbbb961201
+	provides = kodi=r57879.9b7e77c70d6
 	conflicts = kodi-wayland
 	replaces = kodi
 
@@ -152,7 +152,7 @@ pkgname = kodi-git-gbm
 	depends = kodi-git-common
 	depends = libxkbcommon
 	depends = libinput
-	provides = kodi=r57584.8cbbb961201
+	provides = kodi=r57879.9b7e77c70d6
 	conflicts = kodi-gbm
 	replaces = kodi
 
@@ -160,7 +160,7 @@ pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
 	optdepends = kodi: local machine eventclient use
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r57584.8cbbb961201
+	provides = kodi-eventclients=r57879.9b7e77c70d6
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -169,12 +169,11 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r57584.8cbbb961201
+	provides = kodi-tools-texturepacker=r57879.9b7e77c70d6
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git-common
-	provides = kodi-dev=r57584.8cbbb961201
+	provides = kodi-dev=r57879.9b7e77c70d6
 	conflicts = kodi-dev
-
diff --git a/PKGBUILD b/PKGBUILD
index 434dcb6f389e..68b0114c52f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,12 +17,15 @@
 # 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
 
+# set this to anything to build with clang rather than with gcc
+_clangbuild=
+
 pkgbase=kodi-git
 pkgname=(
   "$pkgbase-common" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
   "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
 )
-pkgver=r57584.8cbbb961201
+pkgver=r57879.9b7e77c70d6
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -41,6 +44,7 @@ makedepends=(
   # gbm
   'libinput'
 )
+[[ -n "$_clangbuild" ]] && makedepends+=('clang' 'lld' 'llvm')
 
 _gitname='xbmc'
 _sse_workaround=1
@@ -122,6 +126,12 @@ prepare() {
   [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
 
   patch -p1 -i "$srcdir/0001-allow-separate-windowing-binaries-being-launched-fro.patch"
+
+  if [[ -n "$_clangbuild" ]]; then
+    EMAIL="someone@somewhere.net" git pull --no-rebase origin pull/19892/head
+    msg "Building with clang"
+    export CC=clang CXX=clang++
+  fi
 }
 
 build() {
@@ -135,6 +145,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
     -DUSE_LTO=$(nproc)
+    -DVERBOSE=ON
     -DENABLE_LDGOLD=OFF
     -DENABLE_EVENTCLIENTS=ON
     -DENABLE_INTERNAL_FFMPEG=ON
@@ -183,6 +194,8 @@ package_kodi-git-common() {
     'python-pillow' 'python-pycryptodomex' 'python-simplejson'
     'shairplay' 'smbclient' 'sqlite' 'taglib' 'tinyxml'
   )
+  [[ -n "$_clangbuild" ]] && depends+=('glu')
+
   optdepends=(
     'afpfs-ng: Apple shares support'
     'bluez: Blutooth support'