Request 5644 (accepted)

Overview

Request 5644 (accepted)

- Version update to Kodi 19.5 Matrix
* "fix-formattable-string.patch" is no longer needed, remove it
* Check if cmake/KodiConfig.cmake is installed at the proper
location; if not, fix it

Created by manfred.h over 1 year ago
In state accepted
Package maintainers: manfred-h and sagiben

Submit kodi

Submit package home:manfred.h / kodi to package Multimedia / kodi

kodi-noX-raspberry-pi.changes Changed

kodi-noX-raspberry-pi2.changes Changed

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX-raspberry-pi.spec Changed

@@ -53,7 +53,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        19.4
+Version:        19.5
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -89,10 +89,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Tumbleweed introduced libfmt9 with snapshot 20221014:
-Patch12:        fix-formattable-string.patch
-%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -354,9 +350,6 @@
 %if %{without sysffmpeg}
 %patch11
 %endif
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-%patch12
-%endif
 #%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
@@ -484,6 +477,13 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
+if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
+    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
+	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
+	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
+	rmdir %{buildroot}/%{_libdir}/kodi/cmake
+fi
+
 %fdupes %{buildroot}
 
 %pre

kodi-noX-raspberry-pi2.spec Changed

@@ -53,7 +53,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi2
-Version:        19.4
+Version:        19.5
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -89,10 +89,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Tumbleweed introduced libfmt9 with snapshot 20221014:
-Patch12:        fix-formattable-string.patch
-%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -354,9 +350,6 @@
 %if %{without sysffmpeg}
 %patch11
 %endif
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-%patch12
-%endif
 #%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
@@ -484,6 +477,13 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
+if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
+    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
+	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
+	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
+	rmdir %{buildroot}/%{_libdir}/kodi/cmake
+fi
+
 %fdupes %{buildroot}
 
 %pre

kodi-noX.spec Changed

@@ -53,7 +53,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        19.4
+Version:        19.5
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -89,10 +89,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Tumbleweed introduced libfmt9 with snapshot 20221014:
-Patch12:        fix-formattable-string.patch
-%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -354,9 +350,6 @@
 %if %{without sysffmpeg}
 %patch11
 %endif
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-%patch12
-%endif
 #%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
@@ -484,6 +477,13 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
+if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
+    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
+	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
+	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
+	rmdir %{buildroot}/%{_libdir}/kodi/cmake
+fi
+
 %fdupes %{buildroot}
 
 %pre

kodi.spec Changed

@@ -53,7 +53,7 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        19.4
+Version:        19.5
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -89,10 +89,6 @@
 %endif
 Patch10:        ffmpeg-4.3.1-ogg.patch
 Patch11:        kodi-apply-ffmpeg.patch
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Tumbleweed introduced libfmt9 with snapshot 20221014:
-Patch12:        fix-formattable-string.patch
-%endif
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -354,9 +350,6 @@
 %if %{without sysffmpeg}
 %patch11
 %endif
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-%patch12
-%endif
 #%patch8 -p1
 %if %{without kodi_with_wayland}
 %patch9
@@ -484,6 +477,13 @@
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
+if  ! -s %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake  && \
+    -s %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake ; then
+	mv %{buildroot}/%{_libdir}/kodi/cmake/KodiConfig.cmake \
+	   %{buildroot}/%{_datadir}/kodi/cmake/KodiConfig.cmake
+	rmdir %{buildroot}/%{_libdir}/kodi/cmake
+fi
+
 %fdupes %{buildroot}
 
 %pre

fix-formattable-string.patch Deleted

@@ -1,53 +0,0 @@
-diff -up ./xbmc/utils/GLUtils.cpp.orig ./xbmc/utils/GLUtils.cpp
---- ./xbmc/utils/GLUtils.cpp.orig	2022-03-02 19:38:51.000000000 +0100
-+++ ./xbmc/utils/GLUtils.cpp	2022-10-16 11:17:54.313107565 +0200
-@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile,
- 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
-diff -up ./xbmc/windowing/X11/WinSystemX11.cpp.orig ./xbmc/windowing/X11/WinSystemX11.cpp
---- ./xbmc/windowing/X11/WinSystemX11.cpp.orig	2022-03-02 19:38:51.000000000 +0100
-+++ ./xbmc/windowing/X11/WinSystemX11.cpp	2022-10-16 10:48:41.725732897 +0200
---- ./xbmc/windowing/X11/WinSystemX11.cpp.orig	2022-10-16 11:49:10.137083194 +0200
-+++ ./xbmc/windowing/X11/WinSystemX11.cpp	2022-10-16 11:50:09.065073269 +0200
-@@ -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", s);
-   }
-   else
-     CLog::Log(LOGDEBUG,"Window Manager Name: ");

Build Results
RPM Lint

Refresh

Comments for request 5644 0

Request History

manfred.h created request over 1 year ago

- Version update to Kodi 19.5 Matrix
* "fix-formattable-string.patch" is no longer needed, remove it
* Check if cmake/KodiConfig.cmake is installed at the proper
location; if not, fix it

manfred.h accepted request over 1 year ago

Successfully tested builds for Leap 15.4 (1.53 is currently running) and Tumbleweed - so accepted as obviously working properly.