Update to r65149.811c25b3cc3-1

3 files changed, 12 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fdf23b78f723..b1be9ac28682 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = kodi-git
-	pkgver = r64774.7eebcfa3056
+	pkgver = r65149.811c25b3cc3
 	pkgrel = 1
 	url = https://kodi.tv
 	arch = x86_64
@@ -81,7 +81,6 @@ pkgbase = kodi-git
 	source = https://mirrors.kodi.tv/build-deps/sources/fstrcmp-0.7.D001.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/flatbuffers-23.3.3.tar.gz
 	source = https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-	source = cheat-sse-build.patch
 	b2sums = SKIP
 	b2sums = 2f503d3ab767094958f7ec10b4ad11ffd02665deee571c8f3c739bef5fc7e2ff84babc5a3fdee638dc095f896b72fe3ce65e6b688674cb5f7b7b77190992688c
 	b2sums = db4d05836d8fbb3637ae50bdbfc0e4b612ee6b3be24addfea94ce772c3bf28d58b63a3f252d6f9f016f72f8cbb841cc1820b091226b136f4c4664385a32da73c
@@ -91,7 +90,6 @@ pkgbase = kodi-git
 	b2sums = a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e
 	b2sums = be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66
 	b2sums = 1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61
-	b2sums = 6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0
 
 pkgname = kodi-git
 	pkgdesc = A software media player and entertainment hub for digital media (master branch, gles renderer)
@@ -141,7 +139,7 @@ pkgname = kodi-git
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = pipewire: PipeWire support
 	optdepends = upower: Display battery level
-	provides = kodi-common=r64774.7eebcfa3056
+	provides = kodi-common=r65149.811c25b3cc3
 	provides = kodi-x11
 	provides = kodi-wayland
 	provides = kodi-gbm
@@ -154,7 +152,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=r64774.7eebcfa3056
+	provides = kodi-eventclients=r65149.811c25b3cc3
 	conflicts = kodi-eventclients
 
 pkgname = kodi-git-tools-texturepacker
@@ -163,10 +161,10 @@ pkgname = kodi-git-tools-texturepacker
 	depends = giflib
 	depends = libjpeg-turbo
 	depends = lzo
-	provides = kodi-tools-texturepacker=r64774.7eebcfa3056
+	provides = kodi-tools-texturepacker=r65149.811c25b3cc3
 	conflicts = kodi-tools-texturepacker
 
 pkgname = kodi-git-dev
 	pkgdesc = Kodi dev files (master branch)
-	provides = kodi-dev=r64774.7eebcfa3056
+	provides = kodi-dev=r65149.811c25b3cc3
 	conflicts = kodi-dev
diff --git a/PKGBUILD b/PKGBUILD
index 5405c57288fa..c59917e56b14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -25,7 +25,7 @@ _renderer=gles
 
 pkgbase=kodi-git
 pkgname=("$pkgbase" "$pkgbase-eventclients" "$pkgbase-tools-texturepacker" "$pkgbase-dev")
-pkgver=r64774.7eebcfa3056
+pkgver=r65149.811c25b3cc3
 pkgrel=1
 arch=('x86_64')
 url="https://kodi.tv"
@@ -51,7 +51,6 @@ options=(!lto)
 
 _gitname=xbmc
 _codename=master
-_sse_workaround=1
 
 # Found on their respective github release pages. One can check them against
 # what is pulled down when not specifying them in the cmake step.
@@ -80,7 +79,6 @@ source=(
   "https://mirrors.kodi.tv/build-deps/sources/fstrcmp-$_fstrcmp_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/flatbuffers-$_flatbuffers_version.tar.gz"
   "https://mirrors.kodi.tv/build-deps/sources/libudfread-$_libudfread_version.tar.gz"
-  cheat-sse-build.patch
 )
 noextract=(
   "libdvdcss-$_libdvdcss_version.tar.gz"
@@ -100,8 +98,7 @@ b2sums=('SKIP'
         '0f78a8ab5a420297f666b3b8156d499a9141ec25c049d4d2bb2ba594dc585abe211a149b83c605cce4f5530207231a065d5f3a87a0c969781de8c6381afa2527'
         'a8b68fcb8613f0d30e5ff7b862b37408472162585ca71cdff328e3299ff50476fd265467bbd77b352b22bb88c590969044f74d91c5468475504568fd269fa69e'
         'be5e3c8ea81ce4b6f2e2c1b2f22e1172434c435f096fa7dade060578c506cff0310e3e2ef0627e26ce2be44f740652eb9a8e1b63578c18f430f7925820f04e66'
-        '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61'
-        '6d647177380c619529fb875374ec46f1fff6273be1550f056c18cb96e0dea8055272b47664bb18cdc964496a3e9007fda435e67c4f1cee6375a80c048ae83dd0')
+        '1801d84a0ca38410a78f23e7d44f37e6d53346753c853df2e7380d259ce1ae7f0c712825b95a5753ad0bc6360cfffe1888b9e7bc30da8b84549e0f1198248f61')
 
 pkgver() {
   cd "$_gitname"
@@ -116,8 +113,6 @@ prepare() {
 
   rm -rf system/certs # remove not needed cacert
 
-  [[ "$_sse_workaround" -eq 1 ]] && patch -p1 -i "$srcdir/cheat-sse-build.patch"
-
   if [[ -n "$_clangbuild" ]]; then
     msg "Building with clang"
     export CC=clang CXX=clang++
@@ -131,6 +126,11 @@ build() {
     -DCMAKE_BUILD_TYPE=Release
     -DCMAKE_INSTALL_PREFIX=/usr
     -DCMAKE_INSTALL_LIBDIR=/usr/lib
+    -DENABLE_SSE=ON
+    -DENABLE_SSE2=ON
+    -DENABLE_SSE3=ON
+    -DENABLE_SSSE3=ON
+    -DENABLE_SSE4_1=ON
     -DUSE_LTO=$(nproc)
     -DVERBOSE=ON
     -DENABLE_LDGOLD=OFF
diff --git a/cheat-sse-build.patch b/cheat-sse-build.patch
deleted file mode 100644
index df356d0fdb4a..000000000000
--- a/cheat-sse-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)