kodi-gbm: adjusted a CFLAG among other changes

kodi-gbm/.signature

@@ -1,9 +1,9 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38LDdBz82FIRwbENOjswneUA60JOtoNTznaQ0zW7khhTW1xbVltZ05Qdp4/aJjqjAkWtObR61F9lNwusDrhApQg=
-SHA256 (Pkgfile) = d484ede041c70d53d36db795466778204f533d89cdffa85b2ce4c1c713181266
+RWSagIOpLGJF36dK8EW0lbubEZiBZ8OnkEyfxGNRVxoCfq/H39CKzyjQcDJOa1mq43oI/roBDQkei0EM0xt2CatQzIgaxGiEWgU=
+SHA256 (Pkgfile) = 6989ee69145aa2c7e69c2df3128fcb4716faa53097028b19f55dc5c5634bb38a
 SHA256 (.footprint) = 53c9f3ee6a8e4a56daea6ab5b754e5867265ea094d77291e86bde0beb8cf64d0
 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

kodi-gbm/Pkgfile

@@ -1,12 +1,12 @@
 # Description: Open source home theater software, running in a gbm buffer
 # URL: https://kodi.tv/
 # Maintainer: Tim Biermann, tbier at posteo dot de
-# Depends on: dbus flatbuffers fstrcmp libass libcdio libinput libmicrohttpd libxkbcommon mesa openjdk17-jdk rapidjson rtmpdump spdlog swig taglib tinyxml
+# Depends on: dbus flatbuffers fstrcmp libass libcdio libdvdread libinput libmicrohttpd libxkbcommon mesa openjdk17-jdk rapidjson rtmpdump spdlog swig taglib tinyxml
 # Optional: alsa-lib avahi bluez dav1d libmicrohttpd libnfs libnghttp2 libva libva-vdpau-driver libxslt mariadb mysql pipewire pulseaudio
 
 name=kodi-gbm
 version=19.4
-release=3
+release=4
 
 # version variables {{{
 _codename=Matrix
@@ -19,7 +19,8 @@ _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
   #https://github.com/xbmc/FFmpeg/archive/$_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
@@ -85,7 +86,7 @@ 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=gbm \
     -D APP_RENDER_SYSTEM=gles \
@@ -94,13 +95,15 @@ build()  {
     -D ENABLE_EVENTCLIENTS=ON \
     -D ENABLE_UDEV=ON \
     -D ENABLE_PYTHON=ON \
+    -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 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/-gbm/}-libdvdcss-$_libdvdcss_version.tar.gz" \
@@ -112,7 +115,6 @@ build()  {
     -D ENABLE_INTERNAL_GTEST=OFF \
     -D ENABLE_INTERNAL_RapidJSON=OFF \
     -Wno-dev
-    #-D FFMPEG_URL="$SRC/$_ffmpeg_version.tar.gz" \
   cmake --build build
   DESTDIR=$PKG cmake --build build --target install