Update to r56286.588a38221d1-1

4 files changed, 25 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 713f5299e5e6..17895addf4bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r56200.71fc825a2d4
+	pkgver = r56286.588a38221d1
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -74,7 +74,7 @@ pkgbase = kodi-git
 	source = http://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/flatbuffers-1.11.0.tar.gz
 	source = http://mirrors.kodi.tv/build-deps/sources/spdlog-1.5.0.tar.gz
-	source = cpuinfo
+	source = cheat-sse-build.patch
 	b2sums = SKIP
 	b2sums = 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da
 	b2sums = 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355
@@ -85,7 +85,7 @@ pkgbase = kodi-git
 	b2sums = a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e
 	b2sums = 69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96
 	b2sums = bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28
-	b2sums = e384224db97c88f67cee733d1ea5b0d0a32c532e7931b323724842e4182485d20fc25dc9f419343afdeafab19185c546c329736765c084a95a02a52c9df92679
+	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
 
 pkgname = kodi-git
 	pkgdesc = A software media player and entertainment hub for digital media (master branch)
@@ -105,7 +105,7 @@ pkgname = kodi-git
 	optdepends = shairplay: AirPlay support
 	optdepends = upower: Display battery level
 	provides = xbmc
-	provides = kodi=r56200.71fc825a2d4
+	provides = kodi=r56286.588a38221d1
 	conflicts = xbmc
 	replaces = xbmc
 
@@ -133,7 +133,7 @@ pkgname = kodi-git-x11
 	depends = tinyxml
 	depends = kodi-git
 	provides = KODI-BIN
-	provides = kodi-x11=r56200.71fc825a2d4
+	provides = kodi-x11=r56286.588a38221d1
 	replaces = kodi-bin
 
 pkgname = kodi-git-wayland
@@ -160,7 +160,7 @@ pkgname = kodi-git-wayland
 	depends = waylandpp
 	depends = kodi-git
 	provides = KODI-BIN
-	provides = kodi-wayland=r56200.71fc825a2d4
+	provides = kodi-wayland=r56286.588a38221d1
 
 pkgname = kodi-git-gbm
 	pkgdesc = gbm kodi binary
@@ -186,12 +186,12 @@ pkgname = kodi-git-gbm
 	depends = tinyxml
 	depends = kodi-git
 	provides = KODI-BIN
-	provides = kodi-gbm=r56200.71fc825a2d4
+	provides = kodi-gbm=r56286.588a38221d1
 
 pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
 	optdepends = python: most eventclients are implemented in python
-	provides = kodi-eventclients=r56200.71fc825a2d4
+	provides = kodi-eventclients=r56286.588a38221d1
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -200,12 +200,12 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r56200.71fc825a2d4
+	provides = kodi-tools-texturepacker=r56286.588a38221d1
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
 	depends = kodi-git
-	provides = kodi-dev=r56200.71fc825a2d4
+	provides = kodi-dev=r56286.588a38221d1
 	conflicts = kodi-dev
 
diff --git a/PKGBUILD b/PKGBUILD
index d31e5f7c478c..21d75f615b5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,7 +21,7 @@ pkgname=(
   "$pkgbase" "$pkgbase-x11" "$pkgbase-wayland" "$pkgbase-gbm"
   "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev"
 )
-pkgver=r56200.71fc825a2d4
+pkgver=r56286.588a38221d1
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -75,7 +75,7 @@ source=(
   "http://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "http://mirrors.kodi.tv/build-deps/sources/spdlog-$_spdlog_version.tar.gz"
-  cpuinfo
+  cheat-sse-build.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -98,7 +98,7 @@ b2sums=('SKIP'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         '69024d77e6e7a5036e24729e337b17680dc3735cb1d209058a88b980989826fe56ff113c1177410106e0f70d827fa82603372277e3bc1aa4d12ffe5bb979af96'
         'bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28'
-        'e384224db97c88f67cee733d1ea5b0d0a32c532e7931b323724842e4182485d20fc25dc9f419343afdeafab19185c546c329736765c084a95a02a52c9df92679')
+        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
 
 pkgver() {
   cd "$_gitname"
@@ -115,12 +115,7 @@ prepare() {
 
   cd "$_gitname"
 
-  # detect if building in arch chroot using $pkgname rather than hard coding it into a patch
-  if [[ "$srcdir" =~ ^\/build.* ]]; then
-    local _find="exec_program(cat ARGS \"/proc/cpuinfo\" OUTPUT_VARIABLE CPUINFO)"
-    local _replace="exec_program(cat ARGS \"/build/$pkgname/src/cpuinfo\" OUTPUT_VARIABLE CPUINFO)"
-    sed -i s"|$_find|$_replace|" cmake/modules/FindSSE.cmake
-  fi
+  patch -p1 -i "$srcdir/cheat-sse-build.patch"
 }
 
 build() {
diff --git a/cheat-sse-build.patch b/cheat-sse-build.patch
new file mode 100644
index 000000000000..df356d0fdb4a
--- /dev/null
+++ b/cheat-sse-build.patch
@@ -0,0 +1,11 @@
+--- a/cmake/modules/FindSSE.cmake	2017-08-22 09:29:22.000000000 +0200
++++ b/cmake/modules/FindSSE.cmake	2018-01-06 19:36:32.716303559 +0100
+@@ -4,7 +4,7 @@
+ 
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+    if(CPU MATCHES "x86_64" OR CPU MATCHES "i.86")
+-     exec_program(cat ARGS "/proc/cpuinfo" OUTPUT_VARIABLE CPUINFO)
++     set(CPUINFO "sse sse2 pni ssse3 sse4_1 sse4_2 avx avx2")
+ 
+      string(REGEX REPLACE "^.*(sse).*$" "\\1" _SSE_THERE ${CPUINFO})
+      string(COMPARE EQUAL "sse" "${_SSE_THERE}" _SSE_TRUE)
diff --git a/cpuinfo b/cpuinfo
deleted file mode 100644
index b0884ec56743..000000000000
--- a/cpuinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-processor       : 1
-vendor_id       : KodiCheat
-model name      : KodiCheat SSE
-flags           : sse sse2 pni ssse3 sse4_1 sse4_2 avx avx2