ports/contrib (3.7): kodi-wayland: fixed build with fmt 9.1.0, other minor changes

27 Sep 2022

commit 1d0a02eef25cab6da0e16edbf383866493a2fa42
Author: Tim Biermann <tbier@posteo.de>
Date:   Tue Sep 27 23:03:09 2022 +0200

    kodi-wayland: fixed build with fmt 9.1.0, other minor changes

diff --git a/kodi-wayland/.footprint b/kodi-wayland/.footprint
index 044615956..887b5b24f 100644
--- a/kodi-wayland/.footprint
+++ b/kodi-wayland/.footprint
@@ -170,13 +170,42 @@ drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/defs.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/defs.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/ps3_remote.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/ps3_remote.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/xbmcclient.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/xbmcclient.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/zeroconf.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/__pycache__/zeroconf.cpython-310.pyc
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/bt/
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/bt/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/bt/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/bt/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/bt/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/bt/__pycache__/bt.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/bt/__pycache__/bt.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/bt/__pycache__/hid.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/bt/__pycache__/hid.cpython-310.pyc
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/bt/bt.py
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/bt/hid.py
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/defs.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/ps3/
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__init__.py
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/__init__.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/__init__.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/keymaps.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/keymaps.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixaxis.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixpair.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixpair.cpython-310.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-310.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/kodi/ps3/__pycache__/sixwatch.cpython-310.pyc
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/ps3/keymaps.py
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/ps3/sixaxis.py
 -rwxr-xr-x	root/root	usr/lib/python3.10/site-packages/kodi/ps3/sixpair.py
diff --git a/kodi-wayland/.signature b/kodi-wayland/.signature
index 215d90a8e..9ebdc05ef 100644
--- a/kodi-wayland/.signature
+++ b/kodi-wayland/.signature
@@ -1,11 +1,10 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF378XhgEbIOum5cPmt3UCur5aS0lGkoWzqr1A0/LVejwTVtD0MFH3DvrfgAKE/hqftyMEF+p169SkajdZPN9WwgQ=
-SHA256 (Pkgfile) = 96bf984782b90dd71a088185245191f3958540024c3e130b4e277b9845071477
-SHA256 (.footprint) = f81abfb70e104f8edc1f6ca4aa14195aefd03986bc9fc9e719ac6c0a1a10c764
+RWSagIOpLGJF38wy5MyrFcodgxpO01FYrODJ1UxIn1fRGWf1FyQ6ZJzPT/R5XHb4CrAOdSOYsw+YBPpb6GWrePHV+x6skvwCpwY=
+SHA256 (Pkgfile) = 16a4bcf0c6e86e7e3aab6038d338176907ddd7201e2c65c77eca5cc888905d55
+SHA256 (.footprint) = 9b594b67b006ac2de751c98a398f6a97995bdaa3bf1ef5aae2ed2566e443d385
 SHA256 (xbmc-19.4-Matrix.tar.gz) = cc026f59fd6e37ae90f3449df50810f1cefa37da9444e1188302d910518710da
 SHA256 (4.3-kodi-dav1d-1.0.tar.gz) = 9d8b26e2a16029c4c15fd3232303515a3cb37b1d2bff02ee0fa5f0230c3a2fd4
-SHA256 (fmt-5.1.0.tar.gz) = 73d4cab4fa8a3482643d8703de4d9522d7a56981c938eca42d929106ff474b44
 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 624216fa7..797460c96 100644
--- a/kodi-wayland/Pkgfile
+++ b/kodi-wayland/Pkgfile
@@ -1,31 +1,31 @@
 # 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 libxkbcommon openjdk17-jdk python rapidjson rtmpdump spdlog swig taglib tinyxml waylandpp
+# 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
 
 name=kodi-wayland
 version=19.4
-release=2
+release=3
 
 # version variables {{{
 _codename=Matrix
-_ffmpeg_version="4.3.1-$_codename-Beta1"
+_ffmpeg_version="4.3-kodi-dav1d-1.0"
 _crossguid_version="8f399e8bd4"
