summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD6
2 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index edabe47285f7..ddf95dfd8826 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = kodi-matrix-git
- pkgver = r57313.40360ae2cea
+ pkgver = r57323.ee96ef349b6
pkgrel = 1
url = https://kodi.tv
arch = x86_64
@@ -127,7 +127,7 @@ pkgname = kodi-matrix-git-common
optdepends = python-pybluez: Bluetooth support
optdepends = pulseaudio: PulseAudio support
optdepends = upower: Display battery level
- provides = kodi-common=r57313.40360ae2cea
+ provides = kodi-common=r57323.ee96ef349b6
conflicts = kodi-common
replaces = kodi-common
@@ -135,7 +135,7 @@ pkgname = kodi-matrix-git-x11
pkgdesc = x11 kodi binary
depends = kodi-matrix-git-common
depends = libxrandr
- provides = kodi=r57313.40360ae2cea
+ provides = kodi=r57323.ee96ef349b6
replaces = kodi
pkgname = kodi-matrix-git-wayland
@@ -143,7 +143,7 @@ pkgname = kodi-matrix-git-wayland
depends = kodi-matrix-git-common
depends = libxkbcommon
depends = waylandpp
- provides = kodi=r57313.40360ae2cea
+ provides = kodi=r57323.ee96ef349b6
conflicts = kodi-wayland
replaces = kodi
@@ -152,7 +152,7 @@ pkgname = kodi-matrix-git-gbm
depends = kodi-matrix-git-common
depends = libxkbcommon
depends = libinput
- provides = kodi=r57313.40360ae2cea
+ provides = kodi=r57323.ee96ef349b6
conflicts = kodi-gbm
replaces = kodi
@@ -160,7 +160,7 @@ pkgname = kodi-matrix-git-eventclients
pkgdesc = Kodi Event Clients (Matrix branch)
optdepends = kodi: local machine eventclient use
optdepends = python: most eventclients are implemented in python
- provides = kodi-eventclients=r57313.40360ae2cea
+ provides = kodi-eventclients=r57323.ee96ef349b6
conflicts = kodi-eventclients
pkgname = kodi-matrix-git-tools-texturepacker
@@ -169,11 +169,11 @@ pkgname = kodi-matrix-git-tools-texturepacker
depends = giflib
depends = libjpeg-turbo
depends = lzo
- provides = kodi-tools-texturepacker=r57313.40360ae2cea
+ provides = kodi-tools-texturepacker=r57323.ee96ef349b6
conflicts = kodi-tools-texturepacker
pkgname = kodi-matrix-git-dev
pkgdesc = Kodi dev files (Matrix branch)
depends = kodi-matrix-git-common
- provides = kodi-dev=r57313.40360ae2cea
+ provides = kodi-dev=r57323.ee96ef349b6
conflicts = kodi-dev
diff --git a/PKGBUILD b/PKGBUILD
index 43c02b1e0d24..394b70bf5b6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ pkgname=(
"$pkgbase-common" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
"$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
)
-pkgver=r57313.40360ae2cea
+pkgver=r57323.ee96ef349b6
pkgrel=1
arch=('x86_64')
url="https://kodi.tv"
@@ -128,8 +128,10 @@ prepare() {
patch -p1 -i "$srcdir/0001-allow-separate-windowing-binaries-being-launched-fro.patch"
+ # [swig] fix illegal access warnings/errors with Java >= 9 #19891
+ git cherry-pick --no-commit -n bfb08a4a32e31349f7578efd2de78a8e394a2946
+
if [[ -n "$_clangbuild" ]]; then
- git cherry-pick --no-commit -n bfb08a4a32e31349f7578efd2de78a8e394a2946
git cherry-pick --no-commit -n f5512d575dfc872d51632c9bf79d58e39be60cfb
git cherry-pick --no-commit -n 94a934227b234bfbbe1e3cdfdb71dc7d39ac0e7a
git cherry-pick --no-commit -n e32eeb6a4897ea6ff7ac461b848e60f7794037c2