summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorgraysky2021-06-20 13:00:27 -0400
committergraysky2021-06-20 13:00:27 -0400
commit1e7cb2ef0578131402cb44c66b89d6906a8c92c0 (patch)
tree775cfb83bc19b862867a255cbf951570aa81fee4
parent98de1bdbb714f70400921467c369caa3082ce898 (diff)
downloadaur-1e7cb2ef0578131402cb44c66b89d6906a8c92c0.tar.gz
Update to r57875.f14affe3ac9-1
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD8
2 files changed, 16 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d1ee7331e96f..d80d138077a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = kodi-git
- pkgver = r57879.9b7e77c70d6
+ pkgver = r57875.f14affe3ac9
pkgrel = 1
url = https://kodi.tv
arch = x86_64
@@ -56,6 +56,9 @@ pkgbase = kodi-git
makedepends = waylandpp
makedepends = libxkbcommon
makedepends = libinput
+ makedepends = clang
+ makedepends = lld
+ makedepends = llvm
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
@@ -127,7 +130,7 @@ pkgname = kodi-git-common
optdepends = python-pybluez: Bluetooth support
optdepends = pulseaudio: PulseAudio support
optdepends = upower: Display battery level
- provides = kodi-common=r57879.9b7e77c70d6
+ provides = kodi-common=r57875.f14affe3ac9
conflicts = kodi-common
replaces = kodi-common
@@ -135,7 +138,7 @@ pkgname = kodi-git-x11
pkgdesc = x11 kodi binary
depends = kodi-git-common
depends = libxrandr
- provides = kodi=r57879.9b7e77c70d6
+ provides = kodi=r57875.f14affe3ac9
replaces = kodi
pkgname = kodi-git-wayland
@@ -143,7 +146,7 @@ pkgname = kodi-git-wayland
depends = kodi-git-common
depends = libxkbcommon
depends = waylandpp
- provides = kodi=r57879.9b7e77c70d6
+ provides = kodi=r57875.f14affe3ac9
conflicts = kodi-wayland
replaces = kodi
@@ -152,7 +155,7 @@ pkgname = kodi-git-gbm
depends = kodi-git-common
depends = libxkbcommon
depends = libinput
- provides = kodi=r57879.9b7e77c70d6
+ provides = kodi=r57875.f14affe3ac9
conflicts = kodi-gbm
replaces = kodi
@@ -160,7 +163,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=r57879.9b7e77c70d6
+ provides = kodi-eventclients=r57875.f14affe3ac9
conflicts = kodi-eventclients
pkgname = kodi-git-tools-texturepacker
@@ -169,11 +172,11 @@ pkgname = kodi-git-tools-texturepacker
depends = giflib
depends = libjpeg-turbo
depends = lzo
- provides = kodi-tools-texturepacker=r57879.9b7e77c70d6
+ provides = kodi-tools-texturepacker=r57875.f14affe3ac9
conflicts = kodi-tools-texturepacker
pkgname = kodi-git-dev
pkgdesc = Kodi dev files (master branch)
depends = kodi-git-common
- provides = kodi-dev=r57879.9b7e77c70d6
+ provides = kodi-dev=r57875.f14affe3ac9
conflicts = kodi-dev
diff --git a/PKGBUILD b/PKGBUILD
index 68b0114c52f2..d8b62e08a1b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,14 +18,14 @@
# 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=
+_clangbuild=1
pkgbase=kodi-git
pkgname=(
"$pkgbase-common" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
"$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
)
-pkgver=r57879.9b7e77c70d6
+pkgver=r57875.f14affe3ac9
pkgrel=1
arch=('x86_64')
url="https://kodi.tv"
@@ -128,7 +128,9 @@ prepare() {
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
+ git cherry-pick --no-commit -n f5512d575dfc872d51632c9bf79d58e39be60cfb
+ git cherry-pick --no-commit -n 94a934227b234bfbbe1e3cdfdb71dc7d39ac0e7a
+ git cherry-pick --no-commit -n e32eeb6a4897ea6ff7ac461b848e60f7794037c2
msg "Building with clang"
export CC=clang CXX=clang++
fi