-_fmt_version="5.1.0"
+_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-$_cod...
-  https://github.com/BlackIkeEagle/kodi-FFmpeg/archive/refs/heads/fix/4.3-kodi...
-  #https://github.com/xbmc/FFmpeg/archive/$_ffmpeg_version.tar.gz
-  http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz
+  https://github.com/BlackIkeEagle/kodi-FFmpeg/archive/refs/heads/fix/$_ffmpeg...
+  #http://mirrors.kodi.tv/build-deps/sources/fmt-$_fmt_version.tar.gz
   http://mirrors.kodi.tv/build-deps/sources/crossguid-$_crossguid_version.tar....
   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() {{{
 unpack_source() {
@@ -42,7 +42,9 @@ unpack_source() {
 
 build()  {
   # clang? {{{
-  [[ -e /usr/bin/clang && -e /usr/bin/clang++ && -e /usr/bin/lld ]] && export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib LDFLAGS+=' -fuse-ld=lld' && KODI_EXTRA+=' -D CMAKE_CXX_COMPILER_AR=/usr/bin/llvm-ar -D CMAKE_CXX_COMPILER_RANLIB=/usr/bin/llvm-ranlib -D CMAKE_NM=/usr/bin/llvm-nm -D ENABLE_LLD=ON -D USE_LTO=8'
+  if [[ $PKGMK_KODI_USE_CLANG == on ]]; then
+    [[ -e /usr/bin/clang && -e /usr/bin/clang++ && -e /usr/bin/lld ]] && export CC=clang CXX=clang++ AR=llvm-ar NM=llvm-nm RANLIB=llvm-ranlib LDFLAGS+=' -fuse-ld=lld' && KODI_EXTRA+=' -D CMAKE_CXX_COMPILER_AR=/usr/bin/llvm-ar -D CMAKE_CXX_COMPILER_RANLIB=/usr/bin/llvm-ranlib -D CMAKE_NM=/usr/bin/llvm-nm -D ENABLE_LLD=ON -D USE_LTO=8' || echo "Please install clang first"
+  fi
   # }}}
   unset PATH
   export PATH="/usr/lib/java/openjdk17-jdk/bin:/usr/bin:/bin:/usr/sbin:/sbin"
@@ -57,13 +59,25 @@ build()  {
   prt-get isinst libva && KODI_EXTRA+=' -D ENABLE_VAAPI=ON' || KODI_EXTRA+=' -D ENABLE_VAAPI=OFF'
   prt-get isinst libva-vdpau-driver && KODI_EXTRA+=' -D ENABLE_VDPAU=ON' || KODI_EXTRA+=' -D ENABLE_VDPAU=OFF'
   prt-get isinst libxslt && KODI_EXTRA+=' -D ENABLE_XSLT=ON' || KODI_EXTRA+=' -D ENABLE_XSLT=OFF'
-  prt-get isinst mysql && KODI_EXTRA+=' -D ENABLE_MYSQLCLIENT=OFF'
-  prt-get isinst mariadb && KODI_EXTRA+=' -D ENABLE_MARIADBCLIENT=OFF'
+  prt-get isinst mysql && KODI_EXTRA+=' -D ENABLE_MYSQLCLIENT=ON'
+  prt-get isinst mariadb && KODI_EXTRA+=' -D ENABLE_MARIADBCLIENT=ON'
   prt-get isinst pulseaudio && KODI_EXTRA+=' -D ENABLE_PULSEAUDIO=ON' || KODI_EXTRA+=' -D ENABLE_PULSEAUDIO=OFF'
 
   prt-get isinst ccache && PATH="$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')"
   # }}}
 
+  patch -Np1 -d xbmc-$version-$_codename -i $SRC/kodi-19.4-fmt-9.patch
+
+  # grabbed off from gentoo
+  for i in xbmc-$version-$_codename/tools/depends/native/{TexturePacker,JsonSchemaBuilder}/src; do
+    pushd $i;
+    autoreconf -vfi;
+    popd
+  done
+  sed -e 's/autoreconf -vif/echo "autoreconf already done"/' -i \
+    xbmc-$version-$_codename/tools/depends/native/TexturePacker/src/autogen.sh \
+    xbmc-$version-$_codename/tools/depends/native/JsonSchemaBuilder/src/autogen.sh
+
   cmake -S xbmc-$version-$_codename -B build -G Ninja $KODI_EXTRA \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_INSTALL_LIBDIR=lib \
@@ -73,12 +87,12 @@ build()  {
     -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 ENABLE_DVDCSS=OFF \
     -D ENABLE_LDGOLD=OFF \
     -D ENABLE_TESTING=OFF \
     -D ENABLE_ISO9660PP=OFF \
@@ -88,17 +102,21 @@ build()  {
     -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
 
+  export PYTHONHASHSEED=0
+  /usr/bin/python3 -m compileall -d / $PKG/usr/lib
+  /usr/bin/python3 -O -m compileall -d / $PKG/usr/lib
+
   rm -r $PKG/usr/{lib/firewalld,share/doc}
 }
 
diff --git a/kodi-wayland/kodi-19.4-fmt-9.patch b/kodi-wayland/kodi-19.4-fmt-9.patch
new file mode 100644
index 000000000..b60d9ccc9
--- /dev/null
+++ b/kodi-wayland/kodi-19.4-fmt-9.patch
@@ -0,0 +1,74 @@
+From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Wed, 6 Jul 2022 22:48:35 +1000
+Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers
+ is disallowed
+
+---
+ xbmc/utils/GLUtils.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
+index 1ef804709ff56..c36dcf6a20fec 100644
+--- a/xbmc/utils/GLUtils.cpp
++++ b/xbmc/utils/GLUtils.cpp
+@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
+ void LogGraphicsInfo()
+ {
+ #if defined(HAS_GL) || defined(HAS_GLES)
+-  const GLubyte *s;
++  const char* s;
+ 
+-  s = glGetString(GL_VENDOR);
++  s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+   if (s)
+     CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_VENDOR = NULL");
+ 
+-  s = glGetString(GL_RENDERER);
++  s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
+   if (s)
+     CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_RENDERER = NULL");
+ 
+-  s = glGetString(GL_VERSION);
++  s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
+   if (s)
+     CLog::Log(LOGINFO, "GL_VERSION = %s", s);
+   else
+     CLog::Log(LOGINFO, "GL_VERSION = NULL");
+ 
+-  s = glGetString(GL_SHADING_LANGUAGE_VERSION);
++  s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+   if (s)
+     CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
+   else
+
+From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 11 Jul 2022 09:39:02 +0000
+Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void
+ pointers is disallowed
+
+---
+ xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
+index 8a18288fd8af0..033c0f77bf454 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager()
+ 
+   if(status == Success && items_read)
+   {
+-    CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
++    const char* s;
++
++    s = reinterpret_cast<const char*>(data);
++    CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
+   }
+   else
+     CLog::Log(LOGDEBUG,"Window Manager Name: ");

    

crux＠crux.nu

tags

participants (1)