kodi-wayland: adjusted a CFLAG among other changes

2 files changed, 19 insertions, 16 deletions

diff --git a/kodi-wayland/.signature b/kodi-wayland/.signature
index 9ebdc05ef..30cac250a 100644
--- a/kodi-wayland/.signature
+++ b/kodi-wayland/.signature
@@ -1,10 +1,11 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38wy5MyrFcodgxpO01FYrODJ1UxIn1fRGWf1FyQ6ZJzPT/R5XHb4CrAOdSOYsw+YBPpb6GWrePHV+x6skvwCpwY=
-SHA256 (Pkgfile) = 16a4bcf0c6e86e7e3aab6038d338176907ddd7201e2c65c77eca5cc888905d55
+RWSagIOpLGJF36NPu5n6mzg8eMIGSSFLVxHvp+53UqprwzdNFxBMWGVDAFpzb74d3lxjBDyV1X3ThbciZ4olqKBmqjZdTA8BcwI=
+SHA256 (Pkgfile) = 1dab790817f2088d1c9f2970dab35f0780d52251ccee02c8873c2e6e8c75d9f6
 SHA256 (.footprint) = 9b594b67b006ac2de751c98a398f6a97995bdaa3bf1ef5aae2ed2566e443d385
 SHA256 (xbmc-19.4-Matrix.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
-SHA256 (4.3-kodi-dav1d-1.0.tar.gz) = 9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4
+SHA256 (kodi-ffmpeg-4.3-kodi-dav1d-1.0.tar.gz) = 9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4
 SHA256 (crossguid-8f399e8bd4.tar.gz) = 3d77d09a5df0de510aeeb940df4cb534787ddff3bb1828779753f5dfa1229d10
 SHA256 (kodi-libdvdcss-1.4.2-Leia-Beta-5.tar.gz) = 38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d
 SHA256 (kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz) = 071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a
+SHA256 (kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz) = a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf
 SHA256 (kodi-19.4-fmt-9.patch) = 236d40c7c201212a3f76d0b6362391e6b459bacc9ec5d35b9e34fa4b2fee7c25
diff --git a/kodi-wayland/Pkgfile b/kodi-wayland/Pkgfile
index 797460c96..efaca03e1 100644
--- a/kodi-wayland/Pkgfile
+++ b/kodi-wayland/Pkgfile
@@ -1,12 +1,12 @@
 # Description: Open source home theater software, wayland native version
 # URL: https://kodi.tv/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: dbus flatbuffers fstrcmp glu libass libcdio libdvdread libxkbcommon openjdk17-jdk python rapidjson rtmpdump spdlog swig taglib tinyxml waylandpp
-# Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libva libva-vdpau-driver libxslt mariadb mysql pulseaudio
+# Depends on: dbus flatbuffers fstrcmp glu libass libcdio libdvdread libinput libxkbcommon openjdk17-jdk rapidjson rtmpdump spdlog swig taglib tinyxml waylandpp
+# Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio
 
 name=kodi-wayland
 version=19.4
-release=3
+release=4
 
 # version variables {{{
 _codename=Matrix
@@ -15,16 +15,17 @@ _crossguid_version="8f399e8bd4"
 _fmt_version="6.1.2"
 _libdvdcss_version="1.4.2-Leia-Beta-5"
 _libdvdnav_version="6.0.0-Leia-Alpha-3"
-#_libdvdread_version="6.0.0-Leia-Alpha-3"
+_libdvdread_version="6.0.0-Leia-Alpha-3"
 # }}}
 # source {{{
 source=(https://github.com/xbmc/xbmc/archive/$version-$_codename/xbmc-$version-$_codename.tar.gz
-  https://github.com/BlackIkeEagle/kodi-FFmpeg/archive/refs/heads/fix/$_ffmpeg_version.tar.gz
+  #https://github.com/BlackIkeEagle/kodi-FFmpeg/archive/refs/heads/fix/$_ffmpeg_version.tar.gz
+  https://sources.archlinux.org/other/community/kodi/kodi-ffmpeg-$_ffmpeg_version.tar.gz
   #http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz
   http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar.gz
   https://github.com/xbmc/libdvdcss/archive/$_libdvdcss_version/${name/-wayland/}-libdvdcss-$_libdvdcss_version.tar.gz
   https://github.com/xbmc/libdvdnav/archive/$_libdvdnav_version/${name/-wayland/}-libdvdnav-$_libdvdnav_version.tar.gz
-  #https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland}-libdvdread-$_libdvdread_version.tar.gz
+  https://github.com/xbmc/libdvdread/archive/$_libdvdread_version/${name/-wayland}-libdvdread-$_libdvdread_version.tar.gz
   kodi-19.4-fmt-9.patch)
 # }}}
 # unpack_source() {{{
@@ -82,34 +83,35 @@ build()  {
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_INSTALL_LIBDIR=lib \
     -D CMAKE_BUILD_TYPE=Release \
-    -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+    -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS -Wno-error=restrict" \
     -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
     -D CORE_PLATFORM_NAME=wayland \
     -D APP_RENDER_SYSTEM=gl \
     -D ENABLE_DBUS=ON \
     -D ENABLE_DVDCSS=ON \
     -D ENABLE_EVENTCLIENTS=ON \
-    -D ENABLE_OPTICAL=OFF \
     -D ENABLE_UDEV=ON \
     -D ENABLE_PYTHON=ON \
-    -D VERBOSE=OFF \
+    -D fmt_DIR=/usr/lib/cmake/fmt \
+    -D spdlog_DIR=/usr/lib/cmake/spdlog \
+    -D ENABLE_ISO9660PP=OFF \
     -D ENABLE_LDGOLD=OFF \
+    -D ENABLE_OPTICAL=OFF \
     -D ENABLE_TESTING=OFF \
-    -D ENABLE_ISO9660PP=OFF \
+    -D VERBOSE=OFF \
     -D ENABLE_INTERNAL_FFMPEG=ON \
-    -D FFMPEG_URL="$SRC/4.3-kodi-dav1d-1.0.tar.gz" \
+    -D FFMPEG_URL="$SRC/kodi-ffmpeg-$_ffmpeg_version.tar.gz" \
     -D ENABLE_INTERNAL_CROSSGUID=ON \
     -D CROSSGUID_URL="$SRC/crossguid-$_crossguid_version.tar.gz" \
     -D LIBDVDCSS_URL="$SRC/${name/-wayland/}-libdvdcss-$_libdvdcss_version.tar.gz" \
     -D LIBDVDNAV_URL="$SRC/${name/-wayland/}-libdvdnav-$_libdvdnav_version.tar.gz" \
+    -D LIBDVDREAD_URL="$SRC/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz" \
     -D ENABLE_INTERNAL_FMT=OFF \
     -D ENABLE_INTERNAL_FSTRCMP=OFF \
     -D ENABLE_INTERNAL_FLATBUFFERS=OFF \
     -D ENABLE_INTERNAL_GTEST=OFF \
     -D ENABLE_INTERNAL_RapidJSON=OFF \
     -Wno-dev
-    #-D LIBDVDREAD_URL="$SRC/${name/-wayland/}-libdvdread-$_libdvdread_version.tar.gz" \
-    #-D FFMPEG_URL="$SRC/$_ffmpeg_version.tar.gz" \
   cmake --build build
   DESTDIR=$PKG cmake --build build --target install