Request 3737 (superseded)

kodi-noX-raspberry-pi.changes Changed

@@ -1,390 +1,4 @@
 -------------------------------------------------------------------
-Sat Nov  9 10:43:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Restrict swig version to < 4.2; newer versions on Tumbleweed do
-  not accept all options used by kodi.
-
--------------------------------------------------------------------
-Sun Aug 18 08:14:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.1 Omega
-
--------------------------------------------------------------------
-Tue May 14 09:50:06 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure to stick with ffmpeg-6 related packages for building.
-
--------------------------------------------------------------------
-Wed May  8 09:39:58 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use https:// URLs only.
-- Pipewire currently creates more issues than benefits on Leap;
-  use new conditional "kodi_without_pipewire" to enable or disable it.
-  We default to disable it now on Leap.
-
--------------------------------------------------------------------
-Mon Apr 22 15:59:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-kodi-workaround-pipewire-bug.patch to work around a
-  potentially broken pipewire installation on openSUSE Leap 15.5
-  and 15.6; see https://bugzilla.opensuse.org/show_bug.cgi?id=1222636
-
--------------------------------------------------------------------
-Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0 Omega
-
--------------------------------------------------------------------
-Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc2 Omega
-
--------------------------------------------------------------------
-Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Always assume "with sysffmpeg": All of our target platforms have
-  a suitable version of ffmpeg packages, therefore comment most of
-  the "with/without sysffmpeg" stuff which helps to avoid
-  downloading an outdated tarball which doesn't get used at all.
-- Make all other SourceN archives downloadable via _service.
-- Do not restrict the Java version anymore.
-
--------------------------------------------------------------------
-Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc1 Omega
-- Remove 0004-xbmc#24733.patch
-
--------------------------------------------------------------------
-Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-xbmc#24733.patch to fix
-  * https://github.com/kodi-pvr/pvr.vuplus/issues/449
-  * https://github.com/xbmc/xbmc/issues/24629
-- Use %%autopatch -p1 to make RPM-4.19 happy.
-
--------------------------------------------------------------------
-Fri Feb 16 08:52:21 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b3 Omega
-- Update build time dependendies.
-- Add binary tarball for apache-groovy as Source25.
-- Cleanup patches no longer needed:
-  crossguid_build64.patch, disable_internal_libdvd.patch,
-  kodi-15.0-gcc5.patch, kodi-apply-dvdrun.patch,
-  kodi-libdrm.patch, kodi-sse.patch, kodi-texturepacker.patch,
-  kodi-tools-libdir.patch, kodi.aarch64.patch, kodi.arm.patch,
-  kodi.cximage.gcc6.patch, libdvdnav-no-return.patch,
-  no-xbmc-symbolic-link.patch
-- Rename .patch files to include a series number.
-
--------------------------------------------------------------------
-Wed Jan 10 11:35:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use python3.11 on all platforms.
-- Restore the "|| l" in case of a make failure
-- Add crossguid-dgb.patch as Patch3 to remove some strange
-  libcrossguid-dgb references.
-- Update build time dependendies.
-- Update package files lists.
-- Ensure kodi-TexturePacker is installed and not TexturePacker.
-- Remove fix_building_with_fmt10.patch which is no longer needed.
-- Remove ffmpeg-4.3.1-ogg.patch and kodi-apply-ffmpeg.patch which
-  are no longer needed/wanted.
-- Add source tarball for libudfread as Source24.
-
--------------------------------------------------------------------
-Mon Dec 18 17:56:31 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b2 Omega
-
--------------------------------------------------------------------
-Tue Dec  5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Unban fmt10, but add new patch fix_building_with_fmt10.patch
-  derived from https://github.com/xbmc/xbmc/pull/23453 to fix
-  building on current TW with updated libfmt10 and libspdlog12.
-- Remove "alias l=..." and replace its use with the real command
-
--------------------------------------------------------------------
-Fri Nov  3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Don't use java >= 21 for building yet.
-
--------------------------------------------------------------------
-Fri Aug 25 09:47:30 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use the system's default compiler on Tumbleweed
-- Enable pipewire support
-
--------------------------------------------------------------------
-Thu Jul 13 10:07:34 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 20.2 Nexus 
-
--------------------------------------------------------------------
-Sun May 21 09:48:40 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure fmt10 is banned for now.
-
--------------------------------------------------------------------
-Fri Mar 17 12:07:25 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.1 Nexus 
-
--------------------------------------------------------------------
-Mon Jan 16 08:51:51 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.0 Nexus 
-
--------------------------------------------------------------------
-Mon Jan  2 09:08:35 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch as "fix_import_eglextchromium.patch" to fix
-  compilation failure "EGL/eglextchromium.h: No such file or directory"
-  with recent Mesa versions on TW; taken from
-  https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5
-
--------------------------------------------------------------------
-Mon Dec 26 11:28:01 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- 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
-
--------------------------------------------------------------------
-Sun Dec 18 11:28:53 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Rewrite the ffmpeg specific version range using the proper rpm
-  syntax: (cond1 with cond2)
-
--------------------------------------------------------------------
-Sat Dec  3 11:28:18 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Explicitly request packages from the ffmpeg-4 branch to avoid
-  pulling in ffmpeg-5 on TW
-
--------------------------------------------------------------------
-Sun Oct 16 09:42:25 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch to fix "formatting of non-void pointers is
-  disallowed" on Tumbleweed caused by libfmt9; taken from
-  https://github.com/xbmc/xbmc/commit/1d4e27aaa64c317b0020bbd68bb6520d507bb48e
-  and
-  https://github.com/xbmc/xbmc/commit/0ea4ec6e8965848ebe22e27c44ddfd8ab60a8bb6
-
--------------------------------------------------------------------
-Tue Aug 16 08:02:56 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Apply upstream patch to fix upstream ffmpeg version (issue#21603)
-- Update ffmpeg upstream version iused by kodi project
-
--------------------------------------------------------------------
-Wed Jul 20 09:08:29 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use gcc12 on TW.
-
--------------------------------------------------------------------
-Sun Mar 27 18:08:24 UTC 2022 - Giacomo Comes <gcomes.obs@gmail.com>
-
-- for Leap 15.4 use BuildRequires libplist-2.0
-
--------------------------------------------------------------------
-Wed Mar  9 08:30:03 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.4 Matrix
-  * Don't rely on legacy versions of packages fmt and spdlog for
-    openSUSE_Tumbleweed anymore. Package deletion for
-    Multimedia/A_tw-fmt and
-    Multimedia/A_tw-spdlog requested.
-
--------------------------------------------------------------------
-Sun Oct 31 10:55:49 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.3 Matrix
-  * Add new file /usr/share/metainfo/org.xbmc.kodi.metainfo.xml
-
--------------------------------------------------------------------
-Sun Oct 10 08:01:57 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.2 Matrix
-
--------------------------------------------------------------------
-Sun Jun 13 07:24:30 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Tumbleweed no longer has gcc9; switch to gcc10 for TW.
-
--------------------------------------------------------------------
-Thu May 13 08:42:03 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.1 Matrix
-- libnfs must be at least version 4.0.0
-
--------------------------------------------------------------------
-Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.0 Matrix
-
--------------------------------------------------------------------
-Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
-
-- SSE does not depend on buildhost
-
--------------------------------------------------------------------
-Mon Oct 26 15:13:26 UTC 2020 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 18.9 Leia 
-    * Work around third-party changes to HTTP2 and SSL/encryption
-      that impacted internet access from Kodi by scrapers, streaming
-      addons, etc.
-    * Fix memory leaks in TexturePacker
-    * Fix event server unable to send raw key strikes
-    * Fix issues around directory navigation and incorrectly-set
-      start directories
-    * Fix MediaCodec OES/EGL rendering
-
--------------------------------------------------------------------
-Fri Jul 31 04:48:19 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.8 Leia 
-
--------------------------------------------------------------------
-Fri May 22 09:57:08 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Fri May 22 03:40:54 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Mon Mar  9 11:30:15 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.6 Leia 
-- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied,
-  remove it.
-
--------------------------------------------------------------------
-Thu Dec  5 16:32:26 UTC 2019 - olaf@aepfle.de
-
-- Use flatbuffers from OBS
-- Use fmt from OBS
-- Use fstrcmp from OBS
-- Use rapidjson from OBS
-- Disable bluez on SLE_12
-
--------------------------------------------------------------------
-Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.5 Leia 
-
--------------------------------------------------------------------
-Thu Oct 31 09:36:52 UTC 2019 - manfred.h@gmx.net
-
-- Use gcc-9/g++-9 on Tumbleweed/Factory.
-
--------------------------------------------------------------------
-Wed Sep  4 03:27:01 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.4 Leia 
-
--------------------------------------------------------------------
-Sun Jun 23 17:10:24 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.3 Leia 
-
--------------------------------------------------------------------
-Tue Apr 23 06:00:58 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.2 Leia 
-
--------------------------------------------------------------------
-Sun Apr 14 03:24:09 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.1 Leia
-
--------------------------------------------------------------------
-Sat Feb  2 17:46:05 UTC 2019 - manfred.h@gmx.net
-
-- Add BuildRequires:  pkgconfig(lirc)
-
--------------------------------------------------------------------
-Wed Jan 30 15:02:39 UTC 2019 - sagiben@gmail.com
-
-- Version update to Kodi 18.0 Leia:
-  http://kodi.wiki/view/Kodi_v18_(Leia)_changelog 
-
--------------------------------------------------------------------
-Sun Jan 8 11:33:44 UTC 2019 - manfred.h@gmx.net
-
-- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.
-
--------------------------------------------------------------------
-Wed Jan 31 08:30:39 UTC 2018 - guillaume@opensuse.org
-
-- Add missing 'l' alias
-- Fix conflict between kodi and kodi-noX packages
-
--------------------------------------------------------------------
-Tue Jan 30 14:14:24 UTC 2018 - guillaume@opensuse.org
-
-- Enable build for %arm and aarch64 for kodi only
-
--------------------------------------------------------------------
-Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de
-
-- Version update to Kodi 17.6 Krypton 
-
--------------------------------------------------------------------
-Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de
-
-- Remove netcdf from BuildRequires
-  SLE_12 does not support it, and the private copy of ffmpeg will
-  most likely work just fine without it
-
--------------------------------------------------------------------
-Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com
-
-- Build with kodi's ffmpeg, version 17.x doesn't work with 
-  ffmpeg 3.4.
-- Added kodi-tools-libdir.patch to fix libdvd build.
-- Added unneeded return to switch statements in libdvdnav-master
-  vmget.c to silence rpmlint errors.
-
--------------------------------------------------------------------
-Sat Oct 28 14:02:40 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.5 Krypton 
-
--------------------------------------------------------------------
-Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
-
-- Use BuildRequires and configure options as checked by configure.ac
-
--------------------------------------------------------------------
-Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
-
-- Remove obsolete patch: add_rpi2_support.patch
-
--------------------------------------------------------------------
-Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.4 Krypton 
-
--------------------------------------------------------------------
-Fri May 26 03:26:29 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.3 Krypton
-  A minor bug fix and security release 
-
--------------------------------------------------------------------
-Wed May 24 04:42:41 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.2 Krypton 
-
--------------------------------------------------------------------
 Tue Mar 21 19:23:19 UTC 2017 - sagiben@gmail.com
 
 - Version update to Kodi 17.1 Krypton

kodi-noX-raspberry-pi2.changes Changed

@@ -1,390 +1,4 @@
 -------------------------------------------------------------------
-Sat Nov  9 10:43:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Restrict swig version to < 4.2; newer versions on Tumbleweed do
-  not accept all options used by kodi.
-
--------------------------------------------------------------------
-Sun Aug 18 08:14:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.1 Omega
-
--------------------------------------------------------------------
-Tue May 14 09:50:06 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure to stick with ffmpeg-6 related packages for building.
-
--------------------------------------------------------------------
-Wed May  8 09:39:58 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use https:// URLs only.
-- Pipewire currently creates more issues than benefits on Leap;
-  use new conditional "kodi_without_pipewire" to enable or disable it.
-  We default to disable it now on Leap.
-
--------------------------------------------------------------------
-Mon Apr 22 15:59:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-kodi-workaround-pipewire-bug.patch to work around a
-  potentially broken pipewire installation on openSUSE Leap 15.5
-  and 15.6; see https://bugzilla.opensuse.org/show_bug.cgi?id=1222636
-
--------------------------------------------------------------------
-Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0 Omega
-
--------------------------------------------------------------------
-Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc2 Omega
-
--------------------------------------------------------------------
-Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Always assume "with sysffmpeg": All of our target platforms have
-  a suitable version of ffmpeg packages, therefore comment most of
-  the "with/without sysffmpeg" stuff which helps to avoid
-  downloading an outdated tarball which doesn't get used at all.
-- Make all other SourceN archives downloadable via _service.
-- Do not restrict the Java version anymore.
-
--------------------------------------------------------------------
-Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc1 Omega
-- Remove 0004-xbmc#24733.patch
-
--------------------------------------------------------------------
-Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-xbmc#24733.patch to fix
-  * https://github.com/kodi-pvr/pvr.vuplus/issues/449
-  * https://github.com/xbmc/xbmc/issues/24629
-- Use %%autopatch -p1 to make RPM-4.19 happy.
-
--------------------------------------------------------------------
-Fri Feb 16 08:52:21 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b3 Omega
-- Update build time dependendies.
-- Add binary tarball for apache-groovy as Source25.
-- Cleanup patches no longer needed:
-  crossguid_build64.patch, disable_internal_libdvd.patch,
-  kodi-15.0-gcc5.patch, kodi-apply-dvdrun.patch,
-  kodi-libdrm.patch, kodi-sse.patch, kodi-texturepacker.patch,
-  kodi-tools-libdir.patch, kodi.aarch64.patch, kodi.arm.patch,
-  kodi.cximage.gcc6.patch, libdvdnav-no-return.patch,
-  no-xbmc-symbolic-link.patch
-- Rename .patch files to include a series number.
-
--------------------------------------------------------------------
-Wed Jan 10 11:35:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use python3.11 on all platforms.
-- Restore the "|| l" in case of a make failure
-- Add crossguid-dgb.patch as Patch3 to remove some strange
-  libcrossguid-dgb references.
-- Update build time dependendies.
-- Update package files lists.
-- Ensure kodi-TexturePacker is installed and not TexturePacker.
-- Remove fix_building_with_fmt10.patch which is no longer needed.
-- Remove ffmpeg-4.3.1-ogg.patch and kodi-apply-ffmpeg.patch which
-  are no longer needed/wanted.
-- Add source tarball for libudfread as Source24.
-
--------------------------------------------------------------------
-Mon Dec 18 17:56:31 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b2 Omega
-
--------------------------------------------------------------------
-Tue Dec  5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Unban fmt10, but add new patch fix_building_with_fmt10.patch
-  derived from https://github.com/xbmc/xbmc/pull/23453 to fix
-  building on current TW with updated libfmt10 and libspdlog12.
-- Remove "alias l=..." and replace its use with the real command
-
--------------------------------------------------------------------
-Fri Nov  3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Don't use java >= 21 for building yet.
-
--------------------------------------------------------------------
-Fri Aug 25 09:47:30 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use the system's default compiler on Tumbleweed
-- Enable pipewire support
-
--------------------------------------------------------------------
-Thu Jul 13 10:07:34 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 20.2 Nexus 
-
--------------------------------------------------------------------
-Sun May 21 09:48:40 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure fmt10 is banned for now.
-
--------------------------------------------------------------------
-Fri Mar 17 12:07:25 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.1 Nexus 
-
--------------------------------------------------------------------
-Mon Jan 16 08:51:51 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.0 Nexus 
-
--------------------------------------------------------------------
-Mon Jan  2 09:08:35 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch as "fix_import_eglextchromium.patch" to fix
-  compilation failure "EGL/eglextchromium.h: No such file or directory"
-  with recent Mesa versions on TW; taken from
-  https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5
-
--------------------------------------------------------------------
-Mon Dec 26 11:28:01 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- 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
-
--------------------------------------------------------------------
-Sun Dec 18 11:28:53 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Rewrite the ffmpeg specific version range using the proper rpm
-  syntax: (cond1 with cond2)
-
--------------------------------------------------------------------
-Sat Dec  3 11:28:18 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Explicitly request packages from the ffmpeg-4 branch to avoid
-  pulling in ffmpeg-5 on TW
-
--------------------------------------------------------------------
-Sun Oct 16 09:42:25 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch to fix "formatting of non-void pointers is
-  disallowed" on Tumbleweed caused by libfmt9; taken from
-  https://github.com/xbmc/xbmc/commit/1d4e27aaa64c317b0020bbd68bb6520d507bb48e
-  and
-  https://github.com/xbmc/xbmc/commit/0ea4ec6e8965848ebe22e27c44ddfd8ab60a8bb6
-
--------------------------------------------------------------------
-Tue Aug 16 08:02:56 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Apply upstream patch to fix upstream ffmpeg version (issue#21603)
-- Update ffmpeg upstream version iused by kodi project
-
--------------------------------------------------------------------
-Wed Jul 20 09:08:29 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use gcc12 on TW.
-
--------------------------------------------------------------------
-Sun Mar 27 18:08:24 UTC 2022 - Giacomo Comes <gcomes.obs@gmail.com>
-
-- for Leap 15.4 use BuildRequires libplist-2.0
-
--------------------------------------------------------------------
-Wed Mar  9 08:30:03 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.4 Matrix
-  * Don't rely on legacy versions of packages fmt and spdlog for
-    openSUSE_Tumbleweed anymore. Package deletion for
-    Multimedia/A_tw-fmt and
-    Multimedia/A_tw-spdlog requested.
-
--------------------------------------------------------------------
-Sun Oct 31 10:55:49 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.3 Matrix
-  * Add new file /usr/share/metainfo/org.xbmc.kodi.metainfo.xml
-
--------------------------------------------------------------------
-Sun Oct 10 08:01:57 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.2 Matrix
-
--------------------------------------------------------------------
-Sun Jun 13 07:24:30 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Tumbleweed no longer has gcc9; switch to gcc10 for TW.
-
--------------------------------------------------------------------
-Thu May 13 08:42:03 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.1 Matrix
-- libnfs must be at least version 4.0.0
-
--------------------------------------------------------------------
-Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.0 Matrix
-
--------------------------------------------------------------------
-Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
-
-- SSE does not depend on buildhost
-
--------------------------------------------------------------------
-Mon Oct 26 15:13:26 UTC 2020 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 18.9 Leia 
-    * Work around third-party changes to HTTP2 and SSL/encryption
-      that impacted internet access from Kodi by scrapers, streaming
-      addons, etc.
-    * Fix memory leaks in TexturePacker
-    * Fix event server unable to send raw key strikes
-    * Fix issues around directory navigation and incorrectly-set
-      start directories
-    * Fix MediaCodec OES/EGL rendering
-
--------------------------------------------------------------------
-Fri Jul 31 04:48:19 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.8 Leia 
-
--------------------------------------------------------------------
-Fri May 22 09:57:08 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Fri May 22 03:40:54 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Mon Mar  9 11:30:15 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.6 Leia 
-- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied,
-  remove it.
-
--------------------------------------------------------------------
-Thu Dec  5 16:32:26 UTC 2019 - olaf@aepfle.de
-
-- Use flatbuffers from OBS
-- Use fmt from OBS
-- Use fstrcmp from OBS
-- Use rapidjson from OBS
-- Disable bluez on SLE_12
-
--------------------------------------------------------------------
-Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.5 Leia 
-
--------------------------------------------------------------------
-Thu Oct 31 09:36:52 UTC 2019 - manfred.h@gmx.net
-
-- Use gcc-9/g++-9 on Tumbleweed/Factory.
-
--------------------------------------------------------------------
-Wed Sep  4 03:27:01 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.4 Leia 
-
--------------------------------------------------------------------
-Sun Jun 23 17:10:24 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.3 Leia 
-
--------------------------------------------------------------------
-Tue Apr 23 06:00:58 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.2 Leia 
-
--------------------------------------------------------------------
-Sun Apr 14 03:24:09 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.1 Leia
-
--------------------------------------------------------------------
-Sat Feb  2 17:46:05 UTC 2019 - manfred.h@gmx.net
-
-- Add BuildRequires:  pkgconfig(lirc)
-
--------------------------------------------------------------------
-Wed Jan 30 15:02:39 UTC 2019 - sagiben@gmail.com
-
-- Version update to Kodi 18.0 Leia:
-  http://kodi.wiki/view/Kodi_v18_(Leia)_changelog 
-
--------------------------------------------------------------------
-Sun Jan 8 11:33:44 UTC 2019 - manfred.h@gmx.net
-
-- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.
-
--------------------------------------------------------------------
-Wed Jan 31 08:30:39 UTC 2018 - guillaume@opensuse.org
-
-- Add missing 'l' alias
-- Fix conflict between kodi and kodi-noX packages
-
--------------------------------------------------------------------
-Tue Jan 30 14:14:24 UTC 2018 - guillaume@opensuse.org
-
-- Enable build for %arm and aarch64 for kodi only
-
--------------------------------------------------------------------
-Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de
-
-- Version update to Kodi 17.6 Krypton 
-
--------------------------------------------------------------------
-Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de
-
-- Remove netcdf from BuildRequires
-  SLE_12 does not support it, and the private copy of ffmpeg will
-  most likely work just fine without it
-
--------------------------------------------------------------------
-Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com
-
-- Build with kodi's ffmpeg, version 17.x doesn't work with 
-  ffmpeg 3.4.
-- Added kodi-tools-libdir.patch to fix libdvd build.
-- Added unneeded return to switch statements in libdvdnav-master
-  vmget.c to silence rpmlint errors.
-
--------------------------------------------------------------------
-Sat Oct 28 14:02:40 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.5 Krypton 
-
--------------------------------------------------------------------
-Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
-
-- Use BuildRequires and configure options as checked by configure.ac
-
--------------------------------------------------------------------
-Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
-
-- Remove obsolete patch: add_rpi2_support.patch
-
--------------------------------------------------------------------
-Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.4 Krypton 
-
--------------------------------------------------------------------
-Fri May 26 03:26:29 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.3 Krypton
-  A minor bug fix and security release 
-
--------------------------------------------------------------------
-Wed May 24 04:42:41 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.2 Krypton 
-
--------------------------------------------------------------------
 Tue Mar 21 19:23:19 UTC 2017 - sagiben@gmail.com
 
 - Version update to Kodi 17.1 Krypton

kodi-noX.changes Changed

@@ -1,390 +1,4 @@
 -------------------------------------------------------------------
-Sat Nov  9 10:43:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Restrict swig version to < 4.2; newer versions on Tumbleweed do
-  not accept all options used by kodi.
-
--------------------------------------------------------------------
-Sun Aug 18 08:14:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.1 Omega
-
--------------------------------------------------------------------
-Tue May 14 09:50:06 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure to stick with ffmpeg-6 related packages for building.
-
--------------------------------------------------------------------
-Wed May  8 09:39:58 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use https:// URLs only.
-- Pipewire currently creates more issues than benefits on Leap;
-  use new conditional "kodi_without_pipewire" to enable or disable it.
-  We default to disable it now on Leap.
-
--------------------------------------------------------------------
-Mon Apr 22 15:59:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-kodi-workaround-pipewire-bug.patch to work around a
-  potentially broken pipewire installation on openSUSE Leap 15.5
-  and 15.6; see https://bugzilla.opensuse.org/show_bug.cgi?id=1222636
-
--------------------------------------------------------------------
-Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0 Omega
-
--------------------------------------------------------------------
-Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc2 Omega
-
--------------------------------------------------------------------
-Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Always assume "with sysffmpeg": All of our target platforms have
-  a suitable version of ffmpeg packages, therefore comment most of
-  the "with/without sysffmpeg" stuff which helps to avoid
-  downloading an outdated tarball which doesn't get used at all.
-- Make all other SourceN archives downloadable via _service.
-- Do not restrict the Java version anymore.
-
--------------------------------------------------------------------
-Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc1 Omega
-- Remove 0004-xbmc#24733.patch
-
--------------------------------------------------------------------
-Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-xbmc#24733.patch to fix
-  * https://github.com/kodi-pvr/pvr.vuplus/issues/449
-  * https://github.com/xbmc/xbmc/issues/24629
-- Use %%autopatch -p1 to make RPM-4.19 happy.
-
--------------------------------------------------------------------
-Fri Feb 16 08:52:21 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b3 Omega
-- Update build time dependendies.
-- Add binary tarball for apache-groovy as Source25.
-- Cleanup patches no longer needed:
-  crossguid_build64.patch, disable_internal_libdvd.patch,
-  kodi-15.0-gcc5.patch, kodi-apply-dvdrun.patch,
-  kodi-libdrm.patch, kodi-sse.patch, kodi-texturepacker.patch,
-  kodi-tools-libdir.patch, kodi.aarch64.patch, kodi.arm.patch,
-  kodi.cximage.gcc6.patch, libdvdnav-no-return.patch,
-  no-xbmc-symbolic-link.patch
-- Rename .patch files to include a series number.
-
--------------------------------------------------------------------
-Wed Jan 10 11:35:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use python3.11 on all platforms.
-- Restore the "|| l" in case of a make failure
-- Add crossguid-dgb.patch as Patch3 to remove some strange
-  libcrossguid-dgb references.
-- Update build time dependendies.
-- Update package files lists.
-- Ensure kodi-TexturePacker is installed and not TexturePacker.
-- Remove fix_building_with_fmt10.patch which is no longer needed.
-- Remove ffmpeg-4.3.1-ogg.patch and kodi-apply-ffmpeg.patch which
-  are no longer needed/wanted.
-- Add source tarball for libudfread as Source24.
-
--------------------------------------------------------------------
-Mon Dec 18 17:56:31 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b2 Omega
-
--------------------------------------------------------------------
-Tue Dec  5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Unban fmt10, but add new patch fix_building_with_fmt10.patch
-  derived from https://github.com/xbmc/xbmc/pull/23453 to fix
-  building on current TW with updated libfmt10 and libspdlog12.
-- Remove "alias l=..." and replace its use with the real command
-
--------------------------------------------------------------------
-Fri Nov  3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Don't use java >= 21 for building yet.
-
--------------------------------------------------------------------
-Fri Aug 25 09:47:30 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use the system's default compiler on Tumbleweed
-- Enable pipewire support
-
--------------------------------------------------------------------
-Thu Jul 13 10:07:34 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 20.2 Nexus 
-
--------------------------------------------------------------------
-Sun May 21 09:48:40 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure fmt10 is banned for now.
-
--------------------------------------------------------------------
-Fri Mar 17 12:07:25 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.1 Nexus 
-
--------------------------------------------------------------------
-Mon Jan 16 08:51:51 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.0 Nexus 
-
--------------------------------------------------------------------
-Mon Jan  2 09:08:35 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch as "fix_import_eglextchromium.patch" to fix
-  compilation failure "EGL/eglextchromium.h: No such file or directory"
-  with recent Mesa versions on TW; taken from
-  https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5
-
--------------------------------------------------------------------
-Mon Dec 26 11:28:01 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- 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
-
--------------------------------------------------------------------
-Sun Dec 18 11:28:53 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Rewrite the ffmpeg specific version range using the proper rpm
-  syntax: (cond1 with cond2)
-
--------------------------------------------------------------------
-Sat Dec  3 11:28:18 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Explicitly request packages from the ffmpeg-4 branch to avoid
-  pulling in ffmpeg-5 on TW
-
--------------------------------------------------------------------
-Sun Oct 16 09:42:25 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch to fix "formatting of non-void pointers is
-  disallowed" on Tumbleweed caused by libfmt9; taken from
-  https://github.com/xbmc/xbmc/commit/1d4e27aaa64c317b0020bbd68bb6520d507bb48e
-  and
-  https://github.com/xbmc/xbmc/commit/0ea4ec6e8965848ebe22e27c44ddfd8ab60a8bb6
-
--------------------------------------------------------------------
-Tue Aug 16 08:02:56 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Apply upstream patch to fix upstream ffmpeg version (issue#21603)
-- Update ffmpeg upstream version iused by kodi project
-
--------------------------------------------------------------------
-Wed Jul 20 09:08:29 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use gcc12 on TW.
-
--------------------------------------------------------------------
-Sun Mar 27 18:08:24 UTC 2022 - Giacomo Comes <gcomes.obs@gmail.com>
-
-- for Leap 15.4 use BuildRequires libplist-2.0
-
--------------------------------------------------------------------
-Wed Mar  9 08:30:03 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.4 Matrix
-  * Don't rely on legacy versions of packages fmt and spdlog for
-    openSUSE_Tumbleweed anymore. Package deletion for
-    Multimedia/A_tw-fmt and
-    Multimedia/A_tw-spdlog requested.
-
--------------------------------------------------------------------
-Sun Oct 31 10:55:49 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.3 Matrix
-  * Add new file /usr/share/metainfo/org.xbmc.kodi.metainfo.xml
-
--------------------------------------------------------------------
-Sun Oct 10 08:01:57 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.2 Matrix
-
--------------------------------------------------------------------
-Sun Jun 13 07:24:30 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Tumbleweed no longer has gcc9; switch to gcc10 for TW.
-
--------------------------------------------------------------------
-Thu May 13 08:42:03 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.1 Matrix
-- libnfs must be at least version 4.0.0
-
--------------------------------------------------------------------
-Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.0 Matrix
-
--------------------------------------------------------------------
-Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
-
-- SSE does not depend on buildhost
-
--------------------------------------------------------------------
-Mon Oct 26 15:13:26 UTC 2020 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 18.9 Leia 
-    * Work around third-party changes to HTTP2 and SSL/encryption
-      that impacted internet access from Kodi by scrapers, streaming
-      addons, etc.
-    * Fix memory leaks in TexturePacker
-    * Fix event server unable to send raw key strikes
-    * Fix issues around directory navigation and incorrectly-set
-      start directories
-    * Fix MediaCodec OES/EGL rendering
-
--------------------------------------------------------------------
-Fri Jul 31 04:48:19 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.8 Leia 
-
--------------------------------------------------------------------
-Fri May 22 09:57:08 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Fri May 22 03:40:54 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Mon Mar  9 11:30:15 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.6 Leia 
-- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied,
-  remove it.
-
--------------------------------------------------------------------
-Thu Dec  5 16:32:26 UTC 2019 - olaf@aepfle.de
-
-- Use flatbuffers from OBS
-- Use fmt from OBS
-- Use fstrcmp from OBS
-- Use rapidjson from OBS
-- Disable bluez on SLE_12
-
--------------------------------------------------------------------
-Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.5 Leia 
-
--------------------------------------------------------------------
-Thu Oct 31 09:36:52 UTC 2019 - manfred.h@gmx.net
-
-- Use gcc-9/g++-9 on Tumbleweed/Factory.
-
--------------------------------------------------------------------
-Wed Sep  4 03:27:01 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.4 Leia 
-
--------------------------------------------------------------------
-Sun Jun 23 17:10:24 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.3 Leia 
-
--------------------------------------------------------------------
-Tue Apr 23 06:00:58 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.2 Leia 
-
--------------------------------------------------------------------
-Sun Apr 14 03:24:09 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.1 Leia
-
--------------------------------------------------------------------
-Sat Feb  2 17:46:05 UTC 2019 - manfred.h@gmx.net
-
-- Add BuildRequires:  pkgconfig(lirc)
-
--------------------------------------------------------------------
-Wed Jan 30 15:02:39 UTC 2019 - sagiben@gmail.com
-
-- Version update to Kodi 18.0 Leia:
-  http://kodi.wiki/view/Kodi_v18_(Leia)_changelog 
-
--------------------------------------------------------------------
-Sun Jan 8 11:33:44 UTC 2019 - manfred.h@gmx.net
-
-- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.
-
--------------------------------------------------------------------
-Wed Jan 31 08:30:39 UTC 2018 - guillaume@opensuse.org
-
-- Add missing 'l' alias
-- Fix conflict between kodi and kodi-noX packages
-
--------------------------------------------------------------------
-Tue Jan 30 14:14:24 UTC 2018 - guillaume@opensuse.org
-
-- Enable build for %arm and aarch64 for kodi only
-
--------------------------------------------------------------------
-Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de
-
-- Version update to Kodi 17.6 Krypton 
-
--------------------------------------------------------------------
-Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de
-
-- Remove netcdf from BuildRequires
-  SLE_12 does not support it, and the private copy of ffmpeg will
-  most likely work just fine without it
-
--------------------------------------------------------------------
-Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com
-
-- Build with kodi's ffmpeg, version 17.x doesn't work with 
-  ffmpeg 3.4.
-- Added kodi-tools-libdir.patch to fix libdvd build.
-- Added unneeded return to switch statements in libdvdnav-master
-  vmget.c to silence rpmlint errors.
-
--------------------------------------------------------------------
-Sat Oct 28 14:02:40 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.5 Krypton 
-
--------------------------------------------------------------------
-Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
-
-- Use BuildRequires and configure options as checked by configure.ac
-
--------------------------------------------------------------------
-Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
-
-- Remove obsolete patch: add_rpi2_support.patch
-
--------------------------------------------------------------------
-Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.4 Krypton 
-
--------------------------------------------------------------------
-Fri May 26 03:26:29 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.3 Krypton
-  A minor bug fix and security release 
-
--------------------------------------------------------------------
-Wed May 24 04:42:41 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.2 Krypton 
-
--------------------------------------------------------------------
 Tue Mar 21 19:23:19 UTC 2017 - sagiben@gmail.com
 
 - Version update to Kodi 17.1 Krypton

kodi.changes Changed

@@ -1,390 +1,4 @@
 -------------------------------------------------------------------
-Sat Nov  9 10:43:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Restrict swig version to < 4.2; newer versions on Tumbleweed do
-  not accept all options used by kodi.
-
--------------------------------------------------------------------
-Sun Aug 18 08:14:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.1 Omega
-
--------------------------------------------------------------------
-Tue May 14 09:50:06 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure to stick with ffmpeg-6 related packages for building.
-
--------------------------------------------------------------------
-Wed May  8 09:39:58 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use https:// URLs only.
-- Pipewire currently creates more issues than benefits on Leap;
-  use new conditional "kodi_without_pipewire" to enable or disable it.
-  We default to disable it now on Leap.
-
--------------------------------------------------------------------
-Mon Apr 22 15:59:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-kodi-workaround-pipewire-bug.patch to work around a
-  potentially broken pipewire installation on openSUSE Leap 15.5
-  and 15.6; see https://bugzilla.opensuse.org/show_bug.cgi?id=1222636
-
--------------------------------------------------------------------
-Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0 Omega
-
--------------------------------------------------------------------
-Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc2 Omega
-
--------------------------------------------------------------------
-Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Always assume "with sysffmpeg": All of our target platforms have
-  a suitable version of ffmpeg packages, therefore comment most of
-  the "with/without sysffmpeg" stuff which helps to avoid
-  downloading an outdated tarball which doesn't get used at all.
-- Make all other SourceN archives downloadable via _service.
-- Do not restrict the Java version anymore.
-
--------------------------------------------------------------------
-Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0rc1 Omega
-- Remove 0004-xbmc#24733.patch
-
--------------------------------------------------------------------
-Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Add 0004-xbmc#24733.patch to fix
-  * https://github.com/kodi-pvr/pvr.vuplus/issues/449
-  * https://github.com/xbmc/xbmc/issues/24629
-- Use %%autopatch -p1 to make RPM-4.19 happy.
-
--------------------------------------------------------------------
-Fri Feb 16 08:52:21 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b3 Omega
-- Update build time dependendies.
-- Add binary tarball for apache-groovy as Source25.
-- Cleanup patches no longer needed:
-  crossguid_build64.patch, disable_internal_libdvd.patch,
-  kodi-15.0-gcc5.patch, kodi-apply-dvdrun.patch,
-  kodi-libdrm.patch, kodi-sse.patch, kodi-texturepacker.patch,
-  kodi-tools-libdir.patch, kodi.aarch64.patch, kodi.arm.patch,
-  kodi.cximage.gcc6.patch, libdvdnav-no-return.patch,
-  no-xbmc-symbolic-link.patch
-- Rename .patch files to include a series number.
-
--------------------------------------------------------------------
-Wed Jan 10 11:35:56 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use python3.11 on all platforms.
-- Restore the "|| l" in case of a make failure
-- Add crossguid-dgb.patch as Patch3 to remove some strange
-  libcrossguid-dgb references.
-- Update build time dependendies.
-- Update package files lists.
-- Ensure kodi-TexturePacker is installed and not TexturePacker.
-- Remove fix_building_with_fmt10.patch which is no longer needed.
-- Remove ffmpeg-4.3.1-ogg.patch and kodi-apply-ffmpeg.patch which
-  are no longer needed/wanted.
-- Add source tarball for libudfread as Source24.
-
--------------------------------------------------------------------
-Mon Dec 18 17:56:31 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 21.0b2 Omega
-
--------------------------------------------------------------------
-Tue Dec  5 12:31:48 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Unban fmt10, but add new patch fix_building_with_fmt10.patch
-  derived from https://github.com/xbmc/xbmc/pull/23453 to fix
-  building on current TW with updated libfmt10 and libspdlog12.
-- Remove "alias l=..." and replace its use with the real command
-
--------------------------------------------------------------------
-Fri Nov  3 10:00:39 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Don't use java >= 21 for building yet.
-
--------------------------------------------------------------------
-Fri Aug 25 09:47:30 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use the system's default compiler on Tumbleweed
-- Enable pipewire support
-
--------------------------------------------------------------------
-Thu Jul 13 10:07:34 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 20.2 Nexus 
-
--------------------------------------------------------------------
-Sun May 21 09:48:40 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Ensure fmt10 is banned for now.
-
--------------------------------------------------------------------
-Fri Mar 17 12:07:25 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.1 Nexus 
-
--------------------------------------------------------------------
-Mon Jan 16 08:51:51 UTC 2023 - Sagi Ben <sagiben@gmail.com>
-
-- Version update to Kodi 20.0 Nexus 
-
--------------------------------------------------------------------
-Mon Jan  2 09:08:35 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch as "fix_import_eglextchromium.patch" to fix
-  compilation failure "EGL/eglextchromium.h: No such file or directory"
-  with recent Mesa versions on TW; taken from
-  https://github.com/xbmc/xbmc/pull/22291/commits/5449652abf0bb9dddd0d796de4120e60f19f89a5
-
--------------------------------------------------------------------
-Mon Dec 26 11:28:01 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- 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
-
--------------------------------------------------------------------
-Sun Dec 18 11:28:53 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Rewrite the ffmpeg specific version range using the proper rpm
-  syntax: (cond1 with cond2)
-
--------------------------------------------------------------------
-Sat Dec  3 11:28:18 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Explicitly request packages from the ffmpeg-4 branch to avoid
-  pulling in ffmpeg-5 on TW
-
--------------------------------------------------------------------
-Sun Oct 16 09:42:25 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Apply upstream patch to fix "formatting of non-void pointers is
-  disallowed" on Tumbleweed caused by libfmt9; taken from
-  https://github.com/xbmc/xbmc/commit/1d4e27aaa64c317b0020bbd68bb6520d507bb48e
-  and
-  https://github.com/xbmc/xbmc/commit/0ea4ec6e8965848ebe22e27c44ddfd8ab60a8bb6
-
--------------------------------------------------------------------
-Tue Aug 16 08:02:56 UTC 2022 - Dr. Werner Fink <werner@suse.de>
-
-- Apply upstream patch to fix upstream ffmpeg version (issue#21603)
-- Update ffmpeg upstream version iused by kodi project
-
--------------------------------------------------------------------
-Wed Jul 20 09:08:29 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Use gcc12 on TW.
-
--------------------------------------------------------------------
-Sun Mar 27 18:08:24 UTC 2022 - Giacomo Comes <gcomes.obs@gmail.com>
-
-- for Leap 15.4 use BuildRequires libplist-2.0
-
--------------------------------------------------------------------
-Wed Mar  9 08:30:03 UTC 2022 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.4 Matrix
-  * Don't rely on legacy versions of packages fmt and spdlog for
-    openSUSE_Tumbleweed anymore. Package deletion for
-    Multimedia/A_tw-fmt and
-    Multimedia/A_tw-spdlog requested.
-
--------------------------------------------------------------------
-Sun Oct 31 10:55:49 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.3 Matrix
-  * Add new file /usr/share/metainfo/org.xbmc.kodi.metainfo.xml
-
--------------------------------------------------------------------
-Sun Oct 10 08:01:57 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.2 Matrix
-
--------------------------------------------------------------------
-Sun Jun 13 07:24:30 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Tumbleweed no longer has gcc9; switch to gcc10 for TW.
-
--------------------------------------------------------------------
-Thu May 13 08:42:03 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.1 Matrix
-- libnfs must be at least version 4.0.0
-
--------------------------------------------------------------------
-Tue Mar  9 13:56:45 UTC 2021 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 19.0 Matrix
-
--------------------------------------------------------------------
-Thu Dec 31 09:09:09 UTC 2020 - olaf@aepfle.de
-
-- SSE does not depend on buildhost
-
--------------------------------------------------------------------
-Mon Oct 26 15:13:26 UTC 2020 - Manfred Hollstein <manfred.h@gmx.net>
-
-- Version update to Kodi 18.9 Leia 
-    * Work around third-party changes to HTTP2 and SSL/encryption
-      that impacted internet access from Kodi by scrapers, streaming
-      addons, etc.
-    * Fix memory leaks in TexturePacker
-    * Fix event server unable to send raw key strikes
-    * Fix issues around directory navigation and incorrectly-set
-      start directories
-    * Fix MediaCodec OES/EGL rendering
-
--------------------------------------------------------------------
-Fri Jul 31 04:48:19 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.8 Leia 
-
--------------------------------------------------------------------
-Fri May 22 09:57:08 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Fri May 22 03:40:54 UTC 2020 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.7 Leia 
-
--------------------------------------------------------------------
-Mon Mar  9 11:30:15 UTC 2020 - manfred.h@gmx.net
-
-- Version update to Kodi 18.6 Leia 
-- 1157e9a11218945a14d9272814e78509c3e5b6c6.patch has been applied,
-  remove it.
-
--------------------------------------------------------------------
-Thu Dec  5 16:32:26 UTC 2019 - olaf@aepfle.de
-
-- Use flatbuffers from OBS
-- Use fmt from OBS
-- Use fstrcmp from OBS
-- Use rapidjson from OBS
-- Disable bluez on SLE_12
-
--------------------------------------------------------------------
-Mon Nov 18 18:01:33 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.5 Leia 
-
--------------------------------------------------------------------
-Thu Oct 31 09:36:52 UTC 2019 - manfred.h@gmx.net
-
-- Use gcc-9/g++-9 on Tumbleweed/Factory.
-
--------------------------------------------------------------------
-Wed Sep  4 03:27:01 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.4 Leia 
-
--------------------------------------------------------------------
-Sun Jun 23 17:10:24 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.3 Leia 
-
--------------------------------------------------------------------
-Tue Apr 23 06:00:58 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.2 Leia 
-
--------------------------------------------------------------------
-Sun Apr 14 03:24:09 UTC 2019 - Sagi <sagiben@gmail.com>
-
-- Version update to Kodi 18.1 Leia
-
--------------------------------------------------------------------
-Sat Feb  2 17:46:05 UTC 2019 - manfred.h@gmx.net
-
-- Add BuildRequires:  pkgconfig(lirc)
-
--------------------------------------------------------------------
-Wed Jan 30 15:02:39 UTC 2019 - sagiben@gmail.com
-
-- Version update to Kodi 18.0 Leia:
-  http://kodi.wiki/view/Kodi_v18_(Leia)_changelog 
-
--------------------------------------------------------------------
-Sun Jan 8 11:33:44 UTC 2019 - manfred.h@gmx.net
-
-- kodi-libdrm.patch: Add patch to ensure DRM_FORMAT_GR1616 is defined.
-
--------------------------------------------------------------------
-Wed Jan 31 08:30:39 UTC 2018 - guillaume@opensuse.org
-
-- Add missing 'l' alias
-- Fix conflict between kodi and kodi-noX packages
-
--------------------------------------------------------------------
-Tue Jan 30 14:14:24 UTC 2018 - guillaume@opensuse.org
-
-- Enable build for %arm and aarch64 for kodi only
-
--------------------------------------------------------------------
-Fri Dec 22 07:27:37 UTC 2017 - olaf@aepfle.de
-
-- Version update to Kodi 17.6 Krypton 
-
--------------------------------------------------------------------
-Sun Dec 10 22:41:00 UTC 2017 - olaf@aepfle.de
-
-- Remove netcdf from BuildRequires
-  SLE_12 does not support it, and the private copy of ffmpeg will
-  most likely work just fine without it
-
--------------------------------------------------------------------
-Mon Nov 20 09:49:03 UTC 2017 - davejplater@gmail.com
-
-- Build with kodi's ffmpeg, version 17.x doesn't work with 
-  ffmpeg 3.4.
-- Added kodi-tools-libdir.patch to fix libdvd build.
-- Added unneeded return to switch statements in libdvdnav-master
-  vmget.c to silence rpmlint errors.
-
--------------------------------------------------------------------
-Sat Oct 28 14:02:40 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.5 Krypton 
-
--------------------------------------------------------------------
-Mon Oct 23 06:09:50 UTC 2017 - olaf@aepfle.de
-
-- Use BuildRequires and configure options as checked by configure.ac
-
--------------------------------------------------------------------
-Thu Oct 12 06:43:42 UTC 2017 - guillaume@opensuse.org
-
-- Remove obsolete patch: add_rpi2_support.patch
-
--------------------------------------------------------------------
-Wed Aug 23 05:10:49 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.4 Krypton 
-
--------------------------------------------------------------------
-Fri May 26 03:26:29 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.3 Krypton
-  A minor bug fix and security release 
-
--------------------------------------------------------------------
-Wed May 24 04:42:41 UTC 2017 - sagiben@gmail.com
-
-- Version update to Kodi 17.2 Krypton 
-
--------------------------------------------------------------------
 Tue Mar 21 19:23:19 UTC 2017 - sagiben@gmail.com
 
 - Version update to Kodi 17.1 Krypton

kodi-noX-raspberry-pi.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package kodi
 #
-# Copyright (c) 2015-2024 SUSE LLC
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,265 +18,179 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Omega
+%define kodi_version Krypton
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
-
-# WARNING: Build with bundled ffmpeg until version 18.0 is reached
-# INFO: We are on version 21.0 in the meantime, so let's live with
-#  the system provided ffmpeg packages; if this won't work at some
-#  point in time in the future, uncomment the "sysffmpeg" stuff. In
-#  order to reduce downloading it every time, this is now commented!
-%bcond_without sysffmpeg
-## %if 0%{without sysffmpeg}
-## %define ffmpeg_version 5.1.2-Nexus-Alpha3
-## %endif
-
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%bcond_with kodi_with_X11
-# Enable or disable Wayland depending on whether the stack is usable or not:
-%if 0%{?suse_version} >= 1550
-%bcond_without kodi_with_wayland
+%define noX_build 1
+%if %{noX_build}
+# no X build needs openGL ES
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-%bcond_with kodi_with_wayland
-%endif
-
-%if 0%{?suse_version} < 1550
-# Pipewire currently creates more issues than benefits; disable it for now:
-%bcond_without kodi_without_pipewire
+%ifarch %arm armv6l armv6hl
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-# Leave PW enabled on Tumbleweed:
-%bcond_with kodi_without_pipewire
-%endif
-
-%define kodi_platform raspberry-pi
-%define kodi_player omxplayer
-
-%if %{with kodi_with_X11}
 %bcond_without enable_opengl
 %bcond_with enable_opengles
-%else
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
 %endif
-#
+%endif
 %bcond_without kodi_libbluray
-# 
-%bcond_without systemd
 
-ExclusiveArch: does-not-build
+%define kodi_platform raspberry-pi
+%define kodi_player omxplayer
 
 Name:           kodi-noX-raspberry-pi
-Version:        21.1
+Version:        17.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            https://kodi.tv/
+Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-
-# The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
-Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
-Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
-
-## %if 0%{without sysffmpeg}
-## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
-## %endif
-Patch1:         0001-crossguid-dgb.patch
-Patch2:         0002-kodi-install.patch
-%if %{without kodi_with_wayland}
-Patch3:         0003-kodi-disable-wayland.patch
-%endif
-%if %{without kodi_without_pipewire}
-Patch4:         0004-kodi-workaround-pipewire-bug.patch
-%endif
-
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  binutils-gold
+Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
+Patch4:         add_rpi2_support.patch
+#Patch6:         kodi.cximage.gcc6.patch
+BuildRequires:  avahi-devel
+BuildRequires:  boost-devel
+BuildRequires:  byacc
+BuildRequires:  ccache
+# needed to delete the fixed rpath introduced by smbclient
+BuildRequires:  chrpath
+BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  gawk
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Use the default compiler on Tumbleweed
-BuildRequires:	gcc
-BuildRequires:  gcc-c++
-%else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
+BuildRequires:  flex
+%if %{with enable_opengl}
+BuildRequires:  ftgl-devel
 %endif
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  giflib-devel
+BuildRequires:  glibc-devel
+BuildRequires:  gmp-devel
+BuildRequires:  gperf
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  java
+BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  ghostscript
-BuildRequires:  graphviz
-BuildRequires:  groff-full
-BuildRequires:  libtool
-BuildRequires:  pkg-config
-BuildRequires:  flatbuffers-devel
-BuildRequires:  pkgconfig(dav1d)
-BuildRequires:  pkgconfig(fmt)
-BuildRequires:  pkgconfig(fstrcmp)
-BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-BuildRequires:  libmysqlclient-devel
-BuildRequires:  pkgconfig(libass) >= 0.17.0
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  libgpg-error-devel
+BuildRequires:  libjasper-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libmysqlclient-devel
+#BuildRequires:  libsidplay2-1
+BuildRequires:  libstdc++-devel
+BuildRequires:  libtool
+BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(libcrypto)
-BuildRequires:  tinyxml-devel
-BuildRequires:  tinyxml2-devel
-BuildRequires:  pkgconfig(uuid)
-BuildRequires:  libyajl-devel >= 2
-BuildRequires:  pkgconfig(libidn2)
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio) >= 2.1.0
-BuildRequires:  pkgconfig(lirc)
-BuildRequires:  pkgconfig(RapidJSON)
-%if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
-%endif
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(dbus-1)
-# libmicrohttpd > 0.9.30
-BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libpulse) >= 1.0
-BuildRequires:  pkgconfig(avahi-client)
-BuildRequires:  pkgconfig(gbm)
-%if %{with kodi_with_X11}
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(xkbcommon)
-%endif
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(libnfs) >= 4.0.0
-%if 0%{?suse_version} >= 1550 || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} )
-BuildRequires:  pkgconfig(libplist-2.0)
-%else
-BuildRequires:  pkgconfig(libplist)
-%endif
+BuildRequires:  nasm
+BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(lcms2)
-%if 0%{?suse_version} > 1315
-BuildRequires:  pkgconfig(bluez)
+#BuildRequires:  sidplay-libs-devel
+BuildRequires:  swig
+BuildRequires:  tinyxml-devel
+BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
 %endif
-BuildRequires:  libcap-devel
-%if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 60 with pkgconfig(libavcodec) < 61)
-BuildRequires:  (pkgconfig(libavfilter) >= 9 with pkgconfig(libavfilter) < 10)
-BuildRequires:  (pkgconfig(libavformat) >= 60 with pkgconfig(libavformat) < 61)
-BuildRequires:  (pkgconfig(libavutil) >= 58 with pkgconfig(libavutil) < 59)
-BuildRequires:  (pkgconfig(libpostproc) >= 57 with pkgconfig(libpostproc) < 58)
-BuildRequires:  (pkgconfig(libswresample) >= 4 with pkgconfig(libswresample) < 5)
-BuildRequires:  (pkgconfig(libswscale) >= 7 with pkgconfig(libswscale) < 8)
-%else
-BuildRequires:  ladspa-devel
-BuildRequires:  libgsm-devel
-BuildRequires:  pkg-config
 BuildRequires:  yasm
+BuildRequires:  zip
+BuildRequires:  libx265-devel
+
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(celt) >= 0.11.0
+BuildRequires:  pkgconfig(dcadec)
+BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(glew)
+%endif
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdc1394-2)
-BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
-BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libass) >= 0.9.7
+BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
+BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
+#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
+#BuildRequires:  pkgconfig(libavformat) = 57.25.100
+#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+%endif
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libdca)
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libmodplug)
+BuildRequires:  pkgconfig(libmpeg2)
+BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libwebp) >= 0.4
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(opus)
-BuildRequires:  pkgconfig(schroedinger-1.0)
-BuildRequires:  pkgconfig(sdl)
-BuildRequires:  pkgconfig(speex)
-BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(vpx) >= 1.3.0
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-render)
-BuildRequires:  pkgconfig(xcb-shape)
-BuildRequires:  pkgconfig(xcb-shm)
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  pkgconfig(opencore-amrnb)
-BuildRequires:  pkgconfig(twolame)
-BuildRequires:  pkgconfig(x264)
-BuildRequires:  pkgconfig(x265)
-%endif
-BuildRequires:  swig < 4.2
-BuildRequires:  java
-BuildRequires:  apache-commons-lang3
-BuildRequires:  apache-commons-text
-BuildRequires:  doxygen
+BuildRequires:  pkgconfig(libssh)
+#BuildRequires:  pkgconfig(libswresample) = 1.2.101
+BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  pkgconfig(libudev)
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(vdpau)
-%if 0%{?suse_version} < 1500
-BuildRequires:  pkgconfig(libva) >= 0.38
-BuildRequires:  pkgconfig(libva-x11) >= 0.38
-%else
-BuildRequires:  pkgconfig(libva) >= 1.0.0
-BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+BuildRequires:  pkgconfig(libva)
 %endif
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(nettle)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
+BuildRequires:  pkgconfig(sdl2)
 %endif
-BuildRequires:  pkgconfig(libdisplay-info)
-%if %{with kodi_with_wayland}
-BuildRequires:  pkgconfig(libva-wayland)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-scanner++)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-client++)
-BuildRequires:  pkgconfig(wayland-cursor++)
-BuildRequires:  pkgconfig(wayland-egl++)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(taglib) >= 1.8
+BuildRequires:  pkgconfig(tinyxml2)
+%if 0%{?suse_version} > 1320
+# Otherwise fails with configure error on libcec because udev.pc file is not found
+BuildRequires:  pkgconfig(udev)
 %endif
+BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(vdpau)
+%endif
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(zlib)
+
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -287,51 +201,28 @@
 %endif
 %endif
 %endif
-%if "%{kodi_player}" == "omxplayer"
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
+# Manage player deps
+%if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-BuildRequires:  cmake
-BuildRequires:  gperf
-BuildRequires:  unzip
-BuildRequires:  zip
-BuildRequires:  nasm
-%if %{dev_build}
-BuildRequires:  ccache
-%endif
-
-# cpluff
-BuildRequires:  pkgconfig(expat)
-
-# TexturePacker
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  giflib-devel
-BuildRequires:  libjpeg8-devel
-BuildRequires:  lzo-devel
-#
-BuildRequires:  pkgconfig(spdlog) > 1.8.0
-BuildRequires:  libunistring-devel
-
-%if 0%{?suse_version} > 1510
-BuildRequires:  pkgconfig(gtest)
-%else
-BuildRequires: googletest-devel
+# glxinfo is needed to check hw accel
+%if 0%{?suse_version} >= 1220
+%if !%{noX_build}
+Requires:       Mesa-demo-x
+Requires:       xdpyinfo
 %endif
-
-%if %{without kodi_without_pipewire}
-# pipewire
-BuildRequires: pkgconfig(libpipewire-0.3)
-BuildRequires: pkgconfig(libspa-0.2)
 %endif
-#
-%{?systemd_requires}
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{with kodi_with_X11}
+ExcludeArch:    ppc64
+%if %{noX_build}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -349,7 +240,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{with kodi_with_X11}
+%if %{noX_build}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -360,106 +251,128 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%autopatch -p1
-
-%build
+%patch1
+%patch2
+%patch3
+%patch4 -p0
+#%patch6 -p1
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
 
-# Set the final version string
+# Set the final version string 
 cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/platform/linux/*.cpp
+    xbmc/linux/*.cpp
+
+cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
+
+%build
+
+# build crossguid
+make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
+		
+chmod +x bootstrap
+./bootstrap
+
+# add crossguid to INCLUDES and LIBS
+export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
+export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
+%configure \
+    --disable-libbluray \
+    --with-ffmpeg=shared \
+    --enable-airplay \
+    --enable-alsa \
+    --enable-avahi \
+    --enable-libcap \
+    --enable-libcec \
+    --enable-libusb \
+    --enable-mid \
+    --enable-mysql \
+    --enable-nfs \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-shared \
+    --enable-ssh \
+    --enable-texturepacker \
+    --enable-upnp \
+    --enable-webserver \
+%if %{with enable_opengl}
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-gl \
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
- export CC=gcc-9
- export CXX=g++-9
+    --disable-vaapi \
+    --disable-vdpau \
+    --disable-gl \
+%endif
+%if %{with enable_opengles}
+    --enable-gles \
 %else
- export CC=gcc-8
- export CXX=g++-8
+    --disable-gles \
 %endif
+%if "%{kodi_platform}" != "none"
+    --with-platform=%{kodi_platform} \
 %endif
-
-# Extract the groovy files to a proper place:
-mkdir -p %{_builddir}/groovy
-unzip %{SOURCE25} -d %{_builddir}/groovy
-mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
-rm -rf %{_builddir}/groovy/groovy-* || true
-
-%cmake \
-%ifarch i586
-    -DCMAKE_C_FLAGS='-msse' \
+%if %{with kodi_libbluray}
+    --enable-libbluray \
+%endif
+%if "%{kodi_player}" != "none"
+    --enable-player="%{kodi_player}" \
+%endif
+%ifarch armv7l armv7hl
+    --enable-tegra \
+    --disable-neon \
+%endif
+%if %{noX_build}
+    --disable-x11 \
+    --disable-xrandr \
+    --disable-sdl \
+    --disable-joystick \
 %endif
 %if %{dev_build}
-    -DVERBOSE=ON \
+    --enable-debug \
+    --enable-ccache \
 %endif
-%if %{with kodi_with_wayland}
-    -DWAYLANDPP_INCLUDE_DIR="$(pkg-config --cflags-only-I wayland-client++ | sed -e 's/^-I//;s/ -I/;/g;s/ $//')" \
+%if !%{dev_build}
+    --disable-debug \
+    --disable-ccache \
 %endif
-    -DCMAKE_C_COMPILER=$CC \
-    -DCMAKE_CXX_COMPILER=$CXX \
-    -DENABLE_INTERNAL_FMT=OFF \
-%if %{without sysffmpeg}
-    -DENABLE_INTERNAL_FFMPEG=ON \
-    -DFFMPEG_URL=%{SOURCE30} \
-%else
-    -DENABLE_INTERNAL_FFMPEG=OFF \
-%endif
-    -DENABLE_INTERNAL_CDIO=OFF \
-    -DENABLE_INTERNAL_SPDLOG=OFF \
-    -DCROSSGUID_URL=%{SOURCE20} \
-    -DLIBDVDNAV_URL=%{SOURCE21} \
-    -DLIBDVDCSS_URL=%{SOURCE22} \
-    -DLIBDVDREAD_URL=%{SOURCE23} \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DENABLE_INTERNAL_FLATBUFFERS=OFF \
-    -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DENABLE_INTERNAL_UDFREAD=ON \
-    -DUDFREAD_URL=%{SOURCE24} \
-    -Dgroovy_SOURCE_DIR=%{_builddir}/groovy \
-    -Dapache-commons-lang_SOURCE_DIR=%{_datadir}/java \
-    -Dapache-commons-text_SOURCE_DIR=%{_datadir}/java/apache-commons-text \
-    -DAPP_RENDER_SYSTEM=gl \
-    -DX11_RENDER_SYSTEM=gl \
-    -DBUILD_SHARED_LIBS=1 \
-    -DPYTHON_VER=3.11 \
-%if %{with kodi_without_pipewire}
-    -DENABLE_PIPEWIRE=OFF \
-%endif
-    ${NULL}
-
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
-rm -rf %{_builddir}/groovy
+    --disable-optimizations \
+    --disable-static 
+
+make %{?_smp_mflags}
 
 %install
-pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-# Tumbleweed does not have SuSEfirewall anymore:
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 
 # Systemd service file
-%if %{without kodi_with_X11}
+%if %{noX_build}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -468,6 +381,10 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
+# copy manpages
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -485,26 +402,10 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
-# copy manpages
-popd
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-%if %{without kodi_with_wayland}
-rm -f %{buildroot}%{_datadir}/wayland-sessions/kodi-gbm.desktop
-rmdir -p %{buildroot}%{_datadir}/wayland-sessions || true
-%endif
-
-# TexturePacker likes to be installed as kodi-TexturePacker, too.
-if  -f %{buildroot}%{_bindir}/kodi-TexturePacker  &&  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    rm -f %{buildroot}%{_bindir}/TexturePacker
-elif  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    mv %{buildroot}%{_bindir}/TexturePacker %{buildroot}%{_bindir}/kodi-TexturePacker
-fi
 %fdupes %{buildroot}
 
 %pre
@@ -521,26 +422,25 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%doc copying.txt LICENSE.GPL docs/README.linux
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 %{_bindir}/kodi
-%{_bindir}/kodi-standalone
-%{_bindir}/kodi-TexturePacker
 %dir %{_libdir}/kodi
-%if %{with kodi_with_X11}
-%{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
+%if !%{noX_build}
+%{_libdir}/kodi/kodi-xrandr
 %endif
+%{_bindir}/kodi-standalone
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/library.xbmc.addon/
+%{_libdir}/kodi/addons/library.xbmc.addon/*
+%dir %{_libdir}/kodi/addons/library.xbmc.codec/
+%{_libdir}/kodi/addons/library.xbmc.codec/*
+%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
+%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
-%if %{with kodi_with_wayland}
-%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/kodi-gbm.desktop
-%endif
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/*/*.png
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -555,13 +455,9 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/game.controller.keyboard
-%{_kodi_addons_dir}/game.controller.keyboard/*
-%dir %{_kodi_addons_dir}/game.controller.mouse
-%{_kodi_addons_dir}/game.controller.mouse/*
-%dir %{_kodi_addons_dir}/game.controller.snes
-%{_kodi_addons_dir}/game.controller.snes/*
+%{_kodi_addons_dir}/game.controller.default/* 
+%dir %{_kodi_addons_dir}/kodi.game
+%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -570,16 +466,20 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
+%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
+%{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
+%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
+%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
+%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
+%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
+%{_kodi_addons_dir}/metadata.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.tvdb.com/
+%{_kodi_addons_dir}/metadata.tvdb.com/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -594,6 +494,8 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
+%dir %{_kodi_addons_dir}/xbmc.codec/
+%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -604,147 +506,114 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
+%dir %{_kodi_addons_dir}/xbmc.pvr/
+%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
+%dir %{_kodi_addons_dir}/kodi.audiodecoder/
+%{_kodi_addons_dir}/kodi.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.guilib/
+%{_kodi_addons_dir}/kodi.guilib/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
+%dir %{_kodi_addons_dir}/xbmc.audioencoder/
+%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
+%dir %{_kodi_addons_dir}/kodi.adsp
+%{_kodi_addons_dir}/kodi.adsp/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
+%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
-%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
-%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
+%dir %{_kodi_addons_dir}/kodi.inputstream
+%{_kodi_addons_dir}/kodi.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.peripheral
+%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/skin.estouchy
+%{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
-%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
-%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.general
-%{_kodi_addons_dir}/kodi.binary.global.general/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.gui
-%{_kodi_addons_dir}/kodi.binary.global.gui/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.main
-%{_kodi_addons_dir}/kodi.binary.global.main/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.network
-%{_kodi_addons_dir}/kodi.binary.global.network/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
-%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.game
-%{_kodi_addons_dir}/kodi.binary.instance.game/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
-%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
-%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
-%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
-%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
-%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
-%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
-%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
-%dir %{_kodi_addons_dir}/script.module.pycryptodome
-%{_kodi_addons_dir}/script.module.pycryptodome/*
-%dir %{_kodi_addons_dir}/metadata.generic.albums
-%{_kodi_addons_dir}/metadata.generic.albums/*
-%dir %{_kodi_addons_dir}/metadata.generic.artists
-%{_kodi_addons_dir}/metadata.generic.artists/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.tools
-%{_kodi_addons_dir}/kodi.binary.global.tools/*
-
-%dir %{_libdir}/firewalld
-%dir %{_libdir}/firewalld/services
-%{_libdir}/firewalld/services/kodi-eventserver.xml
-%{_libdir}/firewalld/services/kodi-http.xml
-%{_libdir}/firewalld/services/kodi-jsonrpc.xml
-
-%if %{without kodi_with_X11}
+%dir %{_libdir}/kodi/addons/library.kodi.guilib/
+%{_libdir}/kodi/addons/library.kodi.guilib/*
+%dir %{_libdir}/kodi/addons/library.kodi.adsp
+%{_libdir}/kodi/addons/library.kodi.adsp/*
+%dir %{_libdir}/kodi/addons/library.kodi.audioengine
+%{_libdir}/kodi/addons/library.kodi.audioengine/*
+%dir %{_libdir}/kodi/addons/library.kodi.inputstream
+%{_libdir}/kodi/addons/library.kodi.inputstream/*
+%dir %{_libdir}/kodi/addons/library.kodi.peripheral
+%{_libdir}/kodi/addons/library.kodi.peripheral/*
+
+%if %{noX_build}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service
 %endif
 
-%dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/AddonHelpers.cmake
-%{_datadir}/kodi/cmake/AddOptions.cmake
-%{_datadir}/kodi/cmake/ArchSetup.cmake
-%{_datadir}/kodi/cmake/CheckCommits.cmake
-%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
-%{_datadir}/kodi/cmake/GeneratorSetup.cmake
-%{_datadir}/kodi/cmake/HandleDepends.cmake
-%{_datadir}/kodi/cmake/Macros.cmake
-%{_datadir}/kodi/cmake/PrepareEnv.cmake
-%{_datadir}/kodi/cmake/ProjectMacros.cmake
-%{_datadir}/kodi/cmake/PathSetup.cmake
-%dir %{_libdir}/kodi/cmake
-%{_libdir}/kodi/cmake/KodiConfig.cmake
-
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
+%{_libdir}/kodi/AddOptions.cmake
+%{_libdir}/kodi/AddonHelpers.cmake
+%{_libdir}/kodi/ArchSetup.cmake
+%{_libdir}/kodi/CheckCommits.cmake
+%{_libdir}/kodi/CheckTargetPlatform.cmake
+%{_libdir}/kodi/GenerateVersionedFiles.cmake
+%{_libdir}/kodi/GeneratorSetup.cmake
+%{_libdir}/kodi/HandleDepends.cmake
+%{_libdir}/kodi/KodiConfig.cmake
+%{_libdir}/kodi/Macros.cmake
+%{_libdir}/kodi/PrepareEnv.cmake
+%{_libdir}/kodi/ProjectMacros.cmake
+%{_libdir}/kodi/CMakeHelpers.cmake
+%{_libdir}/kodi/Uninstall.cmake
+
+
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/AudioEngine.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/General.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/versions.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/*
-%dir %{_includedir}/kodi/addon-instance/inputstream
-%{_includedir}/kodi/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/addon-instance/peripheral
-%{_includedir}/kodi/addon-instance/peripheral/*
-%dir %{_includedir}/kodi/addon-instance/pvr
-%{_includedir}/kodi/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api
-%{_includedir}/kodi/c-api/*
-%dir %{_includedir}/kodi/c-api/addon-instance
-%{_includedir}/kodi/c-api/addon-instance/*
-%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
-%{_includedir}/kodi/c-api/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/c-api/addon-instance/pvr
-%{_includedir}/kodi/c-api/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api/gui
-%{_includedir}/kodi/c-api/gui/*
-%dir %{_includedir}/kodi/c-api/gui/controls
-%{_includedir}/kodi/c-api/gui/controls/*
-%dir %{_includedir}/kodi/c-api/gui/dialogs
-%{_includedir}/kodi/c-api/gui/dialogs/*
-%dir %{_includedir}/kodi/c-api/gui/input
-%{_includedir}/kodi/c-api/gui/input/*
-%dir %{_includedir}/kodi/c-api/platform
-%dir %{_includedir}/kodi/c-api/platform/android
-%{_includedir}/kodi/c-api/platform/android/*
-%dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/*
-%dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/*
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/*
-%dir %{_includedir}/kodi/gui/gl
-%{_includedir}/kodi/gui/gl/*
-%dir %{_includedir}/kodi/gui/input
-%{_includedir}/kodi/gui/input/*
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/*
+%{_includedir}/kodi/AEChannelData.h
+%{_includedir}/kodi/DVDDemuxPacket.h
+%{_includedir}/kodi/IFileTypes.h
+%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/libXBMC_codec.h
+%{_includedir}/kodi/libXBMC_pvr.h
+%{_includedir}/kodi/libKODI_adsp.h
+%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/libKODI_guilib.h
+%{_includedir}/kodi/libKODI_inputstream.h
+%{_includedir}/kodi/libKODI_peripheral.h
+%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_addon_dll.h
+%{_includedir}/kodi/xbmc_addon_types.h
+%{_includedir}/kodi/xbmc_codec_types.h
+%{_includedir}/kodi/xbmc_epg_types.h
+%{_includedir}/kodi/xbmc_pvr_dll.h
+%{_includedir}/kodi/xbmc_pvr_types.h
+%{_includedir}/kodi/xbmc_scr_dll.h
+%{_includedir}/kodi/xbmc_scr_types.h
+%{_includedir}/kodi/xbmc_vis_dll.h
+%{_includedir}/kodi/xbmc_vis_types.h
+%{_includedir}/kodi/xbmc_audioenc_dll.h
+%{_includedir}/kodi/xbmc_audioenc_types.h
+%{_includedir}/kodi/kodi_audiodec_dll.h
+%{_includedir}/kodi/kodi_audiodec_types.h
+%{_includedir}/kodi/kodi_adsp_dll.h
+%{_includedir}/kodi/kodi_adsp_types.h
+%{_includedir}/kodi/kodi_audioengine_types.h
+%{_includedir}/kodi/kodi_inputstream_dll.h
+%{_includedir}/kodi/kodi_inputstream_types.h
+%{_includedir}/kodi/kodi_peripheral_callbacks.h
+%{_includedir}/kodi/kodi_peripheral_dll.h
+%{_includedir}/kodi/kodi_peripheral_types.h
+%{_includedir}/kodi/kodi_peripheral_utils.hpp
+%{_includedir}/kodi/kodi_vfs_types.h
+%{_includedir}/kodi/kodi_vfs_utils.hpp
+
 
 %changelog

kodi-noX-raspberry-pi2.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package kodi
 #
-# Copyright (c) 2015-2024 SUSE LLC
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,265 +18,179 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Omega
+%define kodi_version Krypton
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
-
-# WARNING: Build with bundled ffmpeg until version 18.0 is reached
-# INFO: We are on version 21.0 in the meantime, so let's live with
-#  the system provided ffmpeg packages; if this won't work at some
-#  point in time in the future, uncomment the "sysffmpeg" stuff. In
-#  order to reduce downloading it every time, this is now commented!
-%bcond_without sysffmpeg
-## %if 0%{without sysffmpeg}
-## %define ffmpeg_version 5.1.2-Nexus-Alpha3
-## %endif
-
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%bcond_with kodi_with_X11
-# Enable or disable Wayland depending on whether the stack is usable or not:
-%if 0%{?suse_version} >= 1550
-%bcond_without kodi_with_wayland
+%define noX_build 1
+%if %{noX_build}
+# no X build needs openGL ES
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-%bcond_with kodi_with_wayland
-%endif
-
-%if 0%{?suse_version} < 1550
-# Pipewire currently creates more issues than benefits; disable it for now:
-%bcond_without kodi_without_pipewire
+%ifarch %arm armv6l armv6hl
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-# Leave PW enabled on Tumbleweed:
-%bcond_with kodi_without_pipewire
-%endif
-
-%define kodi_platform raspberry-pi2
-%define kodi_player omxplayer
-
-%if %{with kodi_with_X11}
 %bcond_without enable_opengl
 %bcond_with enable_opengles
-%else
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
 %endif
-#
+%endif
 %bcond_without kodi_libbluray
-# 
-%bcond_without systemd
 
-ExclusiveArch: does-not-build
+%define kodi_platform raspberry-pi2
+%define kodi_player omxplayer
 
 Name:           kodi-noX-raspberry-pi2
-Version:        21.1
+Version:        17.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            https://kodi.tv/
+Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-
-# The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
-Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
-Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
-
-## %if 0%{without sysffmpeg}
-## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
-## %endif
-Patch1:         0001-crossguid-dgb.patch
-Patch2:         0002-kodi-install.patch
-%if %{without kodi_with_wayland}
-Patch3:         0003-kodi-disable-wayland.patch
-%endif
-%if %{without kodi_without_pipewire}
-Patch4:         0004-kodi-workaround-pipewire-bug.patch
-%endif
-
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  binutils-gold
+Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
+Patch4:         add_rpi2_support.patch
+#Patch6:         kodi.cximage.gcc6.patch
+BuildRequires:  avahi-devel
+BuildRequires:  boost-devel
+BuildRequires:  byacc
+BuildRequires:  ccache
+# needed to delete the fixed rpath introduced by smbclient
+BuildRequires:  chrpath
+BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  gawk
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Use the default compiler on Tumbleweed
-BuildRequires:	gcc
-BuildRequires:  gcc-c++
-%else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
+BuildRequires:  flex
+%if %{with enable_opengl}
+BuildRequires:  ftgl-devel
 %endif
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  giflib-devel
+BuildRequires:  glibc-devel
+BuildRequires:  gmp-devel
+BuildRequires:  gperf
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  java
+BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  ghostscript
-BuildRequires:  graphviz
-BuildRequires:  groff-full
-BuildRequires:  libtool
-BuildRequires:  pkg-config
-BuildRequires:  flatbuffers-devel
-BuildRequires:  pkgconfig(dav1d)
-BuildRequires:  pkgconfig(fmt)
-BuildRequires:  pkgconfig(fstrcmp)
-BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-BuildRequires:  libmysqlclient-devel
-BuildRequires:  pkgconfig(libass) >= 0.17.0
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  libgpg-error-devel
+BuildRequires:  libjasper-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libmysqlclient-devel
+#BuildRequires:  libsidplay2-1
+BuildRequires:  libstdc++-devel
+BuildRequires:  libtool
+BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(libcrypto)
-BuildRequires:  tinyxml-devel
-BuildRequires:  tinyxml2-devel
-BuildRequires:  pkgconfig(uuid)
-BuildRequires:  libyajl-devel >= 2
-BuildRequires:  pkgconfig(libidn2)
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio) >= 2.1.0
-BuildRequires:  pkgconfig(lirc)
-BuildRequires:  pkgconfig(RapidJSON)
-%if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
-%endif
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(dbus-1)
-# libmicrohttpd > 0.9.30
-BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libpulse) >= 1.0
-BuildRequires:  pkgconfig(avahi-client)
-BuildRequires:  pkgconfig(gbm)
-%if %{with kodi_with_X11}
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(xkbcommon)
-%endif
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(libnfs) >= 4.0.0
-%if 0%{?suse_version} >= 1550 || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} )
-BuildRequires:  pkgconfig(libplist-2.0)
-%else
-BuildRequires:  pkgconfig(libplist)
-%endif
+BuildRequires:  nasm
+BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(lcms2)
-%if 0%{?suse_version} > 1315
-BuildRequires:  pkgconfig(bluez)
+#BuildRequires:  sidplay-libs-devel
+BuildRequires:  swig
+BuildRequires:  tinyxml-devel
+BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
 %endif
-BuildRequires:  libcap-devel
-%if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 60 with pkgconfig(libavcodec) < 61)
-BuildRequires:  (pkgconfig(libavfilter) >= 9 with pkgconfig(libavfilter) < 10)
-BuildRequires:  (pkgconfig(libavformat) >= 60 with pkgconfig(libavformat) < 61)
-BuildRequires:  (pkgconfig(libavutil) >= 58 with pkgconfig(libavutil) < 59)
-BuildRequires:  (pkgconfig(libpostproc) >= 57 with pkgconfig(libpostproc) < 58)
-BuildRequires:  (pkgconfig(libswresample) >= 4 with pkgconfig(libswresample) < 5)
-BuildRequires:  (pkgconfig(libswscale) >= 7 with pkgconfig(libswscale) < 8)
-%else
-BuildRequires:  ladspa-devel
-BuildRequires:  libgsm-devel
-BuildRequires:  pkg-config
 BuildRequires:  yasm
+BuildRequires:  zip
+BuildRequires:  libx265-devel
+
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(celt) >= 0.11.0
+BuildRequires:  pkgconfig(dcadec)
+BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(glew)
+%endif
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdc1394-2)
-BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
-BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libass) >= 0.9.7
+BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
+BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
+#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
+#BuildRequires:  pkgconfig(libavformat) = 57.25.100
+#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+%endif
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libdca)
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libmodplug)
+BuildRequires:  pkgconfig(libmpeg2)
+BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libwebp) >= 0.4
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(opus)
-BuildRequires:  pkgconfig(schroedinger-1.0)
-BuildRequires:  pkgconfig(sdl)
-BuildRequires:  pkgconfig(speex)
-BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(vpx) >= 1.3.0
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-render)
-BuildRequires:  pkgconfig(xcb-shape)
-BuildRequires:  pkgconfig(xcb-shm)
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  pkgconfig(opencore-amrnb)
-BuildRequires:  pkgconfig(twolame)
-BuildRequires:  pkgconfig(x264)
-BuildRequires:  pkgconfig(x265)
-%endif
-BuildRequires:  swig < 4.2
-BuildRequires:  java
-BuildRequires:  apache-commons-lang3
-BuildRequires:  apache-commons-text
-BuildRequires:  doxygen
+BuildRequires:  pkgconfig(libssh)
+#BuildRequires:  pkgconfig(libswresample) = 1.2.101
+BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  pkgconfig(libudev)
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(vdpau)
-%if 0%{?suse_version} < 1500
-BuildRequires:  pkgconfig(libva) >= 0.38
-BuildRequires:  pkgconfig(libva-x11) >= 0.38
-%else
-BuildRequires:  pkgconfig(libva) >= 1.0.0
-BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+BuildRequires:  pkgconfig(libva)
 %endif
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(nettle)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
+BuildRequires:  pkgconfig(sdl2)
 %endif
-BuildRequires:  pkgconfig(libdisplay-info)
-%if %{with kodi_with_wayland}
-BuildRequires:  pkgconfig(libva-wayland)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-scanner++)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-client++)
-BuildRequires:  pkgconfig(wayland-cursor++)
-BuildRequires:  pkgconfig(wayland-egl++)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(taglib) >= 1.8
+BuildRequires:  pkgconfig(tinyxml2)
+%if 0%{?suse_version} > 1320
+# Otherwise fails with configure error on libcec because udev.pc file is not found
+BuildRequires:  pkgconfig(udev)
 %endif
+BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(vdpau)
+%endif
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(zlib)
+
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -287,51 +201,28 @@
 %endif
 %endif
 %endif
-%if "%{kodi_player}" == "omxplayer"
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
+# Manage player deps
+%if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-BuildRequires:  cmake
-BuildRequires:  gperf
-BuildRequires:  unzip
-BuildRequires:  zip
-BuildRequires:  nasm
-%if %{dev_build}
-BuildRequires:  ccache
-%endif
-
-# cpluff
-BuildRequires:  pkgconfig(expat)
-
-# TexturePacker
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  giflib-devel
-BuildRequires:  libjpeg8-devel
-BuildRequires:  lzo-devel
-#
-BuildRequires:  pkgconfig(spdlog) > 1.8.0
-BuildRequires:  libunistring-devel
-
-%if 0%{?suse_version} > 1510
-BuildRequires:  pkgconfig(gtest)
-%else
-BuildRequires: googletest-devel
+# glxinfo is needed to check hw accel
+%if 0%{?suse_version} >= 1220
+%if !%{noX_build}
+Requires:       Mesa-demo-x
+Requires:       xdpyinfo
 %endif
-
-%if %{without kodi_without_pipewire}
-# pipewire
-BuildRequires: pkgconfig(libpipewire-0.3)
-BuildRequires: pkgconfig(libspa-0.2)
 %endif
-#
-%{?systemd_requires}
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{with kodi_with_X11}
+ExcludeArch:    ppc64
+%if %{noX_build}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -349,7 +240,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{with kodi_with_X11}
+%if %{noX_build}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -360,106 +251,128 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%autopatch -p1
-
-%build
+%patch1
+%patch2
+%patch3
+%patch4 -p0
+#%patch6 -p1
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
 
-# Set the final version string
+# Set the final version string 
 cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/platform/linux/*.cpp
+    xbmc/linux/*.cpp
+
+cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
+
+%build
+
+# build crossguid
+make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
+		
+chmod +x bootstrap
+./bootstrap
+
+# add crossguid to INCLUDES and LIBS
+export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
+export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
+%configure \
+    --disable-libbluray \
+    --with-ffmpeg=shared \
+    --enable-airplay \
+    --enable-alsa \
+    --enable-avahi \
+    --enable-libcap \
+    --enable-libcec \
+    --enable-libusb \
+    --enable-mid \
+    --enable-mysql \
+    --enable-nfs \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-shared \
+    --enable-ssh \
+    --enable-texturepacker \
+    --enable-upnp \
+    --enable-webserver \
+%if %{with enable_opengl}
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-gl \
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
- export CC=gcc-9
- export CXX=g++-9
+    --disable-vaapi \
+    --disable-vdpau \
+    --disable-gl \
+%endif
+%if %{with enable_opengles}
+    --enable-gles \
 %else
- export CC=gcc-8
- export CXX=g++-8
+    --disable-gles \
 %endif
+%if "%{kodi_platform}" != "none"
+    --with-platform=%{kodi_platform} \
 %endif
-
-# Extract the groovy files to a proper place:
-mkdir -p %{_builddir}/groovy
-unzip %{SOURCE25} -d %{_builddir}/groovy
-mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
-rm -rf %{_builddir}/groovy/groovy-* || true
-
-%cmake \
-%ifarch i586
-    -DCMAKE_C_FLAGS='-msse' \
+%if %{with kodi_libbluray}
+    --enable-libbluray \
+%endif
+%if "%{kodi_player}" != "none"
+    --enable-player="%{kodi_player}" \
+%endif
+%ifarch armv7l armv7hl
+    --enable-tegra \
+    --disable-neon \
+%endif
+%if %{noX_build}
+    --disable-x11 \
+    --disable-xrandr \
+    --disable-sdl \
+    --disable-joystick \
 %endif
 %if %{dev_build}
-    -DVERBOSE=ON \
+    --enable-debug \
+    --enable-ccache \
 %endif
-%if %{with kodi_with_wayland}
-    -DWAYLANDPP_INCLUDE_DIR="$(pkg-config --cflags-only-I wayland-client++ | sed -e 's/^-I//;s/ -I/;/g;s/ $//')" \
+%if !%{dev_build}
+    --disable-debug \
+    --disable-ccache \
 %endif
-    -DCMAKE_C_COMPILER=$CC \
-    -DCMAKE_CXX_COMPILER=$CXX \
-    -DENABLE_INTERNAL_FMT=OFF \
-%if %{without sysffmpeg}
-    -DENABLE_INTERNAL_FFMPEG=ON \
-    -DFFMPEG_URL=%{SOURCE30} \
-%else
-    -DENABLE_INTERNAL_FFMPEG=OFF \
-%endif
-    -DENABLE_INTERNAL_CDIO=OFF \
-    -DENABLE_INTERNAL_SPDLOG=OFF \
-    -DCROSSGUID_URL=%{SOURCE20} \
-    -DLIBDVDNAV_URL=%{SOURCE21} \
-    -DLIBDVDCSS_URL=%{SOURCE22} \
-    -DLIBDVDREAD_URL=%{SOURCE23} \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DENABLE_INTERNAL_FLATBUFFERS=OFF \
-    -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DENABLE_INTERNAL_UDFREAD=ON \
-    -DUDFREAD_URL=%{SOURCE24} \
-    -Dgroovy_SOURCE_DIR=%{_builddir}/groovy \
-    -Dapache-commons-lang_SOURCE_DIR=%{_datadir}/java \
-    -Dapache-commons-text_SOURCE_DIR=%{_datadir}/java/apache-commons-text \
-    -DAPP_RENDER_SYSTEM=gl \
-    -DX11_RENDER_SYSTEM=gl \
-    -DBUILD_SHARED_LIBS=1 \
-    -DPYTHON_VER=3.11 \
-%if %{with kodi_without_pipewire}
-    -DENABLE_PIPEWIRE=OFF \
-%endif
-    ${NULL}
-
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
-rm -rf %{_builddir}/groovy
+    --disable-optimizations \
+    --disable-static 
+
+make %{?_smp_mflags}
 
 %install
-pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-# Tumbleweed does not have SuSEfirewall anymore:
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 
 # Systemd service file
-%if %{without kodi_with_X11}
+%if %{noX_build}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -468,6 +381,10 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
+# copy manpages
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -485,26 +402,10 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
-# copy manpages
-popd
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-%if %{without kodi_with_wayland}
-rm -f %{buildroot}%{_datadir}/wayland-sessions/kodi-gbm.desktop
-rmdir -p %{buildroot}%{_datadir}/wayland-sessions || true
-%endif
-
-# TexturePacker likes to be installed as kodi-TexturePacker, too.
-if  -f %{buildroot}%{_bindir}/kodi-TexturePacker  &&  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    rm -f %{buildroot}%{_bindir}/TexturePacker
-elif  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    mv %{buildroot}%{_bindir}/TexturePacker %{buildroot}%{_bindir}/kodi-TexturePacker
-fi
 %fdupes %{buildroot}
 
 %pre
@@ -521,26 +422,25 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%doc copying.txt LICENSE.GPL docs/README.linux
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 %{_bindir}/kodi
-%{_bindir}/kodi-standalone
-%{_bindir}/kodi-TexturePacker
 %dir %{_libdir}/kodi
-%if %{with kodi_with_X11}
-%{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
+%if !%{noX_build}
+%{_libdir}/kodi/kodi-xrandr
 %endif
+%{_bindir}/kodi-standalone
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/library.xbmc.addon/
+%{_libdir}/kodi/addons/library.xbmc.addon/*
+%dir %{_libdir}/kodi/addons/library.xbmc.codec/
+%{_libdir}/kodi/addons/library.xbmc.codec/*
+%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
+%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
-%if %{with kodi_with_wayland}
-%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/kodi-gbm.desktop
-%endif
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/*/*.png
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -555,13 +455,9 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/game.controller.keyboard
-%{_kodi_addons_dir}/game.controller.keyboard/*
-%dir %{_kodi_addons_dir}/game.controller.mouse
-%{_kodi_addons_dir}/game.controller.mouse/*
-%dir %{_kodi_addons_dir}/game.controller.snes
-%{_kodi_addons_dir}/game.controller.snes/*
+%{_kodi_addons_dir}/game.controller.default/* 
+%dir %{_kodi_addons_dir}/kodi.game
+%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -570,16 +466,20 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
+%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
+%{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
+%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
+%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
+%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
+%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
+%{_kodi_addons_dir}/metadata.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.tvdb.com/
+%{_kodi_addons_dir}/metadata.tvdb.com/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -594,6 +494,8 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
+%dir %{_kodi_addons_dir}/xbmc.codec/
+%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -604,147 +506,114 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
+%dir %{_kodi_addons_dir}/xbmc.pvr/
+%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
+%dir %{_kodi_addons_dir}/kodi.audiodecoder/
+%{_kodi_addons_dir}/kodi.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.guilib/
+%{_kodi_addons_dir}/kodi.guilib/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
+%dir %{_kodi_addons_dir}/xbmc.audioencoder/
+%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
+%dir %{_kodi_addons_dir}/kodi.adsp
+%{_kodi_addons_dir}/kodi.adsp/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
+%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
-%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
-%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
+%dir %{_kodi_addons_dir}/kodi.inputstream
+%{_kodi_addons_dir}/kodi.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.peripheral
+%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/skin.estouchy
+%{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
-%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
-%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.general
-%{_kodi_addons_dir}/kodi.binary.global.general/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.gui
-%{_kodi_addons_dir}/kodi.binary.global.gui/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.main
-%{_kodi_addons_dir}/kodi.binary.global.main/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.network
-%{_kodi_addons_dir}/kodi.binary.global.network/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
-%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.game
-%{_kodi_addons_dir}/kodi.binary.instance.game/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
-%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
-%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
-%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
-%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
-%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
-%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
-%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
-%dir %{_kodi_addons_dir}/script.module.pycryptodome
-%{_kodi_addons_dir}/script.module.pycryptodome/*
-%dir %{_kodi_addons_dir}/metadata.generic.albums
-%{_kodi_addons_dir}/metadata.generic.albums/*
-%dir %{_kodi_addons_dir}/metadata.generic.artists
-%{_kodi_addons_dir}/metadata.generic.artists/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.tools
-%{_kodi_addons_dir}/kodi.binary.global.tools/*
-
-%dir %{_libdir}/firewalld
-%dir %{_libdir}/firewalld/services
-%{_libdir}/firewalld/services/kodi-eventserver.xml
-%{_libdir}/firewalld/services/kodi-http.xml
-%{_libdir}/firewalld/services/kodi-jsonrpc.xml
-
-%if %{without kodi_with_X11}
+%dir %{_libdir}/kodi/addons/library.kodi.guilib/
+%{_libdir}/kodi/addons/library.kodi.guilib/*
+%dir %{_libdir}/kodi/addons/library.kodi.adsp
+%{_libdir}/kodi/addons/library.kodi.adsp/*
+%dir %{_libdir}/kodi/addons/library.kodi.audioengine
+%{_libdir}/kodi/addons/library.kodi.audioengine/*
+%dir %{_libdir}/kodi/addons/library.kodi.inputstream
+%{_libdir}/kodi/addons/library.kodi.inputstream/*
+%dir %{_libdir}/kodi/addons/library.kodi.peripheral
+%{_libdir}/kodi/addons/library.kodi.peripheral/*
+
+%if %{noX_build}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service
 %endif
 
-%dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/AddonHelpers.cmake
-%{_datadir}/kodi/cmake/AddOptions.cmake
-%{_datadir}/kodi/cmake/ArchSetup.cmake
-%{_datadir}/kodi/cmake/CheckCommits.cmake
-%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
-%{_datadir}/kodi/cmake/GeneratorSetup.cmake
-%{_datadir}/kodi/cmake/HandleDepends.cmake
-%{_datadir}/kodi/cmake/Macros.cmake
-%{_datadir}/kodi/cmake/PrepareEnv.cmake
-%{_datadir}/kodi/cmake/ProjectMacros.cmake
-%{_datadir}/kodi/cmake/PathSetup.cmake
-%dir %{_libdir}/kodi/cmake
-%{_libdir}/kodi/cmake/KodiConfig.cmake
-
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
+%{_libdir}/kodi/AddOptions.cmake
+%{_libdir}/kodi/AddonHelpers.cmake
+%{_libdir}/kodi/ArchSetup.cmake
+%{_libdir}/kodi/CheckCommits.cmake
+%{_libdir}/kodi/CheckTargetPlatform.cmake
+%{_libdir}/kodi/GenerateVersionedFiles.cmake
+%{_libdir}/kodi/GeneratorSetup.cmake
+%{_libdir}/kodi/HandleDepends.cmake
+%{_libdir}/kodi/KodiConfig.cmake
+%{_libdir}/kodi/Macros.cmake
+%{_libdir}/kodi/PrepareEnv.cmake
+%{_libdir}/kodi/ProjectMacros.cmake
+%{_libdir}/kodi/CMakeHelpers.cmake
+%{_libdir}/kodi/Uninstall.cmake
+
+
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/AudioEngine.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/General.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/versions.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/*
-%dir %{_includedir}/kodi/addon-instance/inputstream
-%{_includedir}/kodi/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/addon-instance/peripheral
-%{_includedir}/kodi/addon-instance/peripheral/*
-%dir %{_includedir}/kodi/addon-instance/pvr
-%{_includedir}/kodi/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api
-%{_includedir}/kodi/c-api/*
-%dir %{_includedir}/kodi/c-api/addon-instance
-%{_includedir}/kodi/c-api/addon-instance/*
-%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
-%{_includedir}/kodi/c-api/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/c-api/addon-instance/pvr
-%{_includedir}/kodi/c-api/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api/gui
-%{_includedir}/kodi/c-api/gui/*
-%dir %{_includedir}/kodi/c-api/gui/controls
-%{_includedir}/kodi/c-api/gui/controls/*
-%dir %{_includedir}/kodi/c-api/gui/dialogs
-%{_includedir}/kodi/c-api/gui/dialogs/*
-%dir %{_includedir}/kodi/c-api/gui/input
-%{_includedir}/kodi/c-api/gui/input/*
-%dir %{_includedir}/kodi/c-api/platform
-%dir %{_includedir}/kodi/c-api/platform/android
-%{_includedir}/kodi/c-api/platform/android/*
-%dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/*
-%dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/*
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/*
-%dir %{_includedir}/kodi/gui/gl
-%{_includedir}/kodi/gui/gl/*
-%dir %{_includedir}/kodi/gui/input
-%{_includedir}/kodi/gui/input/*
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/*
+%{_includedir}/kodi/AEChannelData.h
+%{_includedir}/kodi/DVDDemuxPacket.h
+%{_includedir}/kodi/IFileTypes.h
+%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/libXBMC_codec.h
+%{_includedir}/kodi/libXBMC_pvr.h
+%{_includedir}/kodi/libKODI_adsp.h
+%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/libKODI_guilib.h
+%{_includedir}/kodi/libKODI_inputstream.h
+%{_includedir}/kodi/libKODI_peripheral.h
+%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_addon_dll.h
+%{_includedir}/kodi/xbmc_addon_types.h
+%{_includedir}/kodi/xbmc_codec_types.h
+%{_includedir}/kodi/xbmc_epg_types.h
+%{_includedir}/kodi/xbmc_pvr_dll.h
+%{_includedir}/kodi/xbmc_pvr_types.h
+%{_includedir}/kodi/xbmc_scr_dll.h
+%{_includedir}/kodi/xbmc_scr_types.h
+%{_includedir}/kodi/xbmc_vis_dll.h
+%{_includedir}/kodi/xbmc_vis_types.h
+%{_includedir}/kodi/xbmc_audioenc_dll.h
+%{_includedir}/kodi/xbmc_audioenc_types.h
+%{_includedir}/kodi/kodi_audiodec_dll.h
+%{_includedir}/kodi/kodi_audiodec_types.h
+%{_includedir}/kodi/kodi_adsp_dll.h
+%{_includedir}/kodi/kodi_adsp_types.h
+%{_includedir}/kodi/kodi_audioengine_types.h
+%{_includedir}/kodi/kodi_inputstream_dll.h
+%{_includedir}/kodi/kodi_inputstream_types.h
+%{_includedir}/kodi/kodi_peripheral_callbacks.h
+%{_includedir}/kodi/kodi_peripheral_dll.h
+%{_includedir}/kodi/kodi_peripheral_types.h
+%{_includedir}/kodi/kodi_peripheral_utils.hpp
+%{_includedir}/kodi/kodi_vfs_types.h
+%{_includedir}/kodi/kodi_vfs_utils.hpp
+
 
 %changelog

kodi-noX.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package kodi
 #
-# Copyright (c) 2015-2024 SUSE LLC
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,265 +18,179 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Omega
+%define kodi_version Krypton
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
-
-# WARNING: Build with bundled ffmpeg until version 18.0 is reached
-# INFO: We are on version 21.0 in the meantime, so let's live with
-#  the system provided ffmpeg packages; if this won't work at some
-#  point in time in the future, uncomment the "sysffmpeg" stuff. In
-#  order to reduce downloading it every time, this is now commented!
-%bcond_without sysffmpeg
-## %if 0%{without sysffmpeg}
-## %define ffmpeg_version 5.1.2-Nexus-Alpha3
-## %endif
-
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%bcond_with kodi_with_X11
-# Enable or disable Wayland depending on whether the stack is usable or not:
-%if 0%{?suse_version} >= 1550
-%bcond_without kodi_with_wayland
+%define noX_build 1
+%if %{noX_build}
+# no X build needs openGL ES
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-%bcond_with kodi_with_wayland
-%endif
-
-%if 0%{?suse_version} < 1550
-# Pipewire currently creates more issues than benefits; disable it for now:
-%bcond_without kodi_without_pipewire
+%ifarch %arm armv6l armv6hl
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-# Leave PW enabled on Tumbleweed:
-%bcond_with kodi_without_pipewire
-%endif
-
-%define kodi_platform none
-%define kodi_player none
-
-%if %{with kodi_with_X11}
 %bcond_without enable_opengl
 %bcond_with enable_opengles
-%else
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
 %endif
-#
+%endif
 %bcond_without kodi_libbluray
-# 
-%bcond_without systemd
 
-ExclusiveArch: does-not-build
+%define kodi_platform none
+%define kodi_player none
 
 Name:           kodi-noX
-Version:        21.1
+Version:        17.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            https://kodi.tv/
+Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-
-# The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
-Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
-Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
-
-## %if 0%{without sysffmpeg}
-## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
-## %endif
-Patch1:         0001-crossguid-dgb.patch
-Patch2:         0002-kodi-install.patch
-%if %{without kodi_with_wayland}
-Patch3:         0003-kodi-disable-wayland.patch
-%endif
-%if %{without kodi_without_pipewire}
-Patch4:         0004-kodi-workaround-pipewire-bug.patch
-%endif
-
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  binutils-gold
+Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
+Patch4:         add_rpi2_support.patch
+#Patch6:         kodi.cximage.gcc6.patch
+BuildRequires:  avahi-devel
+BuildRequires:  boost-devel
+BuildRequires:  byacc
+BuildRequires:  ccache
+# needed to delete the fixed rpath introduced by smbclient
+BuildRequires:  chrpath
+BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  gawk
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Use the default compiler on Tumbleweed
-BuildRequires:	gcc
-BuildRequires:  gcc-c++
-%else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
+BuildRequires:  flex
+%if %{with enable_opengl}
+BuildRequires:  ftgl-devel
 %endif
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  giflib-devel
+BuildRequires:  glibc-devel
+BuildRequires:  gmp-devel
+BuildRequires:  gperf
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  java
+BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  ghostscript
-BuildRequires:  graphviz
-BuildRequires:  groff-full
-BuildRequires:  libtool
-BuildRequires:  pkg-config
-BuildRequires:  flatbuffers-devel
-BuildRequires:  pkgconfig(dav1d)
-BuildRequires:  pkgconfig(fmt)
-BuildRequires:  pkgconfig(fstrcmp)
-BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-BuildRequires:  libmysqlclient-devel
-BuildRequires:  pkgconfig(libass) >= 0.17.0
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  libgpg-error-devel
+BuildRequires:  libjasper-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libmysqlclient-devel
+#BuildRequires:  libsidplay2-1
+BuildRequires:  libstdc++-devel
+BuildRequires:  libtool
+BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(libcrypto)
-BuildRequires:  tinyxml-devel
-BuildRequires:  tinyxml2-devel
-BuildRequires:  pkgconfig(uuid)
-BuildRequires:  libyajl-devel >= 2
-BuildRequires:  pkgconfig(libidn2)
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio) >= 2.1.0
-BuildRequires:  pkgconfig(lirc)
-BuildRequires:  pkgconfig(RapidJSON)
-%if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
-%endif
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(dbus-1)
-# libmicrohttpd > 0.9.30
-BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libpulse) >= 1.0
-BuildRequires:  pkgconfig(avahi-client)
-BuildRequires:  pkgconfig(gbm)
-%if %{with kodi_with_X11}
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(xkbcommon)
-%endif
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(libnfs) >= 4.0.0
-%if 0%{?suse_version} >= 1550 || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} )
-BuildRequires:  pkgconfig(libplist-2.0)
-%else
-BuildRequires:  pkgconfig(libplist)
-%endif
+BuildRequires:  nasm
+BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(lcms2)
-%if 0%{?suse_version} > 1315
-BuildRequires:  pkgconfig(bluez)
+#BuildRequires:  sidplay-libs-devel
+BuildRequires:  swig
+BuildRequires:  tinyxml-devel
+BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
 %endif
-BuildRequires:  libcap-devel
-%if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 60 with pkgconfig(libavcodec) < 61)
-BuildRequires:  (pkgconfig(libavfilter) >= 9 with pkgconfig(libavfilter) < 10)
-BuildRequires:  (pkgconfig(libavformat) >= 60 with pkgconfig(libavformat) < 61)
-BuildRequires:  (pkgconfig(libavutil) >= 58 with pkgconfig(libavutil) < 59)
-BuildRequires:  (pkgconfig(libpostproc) >= 57 with pkgconfig(libpostproc) < 58)
-BuildRequires:  (pkgconfig(libswresample) >= 4 with pkgconfig(libswresample) < 5)
-BuildRequires:  (pkgconfig(libswscale) >= 7 with pkgconfig(libswscale) < 8)
-%else
-BuildRequires:  ladspa-devel
-BuildRequires:  libgsm-devel
-BuildRequires:  pkg-config
 BuildRequires:  yasm
+BuildRequires:  zip
+BuildRequires:  libx265-devel
+
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(celt) >= 0.11.0
+BuildRequires:  pkgconfig(dcadec)
+BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(glew)
+%endif
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdc1394-2)
-BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
-BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libass) >= 0.9.7
+BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
+BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
+#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
+#BuildRequires:  pkgconfig(libavformat) = 57.25.100
+#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+%endif
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libdca)
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libmodplug)
+BuildRequires:  pkgconfig(libmpeg2)
+BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libwebp) >= 0.4
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(opus)
-BuildRequires:  pkgconfig(schroedinger-1.0)
-BuildRequires:  pkgconfig(sdl)
-BuildRequires:  pkgconfig(speex)
-BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(vpx) >= 1.3.0
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-render)
-BuildRequires:  pkgconfig(xcb-shape)
-BuildRequires:  pkgconfig(xcb-shm)
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  pkgconfig(opencore-amrnb)
-BuildRequires:  pkgconfig(twolame)
-BuildRequires:  pkgconfig(x264)
-BuildRequires:  pkgconfig(x265)
-%endif
-BuildRequires:  swig < 4.2
-BuildRequires:  java
-BuildRequires:  apache-commons-lang3
-BuildRequires:  apache-commons-text
-BuildRequires:  doxygen
+BuildRequires:  pkgconfig(libssh)
+#BuildRequires:  pkgconfig(libswresample) = 1.2.101
+BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  pkgconfig(libudev)
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(vdpau)
-%if 0%{?suse_version} < 1500
-BuildRequires:  pkgconfig(libva) >= 0.38
-BuildRequires:  pkgconfig(libva-x11) >= 0.38
-%else
-BuildRequires:  pkgconfig(libva) >= 1.0.0
-BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+BuildRequires:  pkgconfig(libva)
 %endif
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(nettle)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
+BuildRequires:  pkgconfig(sdl2)
 %endif
-BuildRequires:  pkgconfig(libdisplay-info)
-%if %{with kodi_with_wayland}
-BuildRequires:  pkgconfig(libva-wayland)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-scanner++)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-client++)
-BuildRequires:  pkgconfig(wayland-cursor++)
-BuildRequires:  pkgconfig(wayland-egl++)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(taglib) >= 1.8
+BuildRequires:  pkgconfig(tinyxml2)
+%if 0%{?suse_version} > 1320
+# Otherwise fails with configure error on libcec because udev.pc file is not found
+BuildRequires:  pkgconfig(udev)
 %endif
+BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(vdpau)
+%endif
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(zlib)
+
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -287,51 +201,28 @@
 %endif
 %endif
 %endif
-%if "%{kodi_player}" == "omxplayer"
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
+# Manage player deps
+%if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-BuildRequires:  cmake
-BuildRequires:  gperf
-BuildRequires:  unzip
-BuildRequires:  zip
-BuildRequires:  nasm
-%if %{dev_build}
-BuildRequires:  ccache
-%endif
-
-# cpluff
-BuildRequires:  pkgconfig(expat)
-
-# TexturePacker
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  giflib-devel
-BuildRequires:  libjpeg8-devel
-BuildRequires:  lzo-devel
-#
-BuildRequires:  pkgconfig(spdlog) > 1.8.0
-BuildRequires:  libunistring-devel
-
-%if 0%{?suse_version} > 1510
-BuildRequires:  pkgconfig(gtest)
-%else
-BuildRequires: googletest-devel
+# glxinfo is needed to check hw accel
+%if 0%{?suse_version} >= 1220
+%if !%{noX_build}
+Requires:       Mesa-demo-x
+Requires:       xdpyinfo
 %endif
-
-%if %{without kodi_without_pipewire}
-# pipewire
-BuildRequires: pkgconfig(libpipewire-0.3)
-BuildRequires: pkgconfig(libspa-0.2)
 %endif
-#
-%{?systemd_requires}
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{with kodi_with_X11}
+ExcludeArch:    ppc64
+%if %{noX_build}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -349,7 +240,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{with kodi_with_X11}
+%if %{noX_build}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -360,106 +251,128 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%autopatch -p1
-
-%build
+%patch1
+%patch2
+%patch3
+%patch4 -p0
+#%patch6 -p1
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
 
-# Set the final version string
+# Set the final version string 
 cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/platform/linux/*.cpp
+    xbmc/linux/*.cpp
+
+cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
+
+%build
+
+# build crossguid
+make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
+		
+chmod +x bootstrap
+./bootstrap
+
+# add crossguid to INCLUDES and LIBS
+export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
+export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
+%configure \
+    --disable-libbluray \
+    --with-ffmpeg=shared \
+    --enable-airplay \
+    --enable-alsa \
+    --enable-avahi \
+    --enable-libcap \
+    --enable-libcec \
+    --enable-libusb \
+    --enable-mid \
+    --enable-mysql \
+    --enable-nfs \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-shared \
+    --enable-ssh \
+    --enable-texturepacker \
+    --enable-upnp \
+    --enable-webserver \
+%if %{with enable_opengl}
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-gl \
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
- export CC=gcc-9
- export CXX=g++-9
+    --disable-vaapi \
+    --disable-vdpau \
+    --disable-gl \
+%endif
+%if %{with enable_opengles}
+    --enable-gles \
 %else
- export CC=gcc-8
- export CXX=g++-8
+    --disable-gles \
 %endif
+%if "%{kodi_platform}" != "none"
+    --with-platform=%{kodi_platform} \
 %endif
-
-# Extract the groovy files to a proper place:
-mkdir -p %{_builddir}/groovy
-unzip %{SOURCE25} -d %{_builddir}/groovy
-mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
-rm -rf %{_builddir}/groovy/groovy-* || true
-
-%cmake \
-%ifarch i586
-    -DCMAKE_C_FLAGS='-msse' \
+%if %{with kodi_libbluray}
+    --enable-libbluray \
+%endif
+%if "%{kodi_player}" != "none"
+    --enable-player="%{kodi_player}" \
+%endif
+%ifarch armv7l armv7hl
+    --enable-tegra \
+    --disable-neon \
+%endif
+%if %{noX_build}
+    --disable-x11 \
+    --disable-xrandr \
+    --disable-sdl \
+    --disable-joystick \
 %endif
 %if %{dev_build}
-    -DVERBOSE=ON \
+    --enable-debug \
+    --enable-ccache \
 %endif
-%if %{with kodi_with_wayland}
-    -DWAYLANDPP_INCLUDE_DIR="$(pkg-config --cflags-only-I wayland-client++ | sed -e 's/^-I//;s/ -I/;/g;s/ $//')" \
+%if !%{dev_build}
+    --disable-debug \
+    --disable-ccache \
 %endif
-    -DCMAKE_C_COMPILER=$CC \
-    -DCMAKE_CXX_COMPILER=$CXX \
-    -DENABLE_INTERNAL_FMT=OFF \
-%if %{without sysffmpeg}
-    -DENABLE_INTERNAL_FFMPEG=ON \
-    -DFFMPEG_URL=%{SOURCE30} \
-%else
-    -DENABLE_INTERNAL_FFMPEG=OFF \
-%endif
-    -DENABLE_INTERNAL_CDIO=OFF \
-    -DENABLE_INTERNAL_SPDLOG=OFF \
-    -DCROSSGUID_URL=%{SOURCE20} \
-    -DLIBDVDNAV_URL=%{SOURCE21} \
-    -DLIBDVDCSS_URL=%{SOURCE22} \
-    -DLIBDVDREAD_URL=%{SOURCE23} \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DENABLE_INTERNAL_FLATBUFFERS=OFF \
-    -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DENABLE_INTERNAL_UDFREAD=ON \
-    -DUDFREAD_URL=%{SOURCE24} \
-    -Dgroovy_SOURCE_DIR=%{_builddir}/groovy \
-    -Dapache-commons-lang_SOURCE_DIR=%{_datadir}/java \
-    -Dapache-commons-text_SOURCE_DIR=%{_datadir}/java/apache-commons-text \
-    -DAPP_RENDER_SYSTEM=gl \
-    -DX11_RENDER_SYSTEM=gl \
-    -DBUILD_SHARED_LIBS=1 \
-    -DPYTHON_VER=3.11 \
-%if %{with kodi_without_pipewire}
-    -DENABLE_PIPEWIRE=OFF \
-%endif
-    ${NULL}
-
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
-rm -rf %{_builddir}/groovy
+    --disable-optimizations \
+    --disable-static 
+
+make %{?_smp_mflags}
 
 %install
-pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-# Tumbleweed does not have SuSEfirewall anymore:
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 
 # Systemd service file
-%if %{without kodi_with_X11}
+%if %{noX_build}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -468,6 +381,10 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
+# copy manpages
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -485,26 +402,10 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
-# copy manpages
-popd
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-%if %{without kodi_with_wayland}
-rm -f %{buildroot}%{_datadir}/wayland-sessions/kodi-gbm.desktop
-rmdir -p %{buildroot}%{_datadir}/wayland-sessions || true
-%endif
-
-# TexturePacker likes to be installed as kodi-TexturePacker, too.
-if  -f %{buildroot}%{_bindir}/kodi-TexturePacker  &&  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    rm -f %{buildroot}%{_bindir}/TexturePacker
-elif  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    mv %{buildroot}%{_bindir}/TexturePacker %{buildroot}%{_bindir}/kodi-TexturePacker
-fi
 %fdupes %{buildroot}
 
 %pre
@@ -521,26 +422,25 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%doc copying.txt LICENSE.GPL docs/README.linux
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 %{_bindir}/kodi
-%{_bindir}/kodi-standalone
-%{_bindir}/kodi-TexturePacker
 %dir %{_libdir}/kodi
-%if %{with kodi_with_X11}
-%{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
+%if !%{noX_build}
+%{_libdir}/kodi/kodi-xrandr
 %endif
+%{_bindir}/kodi-standalone
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/library.xbmc.addon/
+%{_libdir}/kodi/addons/library.xbmc.addon/*
+%dir %{_libdir}/kodi/addons/library.xbmc.codec/
+%{_libdir}/kodi/addons/library.xbmc.codec/*
+%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
+%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
-%if %{with kodi_with_wayland}
-%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/kodi-gbm.desktop
-%endif
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/*/*.png
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -555,13 +455,9 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/game.controller.keyboard
-%{_kodi_addons_dir}/game.controller.keyboard/*
-%dir %{_kodi_addons_dir}/game.controller.mouse
-%{_kodi_addons_dir}/game.controller.mouse/*
-%dir %{_kodi_addons_dir}/game.controller.snes
-%{_kodi_addons_dir}/game.controller.snes/*
+%{_kodi_addons_dir}/game.controller.default/* 
+%dir %{_kodi_addons_dir}/kodi.game
+%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -570,16 +466,20 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
+%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
+%{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
+%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
+%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
+%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
+%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
+%{_kodi_addons_dir}/metadata.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.tvdb.com/
+%{_kodi_addons_dir}/metadata.tvdb.com/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -594,6 +494,8 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
+%dir %{_kodi_addons_dir}/xbmc.codec/
+%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -604,147 +506,114 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
+%dir %{_kodi_addons_dir}/xbmc.pvr/
+%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
+%dir %{_kodi_addons_dir}/kodi.audiodecoder/
+%{_kodi_addons_dir}/kodi.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.guilib/
+%{_kodi_addons_dir}/kodi.guilib/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
+%dir %{_kodi_addons_dir}/xbmc.audioencoder/
+%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
+%dir %{_kodi_addons_dir}/kodi.adsp
+%{_kodi_addons_dir}/kodi.adsp/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
+%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
-%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
-%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
+%dir %{_kodi_addons_dir}/kodi.inputstream
+%{_kodi_addons_dir}/kodi.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.peripheral
+%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/skin.estouchy
+%{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
-%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
-%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.general
-%{_kodi_addons_dir}/kodi.binary.global.general/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.gui
-%{_kodi_addons_dir}/kodi.binary.global.gui/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.main
-%{_kodi_addons_dir}/kodi.binary.global.main/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.network
-%{_kodi_addons_dir}/kodi.binary.global.network/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
-%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.game
-%{_kodi_addons_dir}/kodi.binary.instance.game/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
-%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
-%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
-%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
-%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
-%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
-%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
-%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
-%dir %{_kodi_addons_dir}/script.module.pycryptodome
-%{_kodi_addons_dir}/script.module.pycryptodome/*
-%dir %{_kodi_addons_dir}/metadata.generic.albums
-%{_kodi_addons_dir}/metadata.generic.albums/*
-%dir %{_kodi_addons_dir}/metadata.generic.artists
-%{_kodi_addons_dir}/metadata.generic.artists/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.tools
-%{_kodi_addons_dir}/kodi.binary.global.tools/*
-
-%dir %{_libdir}/firewalld
-%dir %{_libdir}/firewalld/services
-%{_libdir}/firewalld/services/kodi-eventserver.xml
-%{_libdir}/firewalld/services/kodi-http.xml
-%{_libdir}/firewalld/services/kodi-jsonrpc.xml
-
-%if %{without kodi_with_X11}
+%dir %{_libdir}/kodi/addons/library.kodi.guilib/
+%{_libdir}/kodi/addons/library.kodi.guilib/*
+%dir %{_libdir}/kodi/addons/library.kodi.adsp
+%{_libdir}/kodi/addons/library.kodi.adsp/*
+%dir %{_libdir}/kodi/addons/library.kodi.audioengine
+%{_libdir}/kodi/addons/library.kodi.audioengine/*
+%dir %{_libdir}/kodi/addons/library.kodi.inputstream
+%{_libdir}/kodi/addons/library.kodi.inputstream/*
+%dir %{_libdir}/kodi/addons/library.kodi.peripheral
+%{_libdir}/kodi/addons/library.kodi.peripheral/*
+
+%if %{noX_build}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service
 %endif
 
-%dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/AddonHelpers.cmake
-%{_datadir}/kodi/cmake/AddOptions.cmake
-%{_datadir}/kodi/cmake/ArchSetup.cmake
-%{_datadir}/kodi/cmake/CheckCommits.cmake
-%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
-%{_datadir}/kodi/cmake/GeneratorSetup.cmake
-%{_datadir}/kodi/cmake/HandleDepends.cmake
-%{_datadir}/kodi/cmake/Macros.cmake
-%{_datadir}/kodi/cmake/PrepareEnv.cmake
-%{_datadir}/kodi/cmake/ProjectMacros.cmake
-%{_datadir}/kodi/cmake/PathSetup.cmake
-%dir %{_libdir}/kodi/cmake
-%{_libdir}/kodi/cmake/KodiConfig.cmake
-
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
+%{_libdir}/kodi/AddOptions.cmake
+%{_libdir}/kodi/AddonHelpers.cmake
+%{_libdir}/kodi/ArchSetup.cmake
+%{_libdir}/kodi/CheckCommits.cmake
+%{_libdir}/kodi/CheckTargetPlatform.cmake
+%{_libdir}/kodi/GenerateVersionedFiles.cmake
+%{_libdir}/kodi/GeneratorSetup.cmake
+%{_libdir}/kodi/HandleDepends.cmake
+%{_libdir}/kodi/KodiConfig.cmake
+%{_libdir}/kodi/Macros.cmake
+%{_libdir}/kodi/PrepareEnv.cmake
+%{_libdir}/kodi/ProjectMacros.cmake
+%{_libdir}/kodi/CMakeHelpers.cmake
+%{_libdir}/kodi/Uninstall.cmake
+
+
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/AudioEngine.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/General.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/versions.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/*
-%dir %{_includedir}/kodi/addon-instance/inputstream
-%{_includedir}/kodi/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/addon-instance/peripheral
-%{_includedir}/kodi/addon-instance/peripheral/*
-%dir %{_includedir}/kodi/addon-instance/pvr
-%{_includedir}/kodi/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api
-%{_includedir}/kodi/c-api/*
-%dir %{_includedir}/kodi/c-api/addon-instance
-%{_includedir}/kodi/c-api/addon-instance/*
-%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
-%{_includedir}/kodi/c-api/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/c-api/addon-instance/pvr
-%{_includedir}/kodi/c-api/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api/gui
-%{_includedir}/kodi/c-api/gui/*
-%dir %{_includedir}/kodi/c-api/gui/controls
-%{_includedir}/kodi/c-api/gui/controls/*
-%dir %{_includedir}/kodi/c-api/gui/dialogs
-%{_includedir}/kodi/c-api/gui/dialogs/*
-%dir %{_includedir}/kodi/c-api/gui/input
-%{_includedir}/kodi/c-api/gui/input/*
-%dir %{_includedir}/kodi/c-api/platform
-%dir %{_includedir}/kodi/c-api/platform/android
-%{_includedir}/kodi/c-api/platform/android/*
-%dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/*
-%dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/*
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/*
-%dir %{_includedir}/kodi/gui/gl
-%{_includedir}/kodi/gui/gl/*
-%dir %{_includedir}/kodi/gui/input
-%{_includedir}/kodi/gui/input/*
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/*
+%{_includedir}/kodi/AEChannelData.h
+%{_includedir}/kodi/DVDDemuxPacket.h
+%{_includedir}/kodi/IFileTypes.h
+%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/libXBMC_codec.h
+%{_includedir}/kodi/libXBMC_pvr.h
+%{_includedir}/kodi/libKODI_adsp.h
+%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/libKODI_guilib.h
+%{_includedir}/kodi/libKODI_inputstream.h
+%{_includedir}/kodi/libKODI_peripheral.h
+%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_addon_dll.h
+%{_includedir}/kodi/xbmc_addon_types.h
+%{_includedir}/kodi/xbmc_codec_types.h
+%{_includedir}/kodi/xbmc_epg_types.h
+%{_includedir}/kodi/xbmc_pvr_dll.h
+%{_includedir}/kodi/xbmc_pvr_types.h
+%{_includedir}/kodi/xbmc_scr_dll.h
+%{_includedir}/kodi/xbmc_scr_types.h
+%{_includedir}/kodi/xbmc_vis_dll.h
+%{_includedir}/kodi/xbmc_vis_types.h
+%{_includedir}/kodi/xbmc_audioenc_dll.h
+%{_includedir}/kodi/xbmc_audioenc_types.h
+%{_includedir}/kodi/kodi_audiodec_dll.h
+%{_includedir}/kodi/kodi_audiodec_types.h
+%{_includedir}/kodi/kodi_adsp_dll.h
+%{_includedir}/kodi/kodi_adsp_types.h
+%{_includedir}/kodi/kodi_audioengine_types.h
+%{_includedir}/kodi/kodi_inputstream_dll.h
+%{_includedir}/kodi/kodi_inputstream_types.h
+%{_includedir}/kodi/kodi_peripheral_callbacks.h
+%{_includedir}/kodi/kodi_peripheral_dll.h
+%{_includedir}/kodi/kodi_peripheral_types.h
+%{_includedir}/kodi/kodi_peripheral_utils.hpp
+%{_includedir}/kodi/kodi_vfs_types.h
+%{_includedir}/kodi/kodi_vfs_utils.hpp
+
 
 %changelog

kodi.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package kodi
 #
-# Copyright (c) 2015-2024 SUSE LLC
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,265 +18,179 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Omega
+%define kodi_version Krypton
 %define _kodi_addons_dir %{_datadir}/kodi/addons
 # set this parameter to enable building Kodi with ccache, debug information, etc.
 %define dev_build 0
-
-# WARNING: Build with bundled ffmpeg until version 18.0 is reached
-# INFO: We are on version 21.0 in the meantime, so let's live with
-#  the system provided ffmpeg packages; if this won't work at some
-#  point in time in the future, uncomment the "sysffmpeg" stuff. In
-#  order to reduce downloading it every time, this is now commented!
-%bcond_without sysffmpeg
-## %if 0%{without sysffmpeg}
-## %define ffmpeg_version 5.1.2-Nexus-Alpha3
-## %endif
-
 # kodi can be built without X support when openGL ES is used (mainly used on ARM boards used as media center)
-%bcond_without kodi_with_X11
-# Enable or disable Wayland depending on whether the stack is usable or not:
-%if 0%{?suse_version} >= 1550
-%bcond_without kodi_with_wayland
+%define noX_build 0
+%if %{noX_build}
+# no X build needs openGL ES
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-%bcond_with kodi_with_wayland
-%endif
-
-%if 0%{?suse_version} < 1550
-# Pipewire currently creates more issues than benefits; disable it for now:
-%bcond_without kodi_without_pipewire
+%ifarch %arm armv6l armv6hl
+%bcond_with enable_opengl
+%bcond_without enable_opengles
 %else
-# Leave PW enabled on Tumbleweed:
-%bcond_with kodi_without_pipewire
-%endif
-
-%define kodi_platform none
-%define kodi_player none
-
-%if %{with kodi_with_X11}
 %bcond_without enable_opengl
 %bcond_with enable_opengles
-%else
-# no X build needs openGL ES
-%bcond_with enable_opengl
-%bcond_without enable_opengles
 %endif
-#
+%endif
 %bcond_without kodi_libbluray
-# 
-%bcond_without systemd
 
-ExclusiveArch: %ix86 x86_64 %arm aarch64
+%define kodi_platform none
+%define kodi_player none
 
 Name:           kodi
-Version:        21.1
+Version:        17.1
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
 Group:          Productivity/Multimedia/Video/Players
-Url:            https://kodi.tv/
+Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
 # AUTO-GENERATED using get_version.sh
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
-
-# The following sources will be downloaded via _service's download_files:
-Source20:       https://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-Source21:	https://github.com/xbmc/libdvdnav/archive/refs/tags/6.1.1-Next-Nexus-Alpha2-2.tar.gz
-Source22:	https://github.com/xbmc/libdvdcss/archive/refs/tags/1.4.3-Next-Nexus-Alpha2-2.tar.gz
-Source23:       https://github.com/xbmc/libdvdread/archive/refs/tags/6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       https://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
-Source25:       https://mirrors.kodi.tv/build-deps/sources/apache-groovy-binary-4.0.16.zip
-
-## %if 0%{without sysffmpeg}
-## Source30:       https://github.com/xbmc/FFmpeg/archive/refs/tags/%{ffmpeg_version}.tar.gz
-## %endif
-Patch1:         0001-crossguid-dgb.patch
-Patch2:         0002-kodi-install.patch
-%if %{without kodi_with_wayland}
-Patch3:         0003-kodi-disable-wayland.patch
-%endif
-%if %{without kodi_without_pipewire}
-Patch4:         0004-kodi-workaround-pipewire-bug.patch
-%endif
-
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  binutils-gold
+Source20:       crossguid-8f399e8bd4.tar.gz
+# DOWNLOAD from https://github.com/xbmc/libdvd*/archive/master.tar.gz
+Source21:       libdvdnav-master.tar.gz
+Source22:       libdvdcss-master.tar.gz
+Source23:       libdvdread-master.tar.gz
+Patch1:         no-xbmc-symbolic-link.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
+Patch4:         add_rpi2_support.patch
+#Patch6:         kodi.cximage.gcc6.patch
+BuildRequires:  avahi-devel
+BuildRequires:  boost-devel
+BuildRequires:  byacc
+BuildRequires:  ccache
+# needed to delete the fixed rpath introduced by smbclient
+BuildRequires:  chrpath
+BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
+BuildRequires:  doxygen
 BuildRequires:  fdupes
-BuildRequires:  gawk
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-# Use the default compiler on Tumbleweed
-BuildRequires:	gcc
-BuildRequires:  gcc-c++
-%else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
-BuildRequires:	gcc9
-BuildRequires:  gcc9-c++
-%else
-BuildRequires:  gcc8
-BuildRequires:  gcc8-c++
+BuildRequires:  flex
+%if %{with enable_opengl}
+BuildRequires:  ftgl-devel
 %endif
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  giflib-devel
+BuildRequires:  glibc-devel
+BuildRequires:  gmp-devel
+BuildRequires:  gperf
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  java
+BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
 %endif
-BuildRequires:  ghostscript
-BuildRequires:  graphviz
-BuildRequires:  groff-full
-BuildRequires:  libtool
-BuildRequires:  pkg-config
-BuildRequires:  flatbuffers-devel
-BuildRequires:  pkgconfig(dav1d)
-BuildRequires:  pkgconfig(fmt)
-BuildRequires:  pkgconfig(fstrcmp)
-BuildRequires:  pkgconfig(RapidJSON) >= 1.0.2
-BuildRequires:  python(abi) >= 3.11
-BuildRequires:  pkgconfig(python-3.11)
-BuildRequires:  libmysqlclient-devel
-BuildRequires:  pkgconfig(libass) >= 0.17.0
-BuildRequires:  pkgconfig(libcurl)
-BuildRequires:  pkgconfig(openssl)
-BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
-BuildRequires:  pkgconfig(bzip2)
+BuildRequires:  libgpg-error-devel
+BuildRequires:  libjasper-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libmp3lame-devel
+BuildRequires:  libmysqlclient-devel
+#BuildRequires:  libsidplay2-1
+BuildRequires:  libstdc++-devel
+BuildRequires:  libtool
+BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
-BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(libcrypto)
-BuildRequires:  tinyxml-devel
-BuildRequires:  tinyxml2-devel
-BuildRequires:  pkgconfig(uuid)
-BuildRequires:  libyajl-devel >= 2
-BuildRequires:  pkgconfig(libidn2)
-BuildRequires:  pkgconfig(libinput)
-BuildRequires:  pkgconfig(libxml-2.0)
-BuildRequires:  pkgconfig(libxslt)
-BuildRequires:  pkgconfig(fribidi)
-BuildRequires:  pkgconfig(sqlite3) 
-BuildRequires:  pkgconfig(libpcrecpp)
-BuildRequires:  pkgconfig(libpcre)
-BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(taglib) >= 1.9
-BuildRequires:  pkgconfig(libcdio) >= 2.1.0
-BuildRequires:  pkgconfig(lirc)
-BuildRequires:  pkgconfig(RapidJSON)
-%if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
-%endif
-BuildRequires:  pkgconfig(alsa)
-BuildRequires:  pkgconfig(dbus-1)
-# libmicrohttpd > 0.9.30
-BuildRequires:  pkgconfig(libmicrohttpd)
-BuildRequires:  pkgconfig(libpulse) >= 1.0
-BuildRequires:  pkgconfig(avahi-client)
-BuildRequires:  pkgconfig(gbm)
-%if %{with kodi_with_X11}
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xrandr)
-BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(egl)
-BuildRequires:  pkgconfig(xkbcommon)
-%endif
-BuildRequires:  pkgconfig(libssh)
-BuildRequires:  pkgconfig(smbclient)
-BuildRequires:  pkgconfig(libnfs) >= 4.0.0
-%if 0%{?suse_version} >= 1550 || ( 0%{?sle_version} >= 150400 && 0%{?is_opensuse} )
-BuildRequires:  pkgconfig(libplist-2.0)
-%else
-BuildRequires:  pkgconfig(libplist)
-%endif
+BuildRequires:  nasm
+BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
-BuildRequires:  pkgconfig(libudev)
-BuildRequires:  pkgconfig(libcec) >= 4.0.0
-BuildRequires:  pkgconfig(lcms2)
-%if 0%{?suse_version} > 1315
-BuildRequires:  pkgconfig(bluez)
+#BuildRequires:  sidplay-libs-devel
+BuildRequires:  swig
+BuildRequires:  tinyxml-devel
+BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
 %endif
-BuildRequires:  libcap-devel
-%if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 60 with pkgconfig(libavcodec) < 61)
-BuildRequires:  (pkgconfig(libavfilter) >= 9 with pkgconfig(libavfilter) < 10)
-BuildRequires:  (pkgconfig(libavformat) >= 60 with pkgconfig(libavformat) < 61)
-BuildRequires:  (pkgconfig(libavutil) >= 58 with pkgconfig(libavutil) < 59)
-BuildRequires:  (pkgconfig(libpostproc) >= 57 with pkgconfig(libpostproc) < 58)
-BuildRequires:  (pkgconfig(libswresample) >= 4 with pkgconfig(libswresample) < 5)
-BuildRequires:  (pkgconfig(libswscale) >= 7 with pkgconfig(libswscale) < 8)
-%else
-BuildRequires:  ladspa-devel
-BuildRequires:  libgsm-devel
-BuildRequires:  pkg-config
 BuildRequires:  yasm
+BuildRequires:  zip
+BuildRequires:  libx265-devel
+
+BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(bluez)
 BuildRequires:  pkgconfig(bzip2)
-BuildRequires:  pkgconfig(celt) >= 0.11.0
+BuildRequires:  pkgconfig(dcadec)
+BuildRequires:  pkgconfig(dvdread)
 BuildRequires:  pkgconfig(enca)
-BuildRequires:  pkgconfig(fontconfig) >= 2.4.2
+BuildRequires:  pkgconfig(expat)
+BuildRequires:  pkgconfig(flac)
+BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(fribidi) >= 0.19.0
+BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(glew)
+%endif
+BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
-BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libbluray)
-BuildRequires:  pkgconfig(libcdio_paranoia)
-BuildRequires:  pkgconfig(libdc1394-2)
-BuildRequires:  pkgconfig(liboil-0.3) >= 0.3.15
-BuildRequires:  pkgconfig(libopenjpeg)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libass) >= 0.9.7
+BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
+BuildRequires:  pkgconfig(libavdevice) >= 57.0.101
+#BuildRequires:  pkgconfig(libavfilter) = 6.31.100
+#BuildRequires:  pkgconfig(libavformat) = 57.25.100
+#BuildRequires:  pkgconfig(libavutil) = 55.17.103
+%if %{with kodi_libbluray}
+BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+%endif
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcec) >= 4.0.0
+BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libdca)
+BuildRequires:  pkgconfig(libmicrohttpd)
+BuildRequires:  pkgconfig(libmodplug)
+BuildRequires:  pkgconfig(libmpeg2)
+BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libnfs)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpcrecpp)
+BuildRequires:  pkgconfig(libplist)
+BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libpulse)
-BuildRequires:  pkgconfig(libraw1394)
-BuildRequires:  pkgconfig(libwebp) >= 0.4
-BuildRequires:  pkgconfig(ogg)
-BuildRequires:  pkgconfig(opus)
-BuildRequires:  pkgconfig(schroedinger-1.0)
-BuildRequires:  pkgconfig(sdl)
-BuildRequires:  pkgconfig(speex)
-BuildRequires:  pkgconfig(theora) >= 1.1
-BuildRequires:  pkgconfig(vorbis)
-BuildRequires:  pkgconfig(vpx) >= 1.3.0
-BuildRequires:  pkgconfig(x11)
-BuildRequires:  pkgconfig(xcb)
-BuildRequires:  pkgconfig(xcb-render)
-BuildRequires:  pkgconfig(xcb-shape)
-BuildRequires:  pkgconfig(xcb-shm)
-BuildRequires:  pkgconfig(xcb-xfixes)
-BuildRequires:  pkgconfig(xext)
-BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(librtmp)
-BuildRequires:  libmp3lame-devel
-BuildRequires:  libxvidcore-devel
-BuildRequires:  pkgconfig(opencore-amrnb)
-BuildRequires:  pkgconfig(twolame)
-BuildRequires:  pkgconfig(x264)
-BuildRequires:  pkgconfig(x265)
-%endif
-BuildRequires:  swig < 4.2
-BuildRequires:  java
-BuildRequires:  apache-commons-lang3
-BuildRequires:  apache-commons-text
-BuildRequires:  doxygen
+BuildRequires:  pkgconfig(libssh)
+#BuildRequires:  pkgconfig(libswresample) = 1.2.101
+BuildRequires:  pkgconfig(libtiff-4)
+BuildRequires:  pkgconfig(libudev)
 %if %{with enable_opengl}
-BuildRequires:  pkgconfig(gl)
-BuildRequires:  pkgconfig(glu)
-BuildRequires:  pkgconfig(vdpau)
-%if 0%{?suse_version} < 1500
-BuildRequires:  pkgconfig(libva) >= 0.38
-BuildRequires:  pkgconfig(libva-x11) >= 0.38
-%else
-BuildRequires:  pkgconfig(libva) >= 1.0.0
-BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
+BuildRequires:  pkgconfig(libva)
 %endif
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(mad)
+BuildRequires:  pkgconfig(nettle)
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(python)
+BuildRequires:  pkgconfig(samplerate)
+%if !%{noX_build}
+BuildRequires:  pkgconfig(sdl2)
 %endif
-BuildRequires:  pkgconfig(libdisplay-info)
-%if %{with kodi_with_wayland}
-BuildRequires:  pkgconfig(libva-wayland)
-BuildRequires:  pkgconfig(wayland-scanner)
-BuildRequires:  pkgconfig(wayland-scanner++)
-BuildRequires:  pkgconfig(wayland-protocols)
-BuildRequires:  pkgconfig(wayland-client)
-BuildRequires:  pkgconfig(wayland-client++)
-BuildRequires:  pkgconfig(wayland-cursor++)
-BuildRequires:  pkgconfig(wayland-egl++)
+BuildRequires:  pkgconfig(smbclient)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(taglib) >= 1.8
+BuildRequires:  pkgconfig(tinyxml2)
+%if 0%{?suse_version} > 1320
+# Otherwise fails with configure error on libcec because udev.pc file is not found
+BuildRequires:  pkgconfig(udev)
 %endif
+BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
+BuildRequires:  pkgconfig(vdpau)
+%endif
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  pkgconfig(zlib)
+
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -287,51 +201,28 @@
 %endif
 %endif
 %endif
-%if "%{kodi_player}" == "omxplayer"
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
+# Manage player deps
+%if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
 %endif
-BuildRequires:  cmake
-BuildRequires:  gperf
-BuildRequires:  unzip
-BuildRequires:  zip
-BuildRequires:  nasm
-%if %{dev_build}
-BuildRequires:  ccache
-%endif
-
-# cpluff
-BuildRequires:  pkgconfig(expat)
-
-# TexturePacker
-BuildRequires:  pkgconfig(libpng)
-BuildRequires:  giflib-devel
-BuildRequires:  libjpeg8-devel
-BuildRequires:  lzo-devel
-#
-BuildRequires:  pkgconfig(spdlog) > 1.8.0
-BuildRequires:  libunistring-devel
-
-%if 0%{?suse_version} > 1510
-BuildRequires:  pkgconfig(gtest)
-%else
-BuildRequires: googletest-devel
+# glxinfo is needed to check hw accel
+%if 0%{?suse_version} >= 1220
+%if !%{noX_build}
+Requires:       Mesa-demo-x
+Requires:       xdpyinfo
 %endif
-
-%if %{without kodi_without_pipewire}
-# pipewire
-BuildRequires: pkgconfig(libpipewire-0.3)
-BuildRequires: pkgconfig(libspa-0.2)
 %endif
-#
-%{?systemd_requires}
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-#
 Obsoletes:      xbmc < %{version}
 Provides:       xbmc = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{with kodi_with_X11}
+ExcludeArch:    ppc64
+%if %{noX_build}
 Conflicts:      kodi
 %else
 Conflicts:      kodi-noX
@@ -349,7 +240,7 @@
 Group:          Development/Languages/C and C++
 Requires:       %{name}
 BuildArch:      noarch
-%if %{with kodi_with_X11}
+%if %{noX_build}
 Conflicts:      kodi-devel
 %else
 Conflicts:      kodi-noX-devel
@@ -360,106 +251,128 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-%autopatch -p1
-
-%build
+%patch1
+%patch2
+%patch3
+%patch4 -p0
+#%patch6 -p1
 
 # Remove build time references so build-compare can do its work
-date -u -r version.txt +%%Y%%m%%d | tee BUILDDATE 
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
 FAKE_BUILDDATETIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes)
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+# remove the remaining occurencies in the source tree
 for file in xbmc/interfaces/python/PythonSwig.cpp.template ; do
   sed -i -e "/PyModule_AddStringConstant.*__date__/ s/\${new Date()\.toString()}/$FAKE_BUILDDATETIME/"  $file
 done
 
-# Set the final version string
+# Set the final version string 
 cp %{SOURCE3} VERSION
 
 # avoid long delays when powerkit isn't running
 sed -i \
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
-    xbmc/platform/linux/*.cpp
+    xbmc/linux/*.cpp
+
+cp %{SOURCE20} tools/depends/target/crossguid
+cp %{SOURCE21} tools/depends/target/libdvdnav
+cp %{SOURCE22} tools/depends/target/libdvdcss
+cp %{SOURCE23} tools/depends/target/libdvdread
+
+%build
+
+# build crossguid
+make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
+		
+chmod +x bootstrap
+./bootstrap
+
+# add crossguid to INCLUDES and LIBS
+export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
+export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
 
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
- export CC=gcc
- export CXX=g++
+%configure \
+    --disable-libbluray \
+    --with-ffmpeg=shared \
+    --enable-airplay \
+    --enable-alsa \
+    --enable-avahi \
+    --enable-libcap \
+    --enable-libcec \
+    --enable-libusb \
+    --enable-mid \
+    --enable-mysql \
+    --enable-nfs \
+    --enable-pulse \
+    --enable-rtmp \
+    --enable-samba \
+    --enable-shared \
+    --enable-ssh \
+    --enable-texturepacker \
+    --enable-upnp \
+    --enable-webserver \
+%if %{with enable_opengl}
+    --enable-vaapi \
+    --enable-vdpau \
+    --enable-gl \
 %else
-%if 0%{?suse_version} > 1320 && 0%{?sle_version} == 0
- export CC=gcc-9
- export CXX=g++-9
+    --disable-vaapi \
+    --disable-vdpau \
+    --disable-gl \
+%endif
+%if %{with enable_opengles}
+    --enable-gles \
 %else
- export CC=gcc-8
- export CXX=g++-8
+    --disable-gles \
 %endif
+%if "%{kodi_platform}" != "none"
+    --with-platform=%{kodi_platform} \
 %endif
-
-# Extract the groovy files to a proper place:
-mkdir -p %{_builddir}/groovy
-unzip %{SOURCE25} -d %{_builddir}/groovy
-mv %{_builddir}/groovy/groovy-*/lib %{_builddir}/groovy
-rm -rf %{_builddir}/groovy/groovy-* || true
-
-%cmake \
-%ifarch i586
-    -DCMAKE_C_FLAGS='-msse' \
+%if %{with kodi_libbluray}
+    --enable-libbluray \
+%endif
+%if "%{kodi_player}" != "none"
+    --enable-player="%{kodi_player}" \
+%endif
+%ifarch armv7l armv7hl
+    --enable-tegra \
+    --disable-neon \
+%endif
+%if %{noX_build}
+    --disable-x11 \
+    --disable-xrandr \
+    --disable-sdl \
+    --disable-joystick \
 %endif
 %if %{dev_build}
-    -DVERBOSE=ON \
+    --enable-debug \
+    --enable-ccache \
 %endif
-%if %{with kodi_with_wayland}
-    -DWAYLANDPP_INCLUDE_DIR="$(pkg-config --cflags-only-I wayland-client++ | sed -e 's/^-I//;s/ -I/;/g;s/ $//')" \
+%if !%{dev_build}
+    --disable-debug \
+    --disable-ccache \
 %endif
-    -DCMAKE_C_COMPILER=$CC \
-    -DCMAKE_CXX_COMPILER=$CXX \
-    -DENABLE_INTERNAL_FMT=OFF \
-%if %{without sysffmpeg}
-    -DENABLE_INTERNAL_FFMPEG=ON \
-    -DFFMPEG_URL=%{SOURCE30} \
-%else
-    -DENABLE_INTERNAL_FFMPEG=OFF \
-%endif
-    -DENABLE_INTERNAL_CDIO=OFF \
-    -DENABLE_INTERNAL_SPDLOG=OFF \
-    -DCROSSGUID_URL=%{SOURCE20} \
-    -DLIBDVDNAV_URL=%{SOURCE21} \
-    -DLIBDVDCSS_URL=%{SOURCE22} \
-    -DLIBDVDREAD_URL=%{SOURCE23} \
-    -DENABLE_INTERNAL_RapidJSON=OFF \
-    -DENABLE_INTERNAL_FLATBUFFERS=OFF \
-    -DENABLE_INTERNAL_FSTRCMP=OFF \
-    -DENABLE_INTERNAL_UDFREAD=ON \
-    -DUDFREAD_URL=%{SOURCE24} \
-    -Dgroovy_SOURCE_DIR=%{_builddir}/groovy \
-    -Dapache-commons-lang_SOURCE_DIR=%{_datadir}/java \
-    -Dapache-commons-text_SOURCE_DIR=%{_datadir}/java/apache-commons-text \
-    -DAPP_RENDER_SYSTEM=gl \
-    -DX11_RENDER_SYSTEM=gl \
-    -DBUILD_SHARED_LIBS=1 \
-    -DPYTHON_VER=3.11 \
-%if %{with kodi_without_pipewire}
-    -DENABLE_PIPEWIRE=OFF \
-%endif
-    ${NULL}
-
-make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
-rm -rf %{_builddir}/groovy
+    --disable-optimizations \
+    --disable-static 
+
+make %{?_smp_mflags}
 
 %install
-pushd build
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
-#make -C tools/EventClients DESTDIR=%%{buildroot} install %%{?_smp_mflags}
+#make -C tools/EventClients DESTDIR=%{buildroot} install %{?_smp_mflags}
 
-# Tumbleweed does not have SuSEfirewall anymore:
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
 # SuSEfirewall service description
 install -D -m 644 %{_sourcedir}/kodi.SuSEFirewall2 %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 
 # Systemd service file
-%if %{without kodi_with_X11}
+%if %{noX_build}
 install -m 0644 -D %{SOURCE11} %{buildroot}/%{_unitdir}/kodi-noX.service
 %else
 install -m 0644 -D %{SOURCE10} %{buildroot}/%{_unitdir}/kodi.service
@@ -468,6 +381,10 @@
 # remove the doc files from unversioned /usr/share/doc/kodi, they should be in versioned docdir
 rm -r %{buildroot}/%{_datadir}/doc/
 
+# copy manpages
+install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
+install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
+
 # remove win32 source files
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.cpp
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.addon/dlfcn-win32.h
@@ -485,26 +402,10 @@
 rm -f %{buildroot}%{_kodi_addons_dir}/library.xbmc.pvr/libXBMC_pvr.h
 rm -f %{buildroot}%{_kodi_addons_dir}/library.kodi.guilib/libKODI_guilib.h
 
-# copy manpages
-popd
-install -m 644 -D docs/manpages/kodi-standalone.1 %{buildroot}%{_mandir}/man1/kodi-standalone.1
-install -m 644 -D docs/manpages/kodi.bin.1 %{buildroot}%{_mandir}/man1/kodi.1
-
 desktop-file-install \
  --dir=%{buildroot}%{_datadir}/applications \
  %{buildroot}%{_datadir}/applications/kodi.desktop
 
-%if %{without kodi_with_wayland}
-rm -f %{buildroot}%{_datadir}/wayland-sessions/kodi-gbm.desktop
-rmdir -p %{buildroot}%{_datadir}/wayland-sessions || true
-%endif
-
-# TexturePacker likes to be installed as kodi-TexturePacker, too.
-if  -f %{buildroot}%{_bindir}/kodi-TexturePacker  &&  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    rm -f %{buildroot}%{_bindir}/TexturePacker
-elif  -f %{buildroot}%{_bindir}/TexturePacker ; then
-    mv %{buildroot}%{_bindir}/TexturePacker %{buildroot}%{_bindir}/kodi-TexturePacker
-fi
 %fdupes %{buildroot}
 
 %pre
@@ -521,26 +422,25 @@
 
 %files
 %defattr(-,root,root)
-%doc version.txt 
-%if 0%{?is_opensuse} == 0 || 0%{?suse_version} < 1550
+%doc copying.txt LICENSE.GPL docs/README.linux
 %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/kodi
-%endif
 %{_bindir}/kodi
-%{_bindir}/kodi-standalone
-%{_bindir}/kodi-TexturePacker
 %dir %{_libdir}/kodi
-%if %{with kodi_with_X11}
-%{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
+%if !%{noX_build}
+%{_libdir}/kodi/kodi-xrandr
 %endif
+%{_bindir}/kodi-standalone
+%dir %{_libdir}/kodi/addons
+%dir %{_libdir}/kodi/addons/library.xbmc.addon/
+%{_libdir}/kodi/addons/library.xbmc.addon/*
+%dir %{_libdir}/kodi/addons/library.xbmc.codec/
+%{_libdir}/kodi/addons/library.xbmc.codec/*
+%dir %{_libdir}/kodi/addons/library.xbmc.pvr/
+%{_libdir}/kodi/addons/library.xbmc.pvr/*
 %{_datadir}/xsessions/kodi.desktop
-%if %{with kodi_with_wayland}
-%dir %{_datadir}/wayland-sessions
-%{_datadir}/wayland-sessions/kodi-gbm.desktop
-%endif
 %{_datadir}/applications/kodi.desktop
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
-%{_datadir}/icons/*
+%{_datadir}/icons/hicolor/*/*/*.png
 %dir %{_datadir}/kodi
 %dir %{_datadir}/kodi/media
 %dir %{_datadir}/kodi/system
@@ -555,13 +455,9 @@
 %{_mandir}/man1/kodi-standalone.1.gz
 %dir %{_kodi_addons_dir}
 %dir %{_kodi_addons_dir}/game.controller.default
-%{_kodi_addons_dir}/game.controller.default/*
-%dir %{_kodi_addons_dir}/game.controller.keyboard
-%{_kodi_addons_dir}/game.controller.keyboard/*
-%dir %{_kodi_addons_dir}/game.controller.mouse
-%{_kodi_addons_dir}/game.controller.mouse/*
-%dir %{_kodi_addons_dir}/game.controller.snes
-%{_kodi_addons_dir}/game.controller.snes/*
+%{_kodi_addons_dir}/game.controller.default/* 
+%dir %{_kodi_addons_dir}/kodi.game
+%{_kodi_addons_dir}/kodi.game/*
 %dir %{_kodi_addons_dir}/metadata.album.universal/
 %{_kodi_addons_dir}/metadata.album.universal/*
 %dir %{_kodi_addons_dir}/metadata.artists.universal/
@@ -570,16 +466,20 @@
 %{_kodi_addons_dir}/metadata.common.allmusic.com/*
 %dir %{_kodi_addons_dir}/metadata.common.fanart.tv/
 %{_kodi_addons_dir}/metadata.common.fanart.tv/*
+%dir %{_kodi_addons_dir}/metadata.common.htbackdrops.com/
+%{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
+%dir %{_kodi_addons_dir}/metadata.common.imdb.com/
+%{_kodi_addons_dir}/metadata.common.imdb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
-%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
+%dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
+%{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-%dir %{_kodi_addons_dir}/metadata.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.themoviedb.org.python/*
-%dir %{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/
-%{_kodi_addons_dir}/metadata.tvshows.themoviedb.org.python/*
+%dir %{_kodi_addons_dir}/metadata.themoviedb.org/
+%{_kodi_addons_dir}/metadata.themoviedb.org/*
+%dir %{_kodi_addons_dir}/metadata.tvdb.com/
+%{_kodi_addons_dir}/metadata.tvdb.com/*
 %dir %{_kodi_addons_dir}/repository.xbmc.org/
 %{_kodi_addons_dir}/repository.xbmc.org/*
 %dir %{_kodi_addons_dir}/resource.uisounds.kodi/
@@ -594,6 +494,8 @@
 %{_kodi_addons_dir}/service.xbmc.versioncheck/*
 %dir %{_kodi_addons_dir}/webinterface.default/
 %{_kodi_addons_dir}/webinterface.default/*
+%dir %{_kodi_addons_dir}/xbmc.codec/
+%{_kodi_addons_dir}/xbmc.codec/*
 %dir %{_kodi_addons_dir}/xbmc.addon/
 %{_kodi_addons_dir}/xbmc.addon/*
 %dir %{_kodi_addons_dir}/xbmc.core/
@@ -604,147 +506,114 @@
 %{_kodi_addons_dir}/xbmc.json/*
 %dir %{_kodi_addons_dir}/xbmc.metadata/
 %{_kodi_addons_dir}/xbmc.metadata/*
+%dir %{_kodi_addons_dir}/xbmc.pvr/
+%{_kodi_addons_dir}/xbmc.pvr/*
 %dir %{_kodi_addons_dir}/xbmc.python/
 %{_kodi_addons_dir}/xbmc.python/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.aac/*
-%dir %{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/
-%{_kodi_addons_dir}/audioencoder.kodi.builtin.wma/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.aac/*
+%dir %{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/
+%{_kodi_addons_dir}/audioencoder.xbmc.builtin.wma/*
+%dir %{_kodi_addons_dir}/kodi.audiodecoder/
+%{_kodi_addons_dir}/kodi.audiodecoder/*
+%dir %{_kodi_addons_dir}/kodi.guilib/
+%{_kodi_addons_dir}/kodi.guilib/*
 %dir %{_kodi_addons_dir}/kodi.resource/
 %{_kodi_addons_dir}/kodi.resource/*
 %dir %{_kodi_addons_dir}/resource.language.en_gb/
 %{_kodi_addons_dir}/resource.language.en_gb/*
+%dir %{_kodi_addons_dir}/xbmc.audioencoder/
+%{_kodi_addons_dir}/xbmc.audioencoder/*
 %dir %{_kodi_addons_dir}/xbmc.webinterface/
 %{_kodi_addons_dir}/xbmc.webinterface/*
+%dir %{_kodi_addons_dir}/kodi.adsp
+%{_kodi_addons_dir}/kodi.adsp/*
+%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com
+%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/resource.images.weathericons.default
 %{_kodi_addons_dir}/resource.images.weathericons.default/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.inputstream/
-%{_kodi_addons_dir}/kodi.binary.instance.inputstream/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audioencoder/
-%{_kodi_addons_dir}/kodi.binary.instance.audioencoder/*
+%dir %{_kodi_addons_dir}/kodi.inputstream
+%{_kodi_addons_dir}/kodi.inputstream/*
+%dir %{_kodi_addons_dir}/kodi.peripheral
+%{_kodi_addons_dir}/kodi.peripheral/*
+%dir %{_kodi_addons_dir}/skin.estouchy
+%{_kodi_addons_dir}/skin.estouchy/*
 %dir %{_kodi_addons_dir}/skin.estuary
 %{_kodi_addons_dir}/skin.estuary/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.audioengine
-%{_kodi_addons_dir}/kodi.binary.global.audioengine/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.filesystem
-%{_kodi_addons_dir}/kodi.binary.global.filesystem/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.general
-%{_kodi_addons_dir}/kodi.binary.global.general/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.gui
-%{_kodi_addons_dir}/kodi.binary.global.gui/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.main
-%{_kodi_addons_dir}/kodi.binary.global.main/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.network
-%{_kodi_addons_dir}/kodi.binary.global.network/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.audiodecoder
-%{_kodi_addons_dir}/kodi.binary.instance.audiodecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.game
-%{_kodi_addons_dir}/kodi.binary.instance.game/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.imagedecoder
-%{_kodi_addons_dir}/kodi.binary.instance.imagedecoder/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.peripheral
-%{_kodi_addons_dir}/kodi.binary.instance.peripheral/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.pvr
-%{_kodi_addons_dir}/kodi.binary.instance.pvr/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.screensaver
-%{_kodi_addons_dir}/kodi.binary.instance.screensaver/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.vfs
-%{_kodi_addons_dir}/kodi.binary.instance.vfs/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.videocodec
-%{_kodi_addons_dir}/kodi.binary.instance.videocodec/*
-%dir %{_kodi_addons_dir}/kodi.binary.instance.visualization
-%{_kodi_addons_dir}/kodi.binary.instance.visualization/*
-%dir %{_kodi_addons_dir}/script.module.pycryptodome
-%{_kodi_addons_dir}/script.module.pycryptodome/*
-%dir %{_kodi_addons_dir}/metadata.generic.albums
-%{_kodi_addons_dir}/metadata.generic.albums/*
-%dir %{_kodi_addons_dir}/metadata.generic.artists
-%{_kodi_addons_dir}/metadata.generic.artists/*
-%dir %{_kodi_addons_dir}/kodi.binary.global.tools
-%{_kodi_addons_dir}/kodi.binary.global.tools/*
-
-%dir %{_libdir}/firewalld
-%dir %{_libdir}/firewalld/services
-%{_libdir}/firewalld/services/kodi-eventserver.xml
-%{_libdir}/firewalld/services/kodi-http.xml
-%{_libdir}/firewalld/services/kodi-jsonrpc.xml
-
-%if %{without kodi_with_X11}
+%dir %{_libdir}/kodi/addons/library.kodi.guilib/
+%{_libdir}/kodi/addons/library.kodi.guilib/*
+%dir %{_libdir}/kodi/addons/library.kodi.adsp
+%{_libdir}/kodi/addons/library.kodi.adsp/*
+%dir %{_libdir}/kodi/addons/library.kodi.audioengine
+%{_libdir}/kodi/addons/library.kodi.audioengine/*
+%dir %{_libdir}/kodi/addons/library.kodi.inputstream
+%{_libdir}/kodi/addons/library.kodi.inputstream/*
+%dir %{_libdir}/kodi/addons/library.kodi.peripheral
+%{_libdir}/kodi/addons/library.kodi.peripheral/*
+
+%if %{noX_build}
 %{_unitdir}/kodi-noX.service
 %else
 %{_unitdir}/kodi.service
 %endif
 
-%dir %{_datadir}/kodi/cmake
-%{_datadir}/kodi/cmake/AddonHelpers.cmake
-%{_datadir}/kodi/cmake/AddOptions.cmake
-%{_datadir}/kodi/cmake/ArchSetup.cmake
-%{_datadir}/kodi/cmake/CheckCommits.cmake
-%{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
-%{_datadir}/kodi/cmake/GeneratorSetup.cmake
-%{_datadir}/kodi/cmake/HandleDepends.cmake
-%{_datadir}/kodi/cmake/Macros.cmake
-%{_datadir}/kodi/cmake/PrepareEnv.cmake
-%{_datadir}/kodi/cmake/ProjectMacros.cmake
-%{_datadir}/kodi/cmake/PathSetup.cmake
-%dir %{_libdir}/kodi/cmake
-%{_libdir}/kodi/cmake/KodiConfig.cmake
-
-%{_datadir}/metainfo/org.xbmc.kodi.metainfo.xml
+%{_libdir}/kodi/AddOptions.cmake
+%{_libdir}/kodi/AddonHelpers.cmake
+%{_libdir}/kodi/ArchSetup.cmake
+%{_libdir}/kodi/CheckCommits.cmake
+%{_libdir}/kodi/CheckTargetPlatform.cmake
+%{_libdir}/kodi/GenerateVersionedFiles.cmake
+%{_libdir}/kodi/GeneratorSetup.cmake
+%{_libdir}/kodi/HandleDepends.cmake
+%{_libdir}/kodi/KodiConfig.cmake
+%{_libdir}/kodi/Macros.cmake
+%{_libdir}/kodi/PrepareEnv.cmake
+%{_libdir}/kodi/ProjectMacros.cmake
+%{_libdir}/kodi/CMakeHelpers.cmake
+%{_libdir}/kodi/Uninstall.cmake
+
+
 
 %files devel
 %defattr(-,root,root)
 %dir %{_includedir}/kodi
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/DllHelper.h
-%{_includedir}/kodi/AddonBase.h
-%{_includedir}/kodi/AudioEngine.h
-%{_includedir}/kodi/Filesystem.h
-%{_includedir}/kodi/General.h
-%{_includedir}/kodi/Network.h
-%{_includedir}/kodi/versions.h
-%dir %{_includedir}/kodi/addon-instance
-%{_includedir}/kodi/addon-instance/*
-%dir %{_includedir}/kodi/addon-instance/inputstream
-%{_includedir}/kodi/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/addon-instance/peripheral
-%{_includedir}/kodi/addon-instance/peripheral/*
-%dir %{_includedir}/kodi/addon-instance/pvr
-%{_includedir}/kodi/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api
-%{_includedir}/kodi/c-api/*
-%dir %{_includedir}/kodi/c-api/addon-instance
-%{_includedir}/kodi/c-api/addon-instance/*
-%dir %{_includedir}/kodi/c-api/addon-instance/inputstream
-%{_includedir}/kodi/c-api/addon-instance/inputstream/*
-%dir %{_includedir}/kodi/c-api/addon-instance/pvr
-%{_includedir}/kodi/c-api/addon-instance/pvr/*
-%dir %{_includedir}/kodi/c-api/gui
-%{_includedir}/kodi/c-api/gui/*
-%dir %{_includedir}/kodi/c-api/gui/controls
-%{_includedir}/kodi/c-api/gui/controls/*
-%dir %{_includedir}/kodi/c-api/gui/dialogs
-%{_includedir}/kodi/c-api/gui/dialogs/*
-%dir %{_includedir}/kodi/c-api/gui/input
-%{_includedir}/kodi/c-api/gui/input/*
-%dir %{_includedir}/kodi/c-api/platform
-%dir %{_includedir}/kodi/c-api/platform/android
-%{_includedir}/kodi/c-api/platform/android/*
-%dir %{_includedir}/kodi/gui
-%{_includedir}/kodi/gui/*
-%dir %{_includedir}/kodi/gui/controls
-%{_includedir}/kodi/gui/controls/*
-%dir %{_includedir}/kodi/gui/dialogs
-%{_includedir}/kodi/gui/dialogs/*
-%dir %{_includedir}/kodi/gui/gl
-%{_includedir}/kodi/gui/gl/*
-%dir %{_includedir}/kodi/gui/input
-%{_includedir}/kodi/gui/input/*
-%dir %{_includedir}/kodi/platform
-%dir %{_includedir}/kodi/platform/android
-%{_includedir}/kodi/platform/android/System.h
-%dir %{_includedir}/kodi/tools
-%{_includedir}/kodi/tools/*
+%{_includedir}/kodi/AEChannelData.h
+%{_includedir}/kodi/DVDDemuxPacket.h
+%{_includedir}/kodi/IFileTypes.h
+%{_includedir}/kodi/libXBMC_addon.h
+%{_includedir}/kodi/libXBMC_codec.h
+%{_includedir}/kodi/libXBMC_pvr.h
+%{_includedir}/kodi/libKODI_adsp.h
+%{_includedir}/kodi/libKODI_audioengine.h
+%{_includedir}/kodi/libKODI_guilib.h
+%{_includedir}/kodi/libKODI_inputstream.h
+%{_includedir}/kodi/libKODI_peripheral.h
+%{_includedir}/kodi/xbmc_addon_cpp_dll.h
+%{_includedir}/kodi/xbmc_addon_dll.h
+%{_includedir}/kodi/xbmc_addon_types.h
+%{_includedir}/kodi/xbmc_codec_types.h
+%{_includedir}/kodi/xbmc_epg_types.h
+%{_includedir}/kodi/xbmc_pvr_dll.h
+%{_includedir}/kodi/xbmc_pvr_types.h
+%{_includedir}/kodi/xbmc_scr_dll.h
+%{_includedir}/kodi/xbmc_scr_types.h
+%{_includedir}/kodi/xbmc_vis_dll.h
+%{_includedir}/kodi/xbmc_vis_types.h
+%{_includedir}/kodi/xbmc_audioenc_dll.h
+%{_includedir}/kodi/xbmc_audioenc_types.h
+%{_includedir}/kodi/kodi_audiodec_dll.h
+%{_includedir}/kodi/kodi_audiodec_types.h
+%{_includedir}/kodi/kodi_adsp_dll.h
+%{_includedir}/kodi/kodi_adsp_types.h
+%{_includedir}/kodi/kodi_audioengine_types.h
+%{_includedir}/kodi/kodi_inputstream_dll.h
+%{_includedir}/kodi/kodi_inputstream_types.h
+%{_includedir}/kodi/kodi_peripheral_callbacks.h
+%{_includedir}/kodi/kodi_peripheral_dll.h
+%{_includedir}/kodi/kodi_peripheral_types.h
+%{_includedir}/kodi/kodi_peripheral_utils.hpp
+%{_includedir}/kodi/kodi_vfs_types.h
+%{_includedir}/kodi/kodi_vfs_utils.hpp
+
 
 %changelog

0001-crossguid-dgb.patch Deleted

@@ -1,22 +0,0 @@
-diff -rup a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake
---- a/cmake/modules/FindCrossGUID.cmake	2023-12-09 22:24:46.000000000 +0100
-+++ b/cmake/modules/FindCrossGUID.cmake	2023-12-19 10:43:18.920305675 +0100
-@@ -14,7 +14,6 @@ macro(buildCrossGUID)
-   SETUP_BUILD_VARS()
- 
-   set(CROSSGUID_VERSION ${${MODULE}_VER})
--  set(CROSSGUID_DEBUG_POSTFIX "-dgb")
- 
-   set(_crossguid_definitions HAVE_NEW_CROSSGUID)
- 
-@@ -53,10 +52,6 @@ if(NOT TARGET CrossGUID::CrossGUID)
-                                            HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR}
-                                            ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}
-                                            NO_CACHE)
--    find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb
--                                         HINTS ${DEPENDS_PATH}/lib ${PC_CROSSGUID_LIBDIR}
--                                         ${${CORE_PLATFORM_LC}_SEARCH_CONFIG}
--                                         NO_CACHE)
- 
-     # NEW_CROSSGUID >= 0.2.0 release
-     if(EXISTS "${CROSSGUID_INCLUDE_DIR}/crossguid/guid.hpp")

0002-kodi-install.patch Deleted

0003-kodi-disable-wayland.patch Deleted

0004-kodi-workaround-pipewire-bug.patch Deleted

@@ -1,41 +0,0 @@
-diff -rup a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in
---- a/tools/Linux/kodi.sh.in	2024-04-06 04:29:22.000000000 +0200
-+++ b/tools/Linux/kodi.sh.in	2024-04-22 17:58:07.556342563 +0200
-@@ -171,6 +171,7 @@ if command_exists gdb; then
-   fi
- fi
- 
-+ENV_ARGS=
- if  -n "${KODI_AE_SINK}" ; then
- 
-   echo "KODI_AE_SINK env variable is deprecated and will be removed in the future."
-@@ -189,6 +190,14 @@ if  -n "${KODI_AE_SINK}" ; then
-   elif  "${KODI_AE_SINK}" = "ALSA+PULSE" ; then
-     ENV_ARGS="--audio-backend=alsa+pulseaudio"
-   fi
-+else
-+  # Work around a possibly broken installation of pipewire on openSUSE Leap
-+  # see 'https://bugzilla.opensuse.org/show_bug.cgi?id=1222636'
-+  if  -x ${prefix}/bin/pulseaudio  &&
-+      -x ${prefix}/bin/pipewire  &&
-+      ! -x ${prefix}/bin/pipewire-pulse ; then
-+    ENV_ARGS="--audio-backend=pulseaudio"
-+  fi
- fi
- 
- if  -n "${KODI_GL_INTERFACE}" ; then
-@@ -197,11 +206,11 @@ if  -n "${KODI_GL_INTERFACE}" ; then
-   echo "Use the --gl-interface command line switch instead."
- 
-   if  "${KODI_GL_INTERFACE}" = "GLX" ; then
--    ENV_ARGS="--gl-interface=glx"
-+    ENV_ARGS="${ENV_ARGS} --gl-interface=glx"
-   elif  "${KODI_GL_INTERFACE}" = "EGL" ; then
--    ENV_ARGS="--gl-interface=egl"
-+    ENV_ARGS="${ENV_ARGS} --gl-interface=egl"
-   elif  "${KODI_GL_INTERFACE}" = "EGL_PB" ; then
--    ENV_ARGS="--gl-interface=egl-pb"
-+    ENV_ARGS="${ENV_ARGS} --gl-interface=egl-pb"
-   fi
- fi
-

add_rpi2_support.patch Added

crossguid_build64.patch Added

@@ -0,0 +1,57 @@
+--- tools/depends/target/crossguid/Makefile.orig	2015-11-18 20:23:57.292287991 +0200
++++ tools/depends/target/crossguid/Makefile	2015-11-18 20:26:03.680950988 +0200
+@@ -6,7 +6,7 @@
+ VERSION=8f399e8bd4
+ SOURCE=$(LIBNAME)-$(VERSION)
+ ARCHIVE=$(SOURCE).tar.gz
+-
++LIBDIR=lib
+ 
+ ifeq ($(CROSS_COMPILING), yes)
+   DEPS += ../../Makefile.include
+@@ -37,8 +37,8 @@
+ 
+ .PHONY: .installed-$(PLATFORM)
+ 
+-all: .installed-$(PLATFORM) $(PREFIX)/lib/lib$(LIBNAME).a
+-$(PREFIX)/lib/lib$(LIBNAME).a:
++all: .installed-$(PLATFORM) $(PREFIX)/$(LIBDIR)/lib$(LIBNAME).a
++$(PREFIX)/$(LIBDIR)/lib$(LIBNAME).a:
+ 	@make .installed-$(PLATFORM)
+ 
+ $(TARBALLS_LOCATION)/$(ARCHIVE):
+@@ -59,9 +59,9 @@
+ 
+ .installed-$(PLATFORM): $(LIBDYLIB)
+ 	@ -d $(PREFIX)/include  || mkdir -p $(PREFIX)/include
+-	@ -d $(PREFIX)/lib  || mkdir $(PREFIX)/lib
++	@ -d $(PREFIX)/$(LIBDIR)  || mkdir $(PREFIX)/$(LIBDIR)
+ 	cp $(PLATFORM)/guid.h $(PREFIX)/include/
+-	cp $(LIBDYLIB) $(PREFIX)/lib/
++	cp $(LIBDYLIB) $(PREFIX)/$(LIBDIR)/
+ 	touch $@
+ 
+ clean:
+--- configure.ac.orig	2015-11-18 21:11:21.359915900 +0200
++++ configure.ac	2015-11-18 21:13:32.074555671 +0200
+@@ -1133,12 +1133,14 @@
+ AC_LANG_PUSH(C++)
+ SAVED_LIBS="$LIBS"
+ LIBS="$LIBS -lcrossguid $UUID_LIBS"
+-AC_LINK_IFELSE(
+-  AC_LANG_PROGRAM(
+-    #include <guid.h>,
+-    Guid dummy),
+-  AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid $UUID_LIBS",
+-  AC_MSG_ERROR(crossguid not found))
++#AC_LINK_IFELSE(
++#  AC_LANG_PROGRAM(
++#    #include <guid.h>,
++#    Guid dummy),
++#  AC_MSG_RESULT(yes); SAVED_LIBS="$SAVED_LIBS $LDFLAGS -lcrossguid $UUID_LIBS",
++#  AC_MSG_ERROR(crossguid not found))
++AC_MSG_RESULT(yes) 
++SAVED_LIBS="$SAVED_LIBS $LDFLAGS"
+ LIBS="$SAVED_LIBS"
+ AC_LANG_POP(C++)
+

disable_internal_libdvd.patch Added

kodi-15.0-gcc5.patch Added

kodi-texturepacker.patch Added

kodi.cximage.gcc6.patch Added

@@ -0,0 +1,1391 @@
+https://github.com/xbmc/xbmc/pull/9703
+---
+ lib/cximage-6.0/CxImage/ximabmp.cpp  |    6 -
+ lib/cximage-6.0/CxImage/ximadef.h    |    8 -
+ lib/cximage-6.0/CxImage/ximadsp.cpp  |  182 +++++++++++++++++------------------
+ lib/cximage-6.0/CxImage/ximage.cpp   |    4 
+ lib/cximage-6.0/CxImage/ximagif.cpp  |    6 -
+ lib/cximage-6.0/CxImage/ximahist.cpp |   12 +-
+ lib/cximage-6.0/CxImage/ximaint.cpp  |    8 -
+ lib/cximage-6.0/CxImage/ximaiter.h   |    4 
+ lib/cximage-6.0/CxImage/ximajpg.cpp  |    2 
+ lib/cximage-6.0/CxImage/ximapal.cpp  |   14 +-
+ lib/cximage-6.0/CxImage/ximapng.cpp  |   12 +-
+ lib/cximage-6.0/CxImage/ximaraw.cpp  |    4 
+ lib/cximage-6.0/CxImage/ximasel.cpp  |   54 +++++-----
+ lib/cximage-6.0/CxImage/ximath.cpp   |    8 -
+ lib/cximage-6.0/CxImage/ximatif.cpp  |    6 -
+ lib/cximage-6.0/CxImage/ximatran.cpp |  138 +++++++++++++-------------
+ lib/cximage-6.0/CxImage/ximawnd.cpp  |   16 +--
+ 17 files changed, 238 insertions(+), 246 deletions(-)
+
+--- a/lib/cximage-6.0/CxImage/ximabmp.cpp
++++ b/lib/cximage-6.0/CxImage/ximabmp.cpp
+@@ -46,7 +46,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
+ 		bihtoh(&infohdr);
+ 
+ 		// Write the file header
+-		hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
++		hFile->Write(&hdr,cmin(14,sizeof(BITMAPFILEHEADER)),1);
+ 		hFile->Write(&infohdr,sizeof(BITMAPINFOHEADER),1);
+ 		 //and DIB+ALPHA interlaced
+ 		BYTE *srcalpha = AlphaGetPointer();
+@@ -64,7 +64,7 @@ bool CxImageBMP::Encode(CxFile * hFile)
+ #endif //CXIMAGE_SUPPORT_ALPHA
+ 	{
+ 		// Write the file header
+-		hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1);
++		hFile->Write(&hdr,cmin(14,sizeof(BITMAPFILEHEADER)),1);
+ 		//copy attributes
+ 		memcpy(pDib,&head,sizeof(BITMAPINFOHEADER));
+ 		bihtoh((BITMAPINFOHEADER*)pDib);
+@@ -86,7 +86,7 @@ bool CxImageBMP::Decode(CxFile * hFile)
+ 	BITMAPFILEHEADER   bf;
+ 	DWORD off = hFile->Tell(); //<CSC>
+   cx_try {
+-	if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
++	if (hFile->Read(&bf,cmin(14,sizeof(bf)),1)==0) cx_throw("Not a BMP");
+ 
+ 	bf.bfSize = my_ntohl(bf.bfSize); 
+ 	bf.bfOffBits = my_ntohl(bf.bfOffBits); 
+--- a/lib/cximage-6.0/CxImage/ximadef.h
++++ b/lib/cximage-6.0/CxImage/ximadef.h
+@@ -53,12 +53,8 @@
+  #define CXIMAGE_SUPPORT_WINDOWS 0
+ #endif
+ 
+-#ifndef min
+-#define min(a,b) (((a)<(b))?(a):(b))
+-#endif
+-#ifndef max
+-#define max(a,b) (((a)>(b))?(a):(b))
+-#endif
++#define cmin(a,b) (((a)<(b))?(a):(b))
++#define cmax(a,b) (((a)>(b))?(a):(b))
+ 
+ #ifndef PI
+  #define PI 3.141592653589793f
+--- a/lib/cximage-6.0/CxImage/ximadsp.cpp
++++ b/lib/cximage-6.0/CxImage/ximadsp.cpp
+@@ -389,8 +389,8 @@ RGBQUAD CxImage::RGBtoHSL(RGBQUAD lRGBCo
+ 	G = lRGBColor.rgbGreen;
+ 	B = lRGBColor.rgbBlue;
+ 
+-	cMax = max( max(R,G), B);	/* calculate lightness */
+-	cMin = min( min(R,G), B);
++	cMax = cmax( cmax(R,G), B);	/* calculate lightness */
++	cMin = cmin( cmin(R,G), B);
+ 	L = (BYTE)((((cMax+cMin)*HSLMAX)+RGBMAX)/(2*RGBMAX));
+ 
+ 	if (cMax==cMin){			/* r=g=b --> achromatic case */
+@@ -489,9 +489,9 @@ RGBQUAD CxImage::YUVtoRGB(RGBQUAD lYUVCo
+ 	G = (int)( Y - 0.344f * U - 0.714f * V);
+ 	B = (int)( Y + 1.770f * U);
+ 
+-	R= min(255,max(0,R));
+-	G= min(255,max(0,G));
+-	B= min(255,max(0,B));
++	R= cmin(255,cmax(0,R));
++	G= cmin(255,cmax(0,G));
++	B= cmin(255,cmax(0,B));
+ 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
+ 	return rgb;
+ }
+@@ -510,9 +510,9 @@ RGBQUAD CxImage::RGBtoYUV(RGBQUAD lRGBCo
+ 	U = (int)((B-Y) * 0.565f + 128);
+ 	V = (int)((R-Y) * 0.713f + 128);
+ 
+-	Y= min(255,max(0,Y));
+-	U= min(255,max(0,U));
+-	V= min(255,max(0,V));
++	Y= cmin(255,cmax(0,Y));
++	U= cmin(255,cmax(0,U));
++	V= cmin(255,cmax(0,V));
+ 	RGBQUAD yuv={(BYTE)V,(BYTE)U,(BYTE)Y,0};
+ 	return yuv;
+ }
+@@ -528,9 +528,9 @@ RGBQUAD CxImage::YIQtoRGB(RGBQUAD lYIQCo
+ 	G = (int)( Y - 0.273f * I - 0.647f * Q);
+ 	B = (int)( Y - 1.104f * I + 1.701f * Q);
+ 
+-	R= min(255,max(0,R));
+-	G= min(255,max(0,G));
+-	B= min(255,max(0,B));
++	R= cmin(255,cmax(0,R));
++	G= cmin(255,cmax(0,G));
++	B= cmin(255,cmax(0,B));
+ 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
+ 	return rgb;
+ }
+@@ -546,9 +546,9 @@ RGBQUAD CxImage::RGBtoYIQ(RGBQUAD lRGBCo
+ 	I = (int)( 0.5960f * R - 0.2742f * G - 0.3219f * B + 128);
+ 	Q = (int)( 0.2109f * R - 0.5229f * G + 0.3120f * B + 128);
+ 
+-	Y= min(255,max(0,Y));
+-	I= min(255,max(0,I));
+-	Q= min(255,max(0,Q));
++	Y= cmin(255,cmax(0,Y));
++	I= cmin(255,cmax(0,I));
++	Q= cmin(255,cmax(0,Q));
+ 	RGBQUAD yiq={(BYTE)Q,(BYTE)I,(BYTE)Y,0};
+ 	return yiq;
+ }
+@@ -565,9 +565,9 @@ RGBQUAD CxImage::XYZtoRGB(RGBQUAD lXYZCo
+ 	G = (int)( -0.969256f * X + 1.875992f * Y + 0.041556f * Z * k);
+ 	B = (int)(  0.055648f * X - 0.204043f * Y + 1.057311f * Z * k);
+ 
+-	R= min(255,max(0,R));
+-	G= min(255,max(0,G));
+-	B= min(255,max(0,B));
++	R= cmin(255,cmax(0,R));
++	G= cmin(255,cmax(0,G));
++	B= cmin(255,cmax(0,B));
+ 	RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0};
+ 	return rgb;
+ }
+@@ -583,9 +583,9 @@ RGBQUAD CxImage::RGBtoXYZ(RGBQUAD lRGBCo
+ 	Y = (int)( 0.212671f * R + 0.715160f * G + 0.072169f * B);
+ 	Z = (int)((0.019334f * R + 0.119193f * G + 0.950227f * B)*0.918483657f);
+ 
+-	//X= min(255,max(0,X));
+-	//Y= min(255,max(0,Y));
+-	//Z= min(255,max(0,Z));
++	//X= cmin(255,cmax(0,X));
++	//Y= cmin(255,cmax(0,Y));
++	//Z= cmin(255,cmax(0,Z));
+ 	RGBQUAD xyz={(BYTE)Z,(BYTE)Y,(BYTE)X,0};
+ 	return xyz;
+ }
+@@ -707,7 +707,7 @@ bool CxImage::Light(long brightness, lon
+ 
+ 	BYTE cTable256; //<nipper>
+ 	for (int i=0;i<256;i++)	{
+-		cTablei = (BYTE)max(0,min(255,(int)((i-128)*c + brightness + 0.5f)));
++		cTablei = (BYTE)cmax(0,cmin(255,(int)((i-128)*c + brightness + 0.5f)));
+ 	}
+ 
+ 	return Lut(cTable);
+@@ -830,11 +830,11 @@ bool CxImage::Filter(long* kernel, long
+ 						}
+ 					}
+ 					if (Kfactor==0 || ksumcur==0){
+-						cPtr2iY1 = (BYTE)min(255, max(0,(int)(b + Koffset)));
++						cPtr2iY1 = (BYTE)cmin(255, cmax(0,(int)(b + Koffset)));
+ 					} else if (ksumtot == ksumcur) {
+-						cPtr2iY1 = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
++						cPtr2iY1 = (BYTE)cmin(255, cmax(0,(int)(b/Kfactor + Koffset)));
+ 					} else {
+-						cPtr2iY1 = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
++						cPtr2iY1 = (BYTE)cmin(255, cmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
+ 					}
+ 				}
+ 			}
+@@ -863,17 +863,17 @@ bool CxImage::Filter(long* kernel, long
+ 						}
+ 					}
+ 					if (Kfactor==0 || ksumcur==0){
+-						c.rgbRed   = (BYTE)min(255, max(0,(int)(r + Koffset)));
+-						c.rgbGreen = (BYTE)min(255, max(0,(int)(g + Koffset)));
+-						c.rgbBlue  = (BYTE)min(255, max(0,(int)(b + Koffset)));
++						c.rgbRed   = (BYTE)cmin(255, cmax(0,(int)(r + Koffset)));
++						c.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(g + Koffset)));
++						c.rgbBlue  = (BYTE)cmin(255, cmax(0,(int)(b + Koffset)));
+ 					} else if (ksumtot == ksumcur) {
+-						c.rgbRed   = (BYTE)min(255, max(0,(int)(r/Kfactor + Koffset)));
+-						c.rgbGreen = (BYTE)min(255, max(0,(int)(g/Kfactor + Koffset)));
+-						c.rgbBlue  = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset)));
++						c.rgbRed   = (BYTE)cmin(255, cmax(0,(int)(r/Kfactor + Koffset)));
++						c.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(g/Kfactor + Koffset)));
++						c.rgbBlue  = (BYTE)cmin(255, cmax(0,(int)(b/Kfactor + Koffset)));
+ 					} else {
+-						c.rgbRed   = (BYTE)min(255, max(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset)));
+-						c.rgbGreen = (BYTE)min(255, max(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset)));
+-						c.rgbBlue  = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
++						c.rgbRed   = (BYTE)cmin(255, cmax(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset)));
++						c.rgbGreen = (BYTE)cmin(255, cmax(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset)));
++						c.rgbBlue  = (BYTE)cmin(255, cmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset)));
+ 					}
+ 					tmp.BlindSetPixelColor(x,y,c);
+ 				}
+@@ -1078,8 +1078,8 @@ bool CxImage::Edge(long Ksize)
+ // 
+ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffset, bool bMixAlpha)
+ {
+-    long lWide = min(GetWidth(),imgsrc2.GetWidth()-lXOffset);
+-    long lHeight = min(GetHeight(),imgsrc2.GetHeight()-lYOffset);
++    long lWide = cmin(GetWidth(),imgsrc2.GetWidth()-lXOffset);
++    long lHeight = cmin(GetHeight(),imgsrc2.GetHeight()-lYOffset);
+ 
+ 	bool bEditAlpha = imgsrc2.AlphaIsValid() & bMixAlpha;
+ 
+@@ -1112,16 +1112,16 @@ void CxImage::Mix(CxImage & imgsrc2, Ima
+ 						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)((rgb1.rgbReserved+rgb2.rgbReserved)/2);
+ 					break;
+ 					case OpAdd:
+-						rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue+rgb2.rgbBlue));
+-						rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen+rgb2.rgbGreen));
+-						rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed+rgb2.rgbRed));
+-						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved+rgb2.rgbReserved));
++						rgbDest.rgbBlue = (BYTE)cmax(0,cmin(255,rgb1.rgbBlue+rgb2.rgbBlue));
++						rgbDest.rgbGreen = (BYTE)cmax(0,cmin(255,rgb1.rgbGreen+rgb2.rgbGreen));
++						rgbDest.rgbRed = (BYTE)cmax(0,cmin(255,rgb1.rgbRed+rgb2.rgbRed));
++						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cmax(0,cmin(255,rgb1.rgbReserved+rgb2.rgbReserved));
+ 					break;
+ 					case OpSub:
+-						rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue-rgb2.rgbBlue));
+-						rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen-rgb2.rgbGreen));
+-						rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed-rgb2.rgbRed));
+-						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved-rgb2.rgbReserved));
++						rgbDest.rgbBlue = (BYTE)cmax(0,cmin(255,rgb1.rgbBlue-rgb2.rgbBlue));
++						rgbDest.rgbGreen = (BYTE)cmax(0,cmin(255,rgb1.rgbGreen-rgb2.rgbGreen));
++						rgbDest.rgbRed = (BYTE)cmax(0,cmin(255,rgb1.rgbRed-rgb2.rgbRed));
++						if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cmax(0,cmin(255,rgb1.rgbReserved-rgb2.rgbReserved));
+ 					break;
+ 					case OpAnd:
+ 						rgbDest.rgbBlue = (BYTE)(rgb1.rgbBlue&rgb2.rgbBlue);
+@@ -1202,11 +1202,11 @@ void CxImage::Mix(CxImage & imgsrc2, Ima
+ 							double dSmallAmt = dSmall*((double)rgb2.rgbBlue);
+ 
+ 							if( lAverage < lThresh+1){
+-								rgbDest.rgbBlue = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbBlue) +
++								rgbDest.rgbBlue = (BYTE)cmax(0,cmin(255,(int)(dLarge*((double)rgb1.rgbBlue) +
+ 												dSmallAmt)));
+-								rgbDest.rgbGreen = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbGreen) +
++								rgbDest.rgbGreen = (BYTE)cmax(0,cmin(255,(int)(dLarge*((double)rgb1.rgbGreen) +
+ 												dSmallAmt)));
+-								rgbDest.rgbRed = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbRed) +
++								rgbDest.rgbRed = (BYTE)cmax(0,cmin(255,(int)(dLarge*((double)rgb1.rgbRed) +
+ 												dSmallAmt)));
+ 							}
+ 							else
+@@ -1274,9 +1274,9 @@ bool CxImage::ShiftRGB(long r, long g, l
+ #endif //CXIMAGE_SUPPORT_SELECTION
+ 				{
+ 					color = BlindGetPixelColor(x,y);
+-					color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r)));
+-					color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g)));
+-					color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b)));
++					color.rgbRed = (BYTE)cmax(0,cmin(255,(int)(color.rgbRed + r)));
++					color.rgbGreen = (BYTE)cmax(0,cmin(255,(int)(color.rgbGreen + g)));
++					color.rgbBlue = (BYTE)cmax(0,cmin(255,(int)(color.rgbBlue + b)));
+ 					BlindSetPixelColor(x,y,color);
+ 				}
+ 			}
+@@ -1284,9 +1284,9 @@ bool CxImage::ShiftRGB(long r, long g, l
+ 	} else {
+ 		for(DWORD j=0; j<head.biClrUsed; j++){
+ 			color = GetPaletteColor((BYTE)j);
+-			color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r)));
+-			color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g)));
+-			color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b)));
++			color.rgbRed = (BYTE)cmax(0,cmin(255,(int)(color.rgbRed + r)));
++			color.rgbGreen = (BYTE)cmax(0,cmin(255,(int)(color.rgbGreen + g)));
++			color.rgbBlue = (BYTE)cmax(0,cmin(255,(int)(color.rgbBlue + b)));
+ 			SetPaletteColor((BYTE)j,color);
+ 		}
+ 	}
+@@ -1310,7 +1310,7 @@ bool CxImage::Gamma(float gamma)
+ 
+ 	BYTE cTable256; //<nipper>
+ 	for (int i=0;i<256;i++)	{
+-		cTablei = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
++		cTablei = (BYTE)cmax(0,cmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
+ 	}
+ 
+ 	return Lut(cTable);
+@@ -1337,21 +1337,21 @@ bool CxImage::GammaRGB(float gammaR, flo
+ 	dMax = pow(255.0, dinvgamma) / 255.0;
+ 	BYTE cTableR256;
+ 	for (i=0;i<256;i++)	{
+-		cTableRi = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
++		cTableRi = (BYTE)cmax(0,cmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
+ 	}
+ 
+ 	dinvgamma = 1/gammaG;
+ 	dMax = pow(255.0, dinvgamma) / 255.0;
+ 	BYTE cTableG256;
+ 	for (i=0;i<256;i++)	{
+-		cTableGi = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
++		cTableGi = (BYTE)cmax(0,cmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
+ 	}
+ 
+ 	dinvgamma = 1/gammaB;
+ 	dMax = pow(255.0, dinvgamma) / 255.0;
+ 	BYTE cTableB256;
+ 	for (i=0;i<256;i++)	{
+-		cTableBi = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax)));
++		cTableBi = (BYTE)cmax(0,cmin(255,(int)( pow((double)i, dinvgamma) / dMax)));
+ 	}
+ 
+ 	return Lut(cTableR, cTableG, cTableB);
+@@ -1442,11 +1442,11 @@ bool CxImage::Noise(long level)
+ 			{
+ 				color = BlindGetPixelColor(x,y);
+ 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
+-				color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + n)));
++				color.rgbRed = (BYTE)cmax(0,cmin(255,(int)(color.rgbRed + n)));
+ 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
+-				color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + n)));
++				color.rgbGreen = (BYTE)cmax(0,cmin(255,(int)(color.rgbGreen + n)));
+ 				n=(long)((rand()/(float)RAND_MAX - 0.5)*level);
+-				color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + n)));
++				color.rgbBlue = (BYTE)cmax(0,cmin(255,(int)(color.rgbBlue + n)));
+ 				BlindSetPixelColor(x,y,color);
+ 			}
+ 		}
+@@ -1561,8 +1561,8 @@ bool CxImage::FFT2(CxImage* srcReal, CxI
+ 
+ 	//DFT buffers
+ 	double *real2,*imag2;
+-	real2 = (double*)malloc(max(w,h) * sizeof(double));
+-	imag2 = (double*)malloc(max(w,h) * sizeof(double));
++	real2 = (double*)malloc(cmax(w,h) * sizeof(double));
++	imag2 = (double*)malloc(cmax(w,h) * sizeof(double));
+ 
+ 	/* Transform the rows */
+ 	real = (double *)malloc(w * sizeof(double));
+@@ -1617,7 +1617,7 @@ bool CxImage::FFT2(CxImage* srcReal, CxI
+ 
+ 	/* converting from double to byte, there is a HUGE loss in the dynamics
+ 	  "nn" tries to keep an acceptable SNR, but 8bit=48dB: don't ask more */
+-	double nn=pow((double)2,(double)log((double)max(w,h))/(double)log((double)2)-4);
++	double nn=pow((double)2,(double)log((double)cmax(w,h))/(double)log((double)2)-4);
+ 	//reversed gain for reversed transform
+ 	if (direction==-1) nn=1/nn;
+ 	//bMagnitude : just to see it on the screen
+@@ -1626,15 +1626,15 @@ bool CxImage::FFT2(CxImage* srcReal, CxI
+ 	for (j=0;j<h;j++) {
+ 		for (k=0;k<w;k++) {
+ 			if (bMagnitude){
+-				tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(nn*(3+log(_cabs(gridkj)))))));
++				tmpReal->SetPixelIndex(k,j,(BYTE)cmax(0,cmin(255,(nn*(3+log(_cabs(gridkj)))))));
+ 				if (gridkj.x==0){
+-					tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(gridkj.y/0.0000000001)*nn)))));
++					tmpImag->SetPixelIndex(k,j,(BYTE)cmax(0,cmin(255,(128+(atan(gridkj.y/0.0000000001)*nn)))));
+ 				} else {
+-					tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(gridkj.y/gridkj.x)*nn)))));
++					tmpImag->SetPixelIndex(k,j,(BYTE)cmax(0,cmin(255,(128+(atan(gridkj.y/gridkj.x)*nn)))));
+ 				}
+ 			} else {
+-				tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + gridkj.x*nn))));
+-				tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + gridkj.y*nn))));
++				tmpReal->SetPixelIndex(k,j,(BYTE)cmax(0,cmin(255,(128 + gridkj.x*nn))));
++				tmpImag->SetPixelIndex(k,j,(BYTE)cmax(0,cmin(255,(128 + gridkj.y*nn))));
+ 			}
+ 		}
+ 	}
+@@ -1922,7 +1922,7 @@ bool CxImage::RepairChannel(CxImage *ch,
+ 
+ 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
+ 
+-			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
++			tmp.BlindSetPixelIndex(x,y,(BYTE)cmin(255,cmax(0,(xy0 + radius * correction + 0.5))));
+ 		}
+ 	}
+ 
+@@ -1943,7 +1943,7 @@ bool CxImage::RepairChannel(CxImage *ch,
+ 
+ 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
+ 
+-			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
++			tmp.BlindSetPixelIndex(x,y,(BYTE)cmin(255,cmax(0,(xy0 + radius * correction + 0.5))));
+ 		}
+ 	}
+ 	for (x=0;x<=w;x+=w){
+@@ -1963,7 +1963,7 @@ bool CxImage::RepairChannel(CxImage *ch,
+ 
+ 			correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy);
+ 
+-			tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5))));
++			tmp.BlindSetPixelIndex(x,y,(BYTE)cmin(255,cmax(0,(xy0 + radius * correction + 0.5))));
+ 		}
+ 	}
+ 
+@@ -2621,8 +2621,8 @@ bool CxImage::SelectiveBlur(float radius
+ 	}
+ 
+ 	//build the difference mask
+-	BYTE thresh_dw = (BYTE)max( 0 ,(int)(128 - threshold));
+-	BYTE thresh_up = (BYTE)min(255,(int)(128 + threshold));
++	BYTE thresh_dw = (BYTE)cmax( 0 ,(int)(128 - threshold));
++	BYTE thresh_up = (BYTE)cmin(255,(int)(128 + threshold));
+ 	long kernel={-100,-100,-100,-100,801,-100,-100,-100,-100};
+ 	if (!Tmp.Filter(kernel,3,800,128)){
+ 		delete  pPalette;
+@@ -2755,7 +2755,7 @@ bool CxImage::UnsharpMask(float radius /
+ 					if (abs(diff) < threshold){
+ 						dest_rowz = cur_rowz;
+ 					} else {
+-						dest_rowz = (BYTE)min(255, max(0,(int)(cur_rowz + amount * diff)));
++						dest_rowz = (BYTE)cmin(255, cmax(0,(int)(cur_rowz + amount * diff)));
+ 					}
+ 				}
+ 			}
+@@ -2952,7 +2952,7 @@ bool CxImage::RedEyeRemove(float strengt
+ 				float a = 1.0f-5.0f*((float)((x-0.5f*(xmax+xmin))*(x-0.5f*(xmax+xmin))+(y-0.5f*(ymax+ymin))*(y-0.5f*(ymax+ymin))))/((float)((xmax-xmin)*(ymax-ymin)));
+ 				if (a<0) a=0;
+ 				color = BlindGetPixelColor(x,y);
+-				color.rgbRed = (BYTE)(a*min(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed);
++				color.rgbRed = (BYTE)(a*cmin(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed);
+ 				BlindSetPixelColor(x,y,color);
+ 			}
+ 		}
+@@ -2990,7 +2990,7 @@ bool CxImage::Saturate(const long satura
+ 	case 1:
+ 		{
+ 			for (int i=0;i<256;i++)	{
+-				cTablei = (BYTE)max(0,min(255,(int)(i + saturation)));
++				cTablei = (BYTE)cmax(0,cmin(255,(int)(i + saturation)));
+ 			}
+ 			for(long y=ymin; y<ymax; y++){
+ 				info.nProgress = (long)(100*(y-ymin)/(ymax-ymin));
+@@ -3012,7 +3012,7 @@ bool CxImage::Saturate(const long satura
+ 	case 2:
+ 		{
+ 			for (int i=0;i<256;i++)	{
+-				cTablei = (BYTE)max(0,min(255,(int)((i-128)*(100 + saturation)/100.0f + 128.5f)));
++				cTablei = (BYTE)cmax(0,cmin(255,(int)((i-128)*(100 + saturation)/100.0f + 128.5f)));
+ 			}
+ 			for(long y=ymin; y<ymax; y++){
+ 				info.nProgress = (long)(100*(y-ymin)/(ymax-ymin));
+@@ -3242,10 +3242,10 @@ int  CxImage::OptimalThreshold(long meth
+ 
+ 	long xmin,xmax,ymin,ymax;
+ 	if (pBox){
+-		xmin = max(pBox->left,0);
+-		xmax = min(pBox->right,head.biWidth);
+-		ymin = max(pBox->bottom,0);
+-		ymax = min(pBox->top,head.biHeight);
++		xmin = cmax(pBox->left,0);
++		xmax = cmin(pBox->right,head.biWidth);
++		ymin = cmax(pBox->bottom,0);
++		ymax = cmin(pBox->top,head.biHeight);
+ 	} else {
+ 		xmin = ymin = 0;
+ 		xmax = head.biWidth; ymax=head.biHeight;
+@@ -3463,7 +3463,7 @@ bool CxImage::AdaptiveThreshold(long met
+ 			r.top = r.bottom + nBoxSize;
+ 			int threshold = OptimalThreshold(method, &r, pContrastMask);
+ 			if (threshold <0) return false;
+-			mask.SetPixelIndex(x,y,(BYTE)max(0,min(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold))));
++			mask.SetPixelIndex(x,y,(BYTE)cmax(0,cmin(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold))));
+ 		}
+ 	}
+ 
+@@ -3490,10 +3490,6 @@ bool CxImage::AdaptiveThreshold(long met
+  * Note: nOpacity=0 && bSelectFilledArea=true act as a "magic wand"
+  * \return true if everything is ok
+  */
+-#if defined(XBMC) && !defined(_WIN32)
+-int max(int a, int b) { return a > b ? a : b; }
+-int min(int a, int b) { return a < b ? a : b; }
+-#endif
+ 
+ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFillColor, const BYTE nTolerance,
+ 						BYTE nOpacity, const bool bSelectFilledArea, const BYTE nSelectionLevel)
+@@ -3538,8 +3534,8 @@ bool CxImage::FloodFill(const long xStar
+ 	if (IsIndexed()){ //--- Generic indexed image, no tolerance OR Grayscale image with tolerance
+ 		BYTE idxRef = GetPixelIndex(xStart,yStart);
+ 		BYTE idxFill = GetNearestIndex(cFillColor);
+-		BYTE idxMin = (BYTE)min(255, max(0,(int)(idxRef - nTolerance)));
+-		BYTE idxMax = (BYTE)min(255, max(0,(int)(idxRef + nTolerance)));
++		BYTE idxMin = (BYTE)cmin(255, cmax(0,(int)(idxRef - nTolerance)));
++		BYTE idxMax = (BYTE)cmin(255, cmax(0,(int)(idxRef + nTolerance)));
+ 
+ 		while(!q.empty())
+ 		{
+@@ -3575,12 +3571,12 @@ bool CxImage::FloodFill(const long xStar
+ 	} else { //--- RGB image
+ 		RGBQUAD cRef = GetPixelColor(xStart,yStart);
+ 		RGBQUAD cRefMin, cRefMax;
+-		cRefMin.rgbRed   = (BYTE)min(255, max(0,(int)(cRef.rgbRed   - nTolerance)));
+-		cRefMin.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen - nTolerance)));
+-		cRefMin.rgbBlue  = (BYTE)min(255, max(0,(int)(cRef.rgbBlue  - nTolerance)));
+-		cRefMax.rgbRed   = (BYTE)min(255, max(0,(int)(cRef.rgbRed   + nTolerance)));
+-		cRefMax.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen + nTolerance)));
+-		cRefMax.rgbBlue  = (BYTE)min(255, max(0,(int)(cRef.rgbBlue  + nTolerance)));
++		cRefMin.rgbRed   = (BYTE)cmin(255, cmax(0,(int)(cRef.rgbRed   - nTolerance)));
++		cRefMin.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(cRef.rgbGreen - nTolerance)));
++		cRefMin.rgbBlue  = (BYTE)cmin(255, cmax(0,(int)(cRef.rgbBlue  - nTolerance)));
++		cRefMax.rgbRed   = (BYTE)cmin(255, cmax(0,(int)(cRef.rgbRed   + nTolerance)));
++		cRefMax.rgbGreen = (BYTE)cmin(255, cmax(0,(int)(cRef.rgbGreen + nTolerance)));
++		cRefMax.rgbBlue  = (BYTE)cmin(255, cmax(0,(int)(cRef.rgbBlue  + nTolerance)));
+ 
+ 		while(!q.empty())
+ 		{
+--- a/lib/cximage-6.0/CxImage/ximage.cpp
++++ b/lib/cximage-6.0/CxImage/ximage.cpp
+@@ -460,7 +460,7 @@ bool CxImage::CreateFromArray(BYTE* pArr
+ 				src+=4;
+ 			}
+ 		} else {
+-			memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
++			memcpy(dst,src,cmin(info.dwEffWidth,dwBytesperline));
+ 		}
+ 	}
+ 	return true;
+@@ -500,7 +500,7 @@ bool CxImage::CreateFromMatrix(BYTE** pp
+ 					src+=4;
+ 				}
+ 			} else {
+-				memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
++				memcpy(dst,src,cmin(info.dwEffWidth,dwBytesperline));
+ 			}
+ 		}
+ 	}
+--- a/lib/cximage-6.0/CxImage/ximagif.cpp
++++ b/lib/cximage-6.0/CxImage/ximagif.cpp
+@@ -478,7 +478,7 @@ bool CxImageGIF::Encode(CxFile * fp, CxI
+ 	ghost.EncodeHeader(fp);
+ 
+ 	if (m_loops!=1){
+-		ghost.SetLoops(max(0,m_loops-1));
++		ghost.SetLoops(cmax(0,m_loops-1));
+ 		ghost.EncodeLoopExtension(fp);
+ 	}
+ 
+@@ -1340,10 +1340,10 @@ void CxImageGIF::GetComment(char* sz_com
+ ////////////////////////////////////////////////////////////////////////////////
+ void CxImageGIF::GifMix(CxImage & imgsrc2, struct_image & imgdesc)
+ {
+-	long ymin = max(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
++	long ymin = cmax(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
+ 	long ymax = GetHeight()-imgdesc.t;
+ 	long xmin = imgdesc.l;
+-	long xmax = min(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
++	long xmax = cmin(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
+ 
+ 	long ibg2= imgsrc2.GetTransIndex();
+     BYTE i2;
+--- a/lib/cximage-6.0/CxImage/ximahist.cpp
++++ b/lib/cximage-6.0/CxImage/ximahist.cpp
+@@ -110,7 +110,7 @@ bool CxImage::HistogramStretch(long meth
+ 	// calculate LUT
+ 	BYTE lut256;
+ 	for (x = 0; x <256; x++){
+-		lutx = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
++		lutx = (BYTE)cmax(0,cmin(255,(255 * (x - minc) / (maxc - minc))));
+ 	}
+ 
+ 	for (y=0; y<head.biHeight; y++)	{
+@@ -152,7 +152,7 @@ bool CxImage::HistogramStretch(long meth
+ 		// calculate LUT
+ 		BYTE lut256;
+ 		for (x = 0; x <256; x++){
+-			lutx = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
++			lutx = (BYTE)cmax(0,cmin(255,(255 * (x - minc) / (maxc - minc))));
+ 		}
+ 
+ 		// normalize image
+@@ -225,7 +225,7 @@ bool CxImage::HistogramStretch(long meth
+ 		BYTE range = maxR - minR;
+ 		if (range != 0)	{
+ 			for (x = 0; x <256; x++){
+-				lutRx = (BYTE)max(0,min(255,(255 * (x - minR) / range)));
++				lutRx = (BYTE)cmax(0,cmin(255,(255 * (x - minR) / range)));
+ 			}
+ 		} else lutRminR = minR;
+ 
+@@ -233,7 +233,7 @@ bool CxImage::HistogramStretch(long meth
+ 		range = maxG - minG;
+ 		if (range != 0)	{
+ 			for (x = 0; x <256; x++){
+-				lutGx = (BYTE)max(0,min(255,(255 * (x - minG) / range)));
++				lutGx = (BYTE)cmax(0,cmin(255,(255 * (x - minG) / range)));
+ 			}
+ 		} else lutGminG = minG;
+ 			
+@@ -241,7 +241,7 @@ bool CxImage::HistogramStretch(long meth
+ 		range = maxB - minB;
+ 		if (range != 0)	{
+ 			for (x = 0; x <256; x++){
+-				lutBx = (BYTE)max(0,min(255,(255 * (x - minB) / range)));
++				lutBx = (BYTE)cmax(0,cmin(255,(255 * (x - minB) / range)));
+ 			}
+ 		} else lutBminB = minB;
+ 
+@@ -292,7 +292,7 @@ bool CxImage::HistogramStretch(long meth
+ 		// calculate LUT
+ 		BYTE lut256;
+ 		for (x = 0; x <256; x++){
+-			lutx = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc))));
++			lutx = (BYTE)cmax(0,cmin(255,(255 * (x - minc) / (maxc - minc))));
+ 		}
+ 
+ 		for(y=0; y<head.biHeight; y++){
+--- a/lib/cximage-6.0/CxImage/ximaint.cpp
++++ b/lib/cximage-6.0/CxImage/ximaint.cpp
+@@ -26,8 +26,8 @@ void CxImage::OverflowCoordinates(long &
+   switch (ofMethod) {
+     case OM_REPEAT:
+       //clip coordinates
+-      x=max(x,0); x=min(x, head.biWidth-1);
+-      y=max(y,0); y=min(y, head.biHeight-1);
++      x=cmax(x,0); x=cmin(x, head.biWidth-1);
++      y=cmax(y,0); y=cmin(y, head.biHeight-1);
+       break;
+     case OM_WRAP:
+       //wrap coordinates
+@@ -59,8 +59,8 @@ void CxImage::OverflowCoordinates(float
+   switch (ofMethod) {
+     case OM_REPEAT:
+       //clip coordinates
+-      x=max(x,0); x=min(x, head.biWidth-1);
+-      y=max(y,0); y=min(y, head.biHeight-1);
++      x=cmax(x,0); x=cmin(x, head.biWidth-1);
++      y=cmax(y,0); y=cmin(y, head.biHeight-1);
+       break;
+     case OM_WRAP:
+       //wrap coordinates
+--- a/lib/cximage-6.0/CxImage/ximaiter.h
++++ b/lib/cximage-6.0/CxImage/ximaiter.h
+@@ -140,7 +140,7 @@ inline void CImageIterator::SetY(int y)
+ inline void CImageIterator::SetRow(BYTE *buf, int n)
+ {
+ 	if (n<0) n = (int)ima->GetEffWidth();
+-	else n = min(n,(int)ima->GetEffWidth());
++	else n = cmin(n,(int)ima->GetEffWidth());
+ 
+ 	if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) memcpy(IterImage,buf,n);
+ }
+@@ -148,7 +148,7 @@ inline void CImageIterator::SetRow(BYTE
+ inline void CImageIterator::GetRow(BYTE *buf, int n)
+ {
+ 	if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0))
+-		memcpy(buf,IterImage,min(n,(int)ima->GetEffWidth()));
++		memcpy(buf,IterImage,cmin(n,(int)ima->GetEffWidth()));
+ }
+ /////////////////////////////////////////////////////////////////////
+ inline BYTE* CImageIterator::GetRow()
+--- a/lib/cximage-6.0/CxImage/ximajpg.cpp
++++ b/lib/cximage-6.0/CxImage/ximajpg.cpp
+@@ -89,7 +89,7 @@ bool CxImageJPG::GetExifThumbnail(const
+     {
+       if (image.GetWidth() > 256 || image.GetHeight() > 256)
+       { // resize the image
+-//        float amount = 256.0f / max(image.GetWidth(), image.GetHeight());
++//        float amount = 256.0f / cmax(image.GetWidth(), image.GetHeight());
+ //        image.Resample((long)(image.GetWidth() * amount), (long)(image.GetHeight() * amount), 0);
+       }
+       if (m_exifinfo.Orientation != 1)
+--- a/lib/cximage-6.0/CxImage/ximapal.cpp
++++ b/lib/cximage-6.0/CxImage/ximapal.cpp
+@@ -398,8 +398,8 @@ void CxImage::RGBtoBGR(BYTE *buffer, int
+ {
+ 	if (buffer && (head.biClrUsed==0)){
+ 		BYTE temp;
+-		length = min(length,(int)info.dwEffWidth);
+-		length = min(length,(int)(3*head.biWidth));
++		length = cmin(length,(int)info.dwEffWidth);
++		length = cmin(length,(int)(3*head.biWidth));
+ 		for (int i=0;i<length;i+=3){
+ 			temp = bufferi; bufferi = bufferi+2; bufferi+2 = temp;
+ 		}
+@@ -444,7 +444,7 @@ void CxImage::SetPalette(DWORD n, BYTE *
+ 	if (!g) g = r;
+ 	if (!b) b = g;
+ 	RGBQUAD* ppal=GetPalette();
+-	DWORD m=min(n,head.biClrUsed);
++	DWORD m=cmin(n,head.biClrUsed);
+ 	for (DWORD i=0; i<m;i++){
+ 		ppali.rgbRed=ri;
+ 		ppali.rgbGreen=gi;
+@@ -457,7 +457,7 @@ void CxImage::SetPalette(rgb_color *rgb,
+ {
+ 	if ((!rgb)||(pDib==NULL)||(head.biClrUsed==0)) return;
+ 	RGBQUAD* ppal=GetPalette();
+-	DWORD m=min(nColors,head.biClrUsed);
++	DWORD m=cmin(nColors,head.biClrUsed);
+ 	for (DWORD i=0; i<m;i++){
+ 		ppali.rgbRed=rgbi.r;
+ 		ppali.rgbGreen=rgbi.g;
+@@ -469,7 +469,7 @@ void CxImage::SetPalette(rgb_color *rgb,
+ void CxImage::SetPalette(RGBQUAD* pPal,DWORD nColors)
+ {
+ 	if ((pPal==NULL)||(pDib==NULL)||(head.biClrUsed==0)) return;
+-	memcpy(GetPalette(),pPal,min(GetPaletteSize(),nColors*sizeof(RGBQUAD)));
++	memcpy(GetPalette(),pPal,cmin(GetPaletteSize(),nColors*sizeof(RGBQUAD)));
+ 	info.last_c_isvalid = false;
+ }
+ ////////////////////////////////////////////////////////////////////////////////
+@@ -654,10 +654,10 @@ void CxImage::SetClrImportant(DWORD ncol
+ 
+ 	switch(head.biBitCount){
+ 	case 1:
+-		head.biClrImportant = min(ncolors,2);
++		head.biClrImportant = cmin(ncolors,2);
+ 		break;
+ 	case 4:
+-		head.biClrImportant = min(ncolors,16);
++		head.biClrImportant = cmin(ncolors,16);
+ 		break;
+ 	case 8:
+ 		head.biClrImportant = ncolors;
+--- a/lib/cximage-6.0/CxImage/ximapng.cpp
++++ b/lib/cximage-6.0/CxImage/ximapng.cpp
+@@ -206,9 +206,9 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 	} else SetGrayPalette(); //<DP> needed for grayscale PNGs
+ 	
+ #ifdef USE_NEW_LIBPNG_API
+-	int nshift = max(0,(_bit_depth>>3)-1)<<3;
++	int nshift = cmax(0,(_bit_depth>>3)-1)<<3;
+ #else
+-	int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3;
++	int nshift = cmax(0,(info_ptr->bit_depth>>3)-1)<<3;
+ #endif
+ 
+ #ifdef USE_NEW_LIBPNG_API
+@@ -255,10 +255,10 @@ bool CxImagePNG::Decode(CxFile *hFile)
+ 			if (pal){
+ 				DWORD ip;
+ #ifdef USE_NEW_LIBPNG_API
+-				for (ip=0;ip<min(head.biClrUsed,(unsigned long)_num_trans);ip++)
++				for (ip=0;ip<cmin(head.biClrUsed,(unsigned long)_num_trans);ip++)
+ 					palip.rgbReserved=_trans_alphaip;
+ #else
+-				for (ip=0;ip<min(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
++				for (ip=0;ip<cmin(head.biClrUsed,(unsigned long)info_ptr->num_trans);ip++)
+ #if PNG_LIBPNG_VER > 10399
+ 					palip.rgbReserved=info_ptr->trans_alphaip;
+ #else
+@@ -737,9 +737,9 @@ bool CxImagePNG::Encode(CxFile *hFile)
+ #endif // CXIMAGE_SUPPORT_ALPHA	// <vho>
+ 
+ #ifdef USE_NEW_LIBPNG_API
+-	int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
++	int row_size = cmax(info.dwEffWidth, (_width * _channels * _bit_depth / 8));
+ #else
+-	int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
++	int row_size = cmax(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8));
+ 	info_ptr->rowbytes = row_size;
+ #endif
+ 	BYTE *row_pointers = new BYTErow_size;
+--- a/lib/cximage-6.0/CxImage/ximaraw.cpp
++++ b/lib/cximage-6.0/CxImage/ximaraw.cpp
+@@ -216,7 +216,7 @@ bool CxImageRAW::Decode(CxFile *hFile)
+ 
+ 		DWORD size = dcr.width * (dcr.colors*dcr.opt.output_bps/8);
+ 		RGBtoBGR(ppm,size);
+-		memcpy(GetBits(dcr.height - 1 - row), ppm, min(size,GetEffWidth()));
++		memcpy(GetBits(dcr.height - 1 - row), ppm, cmin(size,GetEffWidth()));
+ 	}
+ 	free (ppm);
+ 
+@@ -298,7 +298,7 @@ bool CxImageRAW::GetExifThumbnail(const
+ 			// Resizing.
+       		if (image.GetWidth() > 256 || image.GetHeight() > 256)
+ 		    {
+-				float amount = 256.0f / max(image.GetWidth(), image.GetHeight());
++				float amount = 256.0f / cmax(image.GetWidth(), image.GetHeight());
+ 				image.Resample((long)(image.GetWidth() * amount), (long)(image.GetHeight() * amount), 0);
+ 		    }
+ 	      	
+--- a/lib/cximage-6.0/CxImage/ximasel.cpp
++++ b/lib/cximage-6.0/CxImage/ximasel.cpp
+@@ -113,15 +113,15 @@ bool CxImage::SelectionAddRect(RECT r, B
+ 	if (r.left<r.right) {r2.left=r.left; r2.right=r.right; } else {r2.left=r.right ; r2.right=r.left; }
+ 	if (r.bottom<r.top) {r2.bottom=r.bottom; r2.top=r.top; } else {r2.bottom=r.top ; r2.top=r.bottom; }
+ 
+-	if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = max(0L,min(head.biHeight,r2.top+1));
+-	if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = max(0L,min(head.biWidth,r2.left));
+-	if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = max(0L,min(head.biWidth,r2.right+1));
+-	if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = max(0L,min(head.biHeight,r2.bottom));
+-
+-	long ymin = max(0L,min(head.biHeight,r2.bottom));
+-	long ymax = max(0L,min(head.biHeight,r2.top+1));
+-	long xmin = max(0L,min(head.biWidth,r2.left));
+-	long xmax = max(0L,min(head.biWidth,r2.right+1));
++	if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = cmax(0L,cmin(head.biHeight,r2.top+1));
++	if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = cmax(0L,cmin(head.biWidth,r2.left));
++	if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = cmax(0L,cmin(head.biWidth,r2.right+1));
++	if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = cmax(0L,cmin(head.biHeight,r2.bottom));
++
++	long ymin = cmax(0L,cmin(head.biHeight,r2.bottom));
++	long ymax = cmax(0L,cmin(head.biHeight,r2.top+1));
++	long xmin = cmax(0L,cmin(head.biWidth,r2.left));
++	long xmax = cmax(0L,cmin(head.biWidth,r2.right+1));
+ 
+ 	for (long y=ymin; y<ymax; y++)
+ 		memset(pSelection + xmin + y * head.biWidth, level, xmax-xmin);
+@@ -144,18 +144,18 @@ bool CxImage::SelectionAddEllipse(RECT r
+ 	long xcenter = (r.right + r.left)/2;
+ 	long ycenter = (r.top + r.bottom)/2;
+ 
+-	if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = max(0L,min(head.biWidth,(xcenter - xradius)));
+-	if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = max(0L,min(head.biWidth,(xcenter + xradius + 1)));
+-	if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = max(0L,min(head.biHeight,(ycenter - yradius)));
+-	if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = max(0L,min(head.biHeight,(ycenter + yradius + 1)));
+-
+-	long xmin = max(0L,min(head.biWidth,xcenter - xradius));
+-	long xmax = max(0L,min(head.biWidth,xcenter + xradius + 1));
+-	long ymin = max(0L,min(head.biHeight,ycenter - yradius));
+-	long ymax = max(0L,min(head.biHeight,ycenter + yradius + 1));
++	if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = cmax(0L,cmin(head.biWidth,(xcenter - xradius)));
++	if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = cmax(0L,cmin(head.biWidth,(xcenter + xradius + 1)));
++	if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = cmax(0L,cmin(head.biHeight,(ycenter - yradius)));
++	if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = cmax(0L,cmin(head.biHeight,(ycenter + yradius + 1)));
++
++	long xmin = cmax(0L,cmin(head.biWidth,xcenter - xradius));
++	long xmax = cmax(0L,cmin(head.biWidth,xcenter + xradius + 1));
++	long ymin = cmax(0L,cmin(head.biHeight,ycenter - yradius));
++	long ymax = cmax(0L,cmin(head.biHeight,ycenter + yradius + 1));
+ 
+ 	long y,yo;
+-	for (y=ymin; y<min(ycenter,ymax); y++){
++	for (y=ymin; y<cmin(ycenter,ymax); y++){
+ 		for (long x=xmin; x<xmax; x++){
+ 			yo = (long)(ycenter - yradius * sqrt(1-pow((float)(x - xcenter)/(float)xradius,2)));
+ 			if (yo<y) pSelectionx + y * head.biWidth = level;
+@@ -268,10 +268,10 @@ bool CxImage::SelectionAddPolygon(POINT
+ 		RECT r2;
+ 		if (current->x < next->x) {r2.left=current->x; r2.right=next->x; } else {r2.left=next->x ; r2.right=current->x; }
+ 		if (current->y < next->y) {r2.bottom=current->y; r2.top=next->y; } else {r2.bottom=next->y ; r2.top=current->y; }
+-		if (localbox.top < r2.top) localbox.top = max(0L,min(head.biHeight-1,r2.top+1));
+-		if (localbox.left > r2.left) localbox.left = max(0L,min(head.biWidth-1,r2.left-1));
+-		if (localbox.right < r2.right) localbox.right = max(0L,min(head.biWidth-1,r2.right+1));
+-		if (localbox.bottom > r2.bottom) localbox.bottom = max(0L,min(head.biHeight-1,r2.bottom-1));
++		if (localbox.top < r2.top) localbox.top = cmax(0L,cmin(head.biHeight-1,r2.top+1));
++		if (localbox.left > r2.left) localbox.left = cmax(0L,cmin(head.biWidth-1,r2.left-1));
++		if (localbox.right < r2.right) localbox.right = cmax(0L,cmin(head.biWidth-1,r2.right+1));
++		if (localbox.bottom > r2.bottom) localbox.bottom = cmax(0L,cmin(head.biHeight-1,r2.bottom-1));
+ 
+ 		i++;
+ 	}
+@@ -385,10 +385,10 @@ bool CxImage::SelectionAddPolygon(POINT
+ 		for (x=localbox.left; x<=localbox.right; x++)
+ 			if (plocalx + yoffset!=1) pSelectionx + yoffset=level;
+ 	}
+-	if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = min(head.biHeight,localbox.top + 1);
+-	if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = min(head.biWidth,localbox.left);
+-	if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = min(head.biWidth,localbox.right + 1);
+-	if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = min(head.biHeight,localbox.bottom);
++	if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = cmin(head.biHeight,localbox.top + 1);
++	if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = cmin(head.biWidth,localbox.left);
++	if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = cmin(head.biWidth,localbox.right + 1);
++	if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = cmin(head.biHeight,localbox.bottom);
+ 
+ 	free(plocal);
+ 	free(pix);
+--- a/lib/cximage-6.0/CxImage/ximath.cpp
++++ b/lib/cximage-6.0/CxImage/ximath.cpp
+@@ -64,10 +64,10 @@ CxRect2 CxRect2::CrossSection(CxRect2 co
+  */
+ {
+   CxRect2 cs;
+-  cs.botLeft.x=max(botLeft.x, r2.botLeft.x);
+-  cs.botLeft.y=max(botLeft.y, r2.botLeft.y);
+-  cs.topRight.x=min(topRight.x, r2.topRight.x);
+-  cs.topRight.y=min(topRight.y, r2.topRight.y);
++  cs.botLeft.x=cmax(botLeft.x, r2.botLeft.x);
++  cs.botLeft.y=cmax(botLeft.y, r2.botLeft.y);
++  cs.topRight.x=cmin(topRight.x, r2.topRight.x);
++  cs.topRight.y=cmin(topRight.y, r2.topRight.y);
+   if (cs.botLeft.x<=cs.topRight.x && cs.botLeft.y<=cs.topRight.y) {
+     return cs;
+   } else {
+--- a/lib/cximage-6.0/CxImage/ximatif.cpp
++++ b/lib/cximage-6.0/CxImage/ximatif.cpp
+@@ -470,9 +470,9 @@ bool CxImageTIF::Decode(CxFile * hFile)
+ 						if ( cb > 0.00304 ) cb = 1.055 * pow(cb,0.41667) - 0.055;
+ 							else            cb = 12.92 * cb;
+ 
+-						c.rgbRed  =(BYTE)max(0,min(255,(int)(cr*255)));
+-						c.rgbGreen=(BYTE)max(0,min(255,(int)(cg*255)));
+-						c.rgbBlue =(BYTE)max(0,min(255,(int)(cb*255)));
++						c.rgbRed  =(BYTE)cmax(0,cmin(255,(int)(cr*255)));
++						c.rgbGreen=(BYTE)cmax(0,cmin(255,(int)(cg*255)));
++						c.rgbBlue =(BYTE)cmax(0,cmin(255,(int)(cb*255)));
+ 
+ 						SetPixelColor(xi,yi,c);
+ #if CXIMAGE_SUPPORT_ALPHA
+--- a/lib/cximage-6.0/CxImage/ximatran.cpp
++++ b/lib/cximage-6.0/CxImage/ximatran.cpp
+@@ -302,12 +302,12 @@ bool CxImage::RotateLeft(CxImage* iDst)
+ 			for (ys = 0; ys < newHeight; ys+=RBLOCK) {
+ 				if (head.biBitCount==24) {
+ 					//RGB24 optimized pixel access:
+-					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){    //do rotation
++					for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){    //do rotation
+ 						info.nProgress = (long)(100*x/newWidth);
+ 						x2=newWidth-x-1;
+ 						dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(x,ys);
+ 						srcPtr = (BYTE*) BlindGetPixelPointer(ys, x2);
+-						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++						for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 							//imgDest.SetPixelColor(x, y, GetPixelColor(y, x2));
+ 							*(dstPtr) = *(srcPtr);
+ 							*(dstPtr+1) = *(srcPtr+1);
+@@ -318,19 +318,19 @@ bool CxImage::RotateLeft(CxImage* iDst)
+ 					}//for x
+ 				} else {
+ 					//anything else than 24bpp (and 1bpp): palette
+-					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
++					for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){
+ 						info.nProgress = (long)(100*x/newWidth); //<Anatoly Ivasyuk>
+ 						x2=newWidth-x-1;
+-						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++						for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 							imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y, x2));
+ 						}//for y
+ 					}//for x
+ 				}//if (version selection)
+ #if CXIMAGE_SUPPORT_ALPHA
+ 				if (AlphaIsValid()) {
+-					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
++					for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){
+ 						x2=newWidth-x-1;
+-						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++						for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 							imgDest.AlphaSet(x,y,BlindAlphaGet(y, x2));
+ 						}//for y
+ 					}//for x
+@@ -343,9 +343,9 @@ bool CxImage::RotateLeft(CxImage* iDst)
+ 					imgDest.info.rSelectionBox.right = newWidth-info.rSelectionBox.bottom;
+ 					imgDest.info.rSelectionBox.bottom = info.rSelectionBox.left;
+ 					imgDest.info.rSelectionBox.top = info.rSelectionBox.right;
+-					for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
++					for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){
+ 						x2=newWidth-x-1;
+-						for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++						for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 							imgDest.SelectionSet(x,y,BlindSelectionGet(y, x2));
+ 						}//for y
+ 					}//for x
+@@ -447,12 +447,12 @@ bool CxImage::RotateRight(CxImage* iDst)
+ 			for (ys = 0; ys < newHeight; ys+=RBLOCK) {
+ 				if (head.biBitCount==24) {
+ 					//RGB24 optimized pixel access:
+-					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++					for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 						info.nProgress = (long)(100*y/newHeight); //<Anatoly Ivasyuk>
+ 						y2=newHeight-y-1;
+ 						dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(xs,y);
+ 						srcPtr = (BYTE*) BlindGetPixelPointer(y2, xs);
+-						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
++						for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){
+ 							//imgDest.SetPixelColor(x, y, GetPixelColor(y2, x));
+ 							*(dstPtr) = *(srcPtr);
+ 							*(dstPtr+1) = *(srcPtr+1);
+@@ -463,19 +463,19 @@ bool CxImage::RotateRight(CxImage* iDst)
+ 					}//for y
+ 				} else {
+ 					//anything else than BW & RGB24: palette
+-					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++					for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 						info.nProgress = (long)(100*y/newHeight); //<Anatoly Ivasyuk>
+ 						y2=newHeight-y-1;
+-						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
++						for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){
+ 							imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y2, x));
+ 						}//for x
+ 					}//for y
+ 				}//if
+ #if CXIMAGE_SUPPORT_ALPHA
+ 				if (AlphaIsValid()){
+-					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++					for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 						y2=newHeight-y-1;
+-						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
++						for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){
+ 							imgDest.AlphaSet(x,y,BlindAlphaGet(y2, x));
+ 						}//for x
+ 					}//for y
+@@ -488,9 +488,9 @@ bool CxImage::RotateRight(CxImage* iDst)
+ 					imgDest.info.rSelectionBox.right = info.rSelectionBox.top;
+ 					imgDest.info.rSelectionBox.bottom = newHeight-info.rSelectionBox.right;
+ 					imgDest.info.rSelectionBox.top = newHeight-info.rSelectionBox.left;
+-					for (y = ys; y < min(newHeight, ys+RBLOCK); y++){
++					for (y = ys; y < cmin(newHeight, ys+RBLOCK); y++){
+ 						y2=newHeight-y-1;
+-						for (x = xs; x < min(newWidth, xs+RBLOCK); x++){
++						for (x = xs; x < cmin(newWidth, xs+RBLOCK); x++){
+ 							imgDest.SelectionSet(x,y,BlindSelectionGet(y2, x));
+ 						}//for x
+ 					}//for y
+@@ -608,10 +608,10 @@ bool CxImage::Rotate(float angle, CxImag
+ 	newP4.x = (float)(p4.x*cos_angle - p4.y*sin_angle);
+ 	newP4.y = (float)(p4.x*sin_angle + p4.y*cos_angle);
+ 
+-	leftTop.x = min(min(newP1.x,newP2.x),min(newP3.x,newP4.x));
+-	leftTop.y = min(min(newP1.y,newP2.y),min(newP3.y,newP4.y));
+-	rightBottom.x = max(max(newP1.x,newP2.x),max(newP3.x,newP4.x));
+-	rightBottom.y = max(max(newP1.y,newP2.y),max(newP3.y,newP4.y));
++	leftTop.x = cmin(cmin(newP1.x,newP2.x),cmin(newP3.x,newP4.x));
++	leftTop.y = cmin(cmin(newP1.y,newP2.y),cmin(newP3.y,newP4.y));
++	rightBottom.x = cmax(cmax(newP1.x,newP2.x),cmax(newP3.x,newP4.x));
++	rightBottom.y = cmax(cmax(newP1.y,newP2.y),cmax(newP3.y,newP4.y));
+ 	leftBottom.x = leftTop.x;
+ 	leftBottom.y = rightBottom.y;
+ 	rightTop.x = rightBottom.x;
+@@ -740,10 +740,10 @@ bool CxImage::Rotate2(float angle,
+ 	}//if
+ 
+ 	//(read new dimensions from location of corners)
+-	float minx = (float) min(min(newp0.x,newp1.x),min(newp2.x,newp3.x));
+-	float miny = (float) min(min(newp0.y,newp1.y),min(newp2.y,newp3.y));
+-	float maxx = (float) max(max(newp0.x,newp1.x),max(newp2.x,newp3.x));
+-	float maxy = (float) max(max(newp0.y,newp1.y),max(newp2.y,newp3.y));
++	float minx = (float) cmin(cmin(newp0.x,newp1.x),cmin(newp2.x,newp3.x));
++	float miny = (float) cmin(cmin(newp0.y,newp1.y),cmin(newp2.y,newp3.y));
++	float maxx = (float) cmax(cmax(newp0.x,newp1.x),cmax(newp2.x,newp3.x));
++	float maxy = (float) cmax(cmax(newp0.y,newp1.y),cmax(newp2.y,newp3.y));
+ 	int newWidth = (int) floor(maxx-minx+0.5f);
+ 	int newHeight= (int) floor(maxy-miny+0.5f);
+ 	float ssx=((maxx+minx)- ((float) newWidth-1))/2.0f;   //start for x
+@@ -1003,12 +1003,12 @@ bool CxImage::Resample(long newx, long n
+ 				if (info.nEscape) break;
+ 				fY = y * yScale;
+ 				ifY = (int)fY;
+-				ifY1 = min(ymax, ifY+1);
++				ifY1 = cmin(ymax, ifY+1);
+ 				dy = fY - ifY;
+ 				for(long x=0; x<newx; x++){
+ 					fX = x * xScale;
+ 					ifX = (int)fX;
+-					ifX1 = min(xmax, ifX+1);
++					ifX1 = cmin(xmax, ifX+1);
+ 					dx = fX - ifX;
+ 					// Interpolate using the four nearest pixels in the source
+ 					if (head.biClrUsed){
+@@ -1328,9 +1328,9 @@ bool CxImage::DecreaseBpp(DWORD nbit, bo
+ 				eb=(long)c.rgbBlue - (long)ce.rgbBlue;
+ 
+ 				c = GetPixelColor(x+1,y);
+-				c.rgbRed = (BYTE)min(255L,max(0L,(long)c.rgbRed + ((er*7)/16)));
+-				c.rgbGreen = (BYTE)min(255L,max(0L,(long)c.rgbGreen + ((eg*7)/16)));
+-				c.rgbBlue = (BYTE)min(255L,max(0L,(long)c.rgbBlue + ((eb*7)/16)));
++				c.rgbRed = (BYTE)cmin(255L,cmax(0L,(long)c.rgbRed + ((er*7)/16)));
++				c.rgbGreen = (BYTE)cmin(255L,cmax(0L,(long)c.rgbGreen + ((eg*7)/16)));
++				c.rgbBlue = (BYTE)cmin(255L,cmax(0L,(long)c.rgbBlue + ((eb*7)/16)));
+ 				SetPixelColor(x+1,y,c);
+ 				int coeff=1;
+ 				for(int i=-1; i<2; i++){
+@@ -1343,9 +1343,9 @@ bool CxImage::DecreaseBpp(DWORD nbit, bo
+ 						coeff=1; break;
+ 					}
+ 					c = GetPixelColor(x+i,y+1);
+-					c.rgbRed = (BYTE)min(255L,max(0L,(long)c.rgbRed + ((er * coeff)/16)));
+-					c.rgbGreen = (BYTE)min(255L,max(0L,(long)c.rgbGreen + ((eg * coeff)/16)));
+-					c.rgbBlue = (BYTE)min(255L,max(0L,(long)c.rgbBlue + ((eb * coeff)/16)));
++					c.rgbRed = (BYTE)cmin(255L,cmax(0L,(long)c.rgbRed + ((er * coeff)/16)));
++					c.rgbGreen = (BYTE)cmin(255L,cmax(0L,(long)c.rgbGreen + ((eg * coeff)/16)));
++					c.rgbBlue = (BYTE)cmin(255L,cmax(0L,(long)c.rgbBlue + ((eb * coeff)/16)));
+ 					SetPixelColor(x+i,y+1,c);
+ 				}
+ 			}
+@@ -1566,10 +1566,10 @@ bool CxImage::Dither(long method)
+ 				}
+ 
+ 				nlevel = GetPixelIndex(x + 1, y) + (error * 8) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 1, y, level);
+ 				nlevel = GetPixelIndex(x + 2, y) + (error * 4) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 2, y, level);
+ 				int i;
+ 				for (i = -2; i < 3; i++) {
+@@ -1591,7 +1591,7 @@ bool CxImage::Dither(long method)
+ 						break;
+ 					}
+ 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
+-					level = (BYTE)min(255, max(0, (int)nlevel));
++					level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 					SetPixelIndex(x + i, y + 1, level);
+ 				}
+ 			}
+@@ -1620,10 +1620,10 @@ bool CxImage::Dither(long method)
+ 				}
+ 
+ 				nlevel = GetPixelIndex(x + 1, y) + (error * 8) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 1, y, level);
+ 				nlevel = GetPixelIndex(x + 2, y) + (error * 4) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 2, y, level);
+ 				int i;
+ 				for (i = -2; i < 3; i++) {
+@@ -1645,7 +1645,7 @@ bool CxImage::Dither(long method)
+ 						break;
+ 					}
+ 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
+-					level = (BYTE)min(255, max(0, (int)nlevel));
++					level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 					SetPixelIndex(x + i, y + 1, level);
+ 				}
+ 				for (i = -2; i < 3; i++) {
+@@ -1667,7 +1667,7 @@ bool CxImage::Dither(long method)
+ 						break;
+ 					}
+ 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
+-					level = (BYTE)min(255, max(0, (int)nlevel));
++					level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 					SetPixelIndex(x + i, y + 2, level);
+ 				}
+ 			}
+@@ -1696,10 +1696,10 @@ bool CxImage::Dither(long method)
+ 				}
+ 
+ 				nlevel = GetPixelIndex(x + 1, y) + (error * 7) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 1, y, level);
+ 				nlevel = GetPixelIndex(x + 2, y) + (error * 5) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 2, y, level);
+ 				int i;
+ 				for (i = -2; i < 3; i++) {
+@@ -1721,7 +1721,7 @@ bool CxImage::Dither(long method)
+ 						break;
+ 					}
+ 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
+-					level = (BYTE)min(255, max(0, (int)nlevel));
++					level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 					SetPixelIndex(x + i, y + 1, level);
+ 				}
+ 				for (i = -2; i < 3; i++) {
+@@ -1743,7 +1743,7 @@ bool CxImage::Dither(long method)
+ 						break;
+ 					}
+ 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
+-					level = (BYTE)min(255, max(0, (int)nlevel));
++					level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 					SetPixelIndex(x + i, y + 2, level);
+ 				}
+ 			}
+@@ -1772,10 +1772,10 @@ bool CxImage::Dither(long method)
+ 				}
+ 
+ 				nlevel = GetPixelIndex(x + 1, y) + (error * 5) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 1, y, level);
+ 				nlevel = GetPixelIndex(x + 2, y) + (error * 3) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(x + 2, y, level);
+ 				int i;
+ 				for (i = -2; i < 3; i++) {
+@@ -1797,7 +1797,7 @@ bool CxImage::Dither(long method)
+ 						break;
+ 					}
+ 					nlevel = GetPixelIndex(x + i, y + 1) + (error * coeff) / TotalCoeffSum;
+-					level = (BYTE)min(255, max(0, (int)nlevel));
++					level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 					SetPixelIndex(x + i, y + 1, level);
+ 				}
+ 				for (i = -1; i < 2; i++) {
+@@ -1813,7 +1813,7 @@ bool CxImage::Dither(long method)
+ 						break;
+ 					}
+ 					nlevel = GetPixelIndex(x + i, y + 2) + (error * coeff) / TotalCoeffSum;
+-					level = (BYTE)min(255, max(0, (int)nlevel));
++					level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 					SetPixelIndex(x + i, y + 2, level);
+ 				}
+ 			}
+@@ -1845,76 +1845,76 @@ bool CxImage::Dither(long method)
+ 				int tmp_index_y = y;
+ 				int tmp_coeff = 32;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x - 3;
+ 				tmp_index_y = y + 1;
+ 				tmp_coeff = 12;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x - 1;
+ 				tmp_coeff = 26;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x + 1;
+ 				tmp_coeff = 30;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x + 3;
+ 				tmp_coeff = 16;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x - 2;
+ 				tmp_index_y = y + 2;
+ 				tmp_coeff = 12;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x;
+ 				tmp_coeff = 26;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x + 2;
+ 				tmp_coeff = 12;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x - 3;
+ 				tmp_index_y = y + 3;
+ 				tmp_coeff = 5;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x - 1;
+ 				tmp_coeff = 12;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x + 1;
+ 				tmp_coeff = 12;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 
+ 				tmp_index_x = x + 3;
+ 				tmp_coeff = 5;
+ 				nlevel = GetPixelIndex(tmp_index_x, tmp_index_y) + (error * tmp_coeff) / TotalCoeffSum;
+-				level = (BYTE)min(255, max(0, (int)nlevel));
++				level = (BYTE)cmin(255, cmax(0, (int)nlevel));
+ 				SetPixelIndex(tmp_index_x, tmp_index_y, level);
+ 			}
+ 		}
+@@ -1941,7 +1941,7 @@ bool CxImage::Dither(long method)
+ 			Bmatrixi = (BYTE)(dither);
+ 		}
+ 
+-		int scale = max(0,(8-2*order));
++		int scale = cmax(0,(8-2*order));
+ 		int level;
+ 		for (long y=0;y<head.biHeight;y++){
+ 			info.nProgress = (long)(100*y/head.biHeight);
+@@ -1981,7 +1981,7 @@ bool CxImage::Dither(long method)
+ 				}
+ 
+ 				nlevel = GetPixelIndex(x+1,y) + (error * 7)/16;
+-				level = (BYTE)min(255,max(0,(int)nlevel));
++				level = (BYTE)cmin(255,cmax(0,(int)nlevel));
+ 				SetPixelIndex(x+1,y,level);
+ 				for(int i=-1; i<2; i++){
+ 					switch(i){
+@@ -1993,7 +1993,7 @@ bool CxImage::Dither(long method)
+ 						coeff=1; break;
+ 					}
+ 					nlevel = GetPixelIndex(x+i,y+1) + (error * coeff)/16;
+-					level = (BYTE)min(255,max(0,(int)nlevel));
++					level = (BYTE)cmin(255,cmax(0,(int)nlevel));
+ 					SetPixelIndex(x+i,y+1,level);
+ 				}
+ 			}
+@@ -2031,7 +2031,7 @@ bool CxImage::CropRotatedRectangle( long
+ 	if ( fabs(angle)<0.0002 )
+ 		return Crop( topx, topy, topx+width, topy+height, iDst);
+ 
+-	startx = min(topx, topx - (long)(sin_angle*(double)height));
++	startx = cmin(topx, topx - (long)(sin_angle*(double)height));
+ 	endx   = topx + (long)(cos_angle*(double)width);
+ 	endy   = topy + (long)(cos_angle*(double)height + sin_angle*(double)width);
+ 	// check: corners of the rectangle must be inside
+@@ -2079,10 +2079,10 @@ bool CxImage::Crop(long left, long top,
+ {
+ 	if (!pDib) return false;
+ 
+-	long startx = max(0L,min(left,head.biWidth));
+-	long endx = max(0L,min(right,head.biWidth));
+-	long starty = head.biHeight - max(0L,min(top,head.biHeight));
+-	long endy = head.biHeight - max(0L,min(bottom,head.biHeight));
++	long startx = cmax(0L,cmin(left,head.biWidth));
++	long endx = cmax(0L,cmin(right,head.biWidth));
++	long starty = head.biHeight - cmax(0L,cmin(top,head.biHeight));
++	long endy = head.biHeight - cmax(0L,cmin(bottom,head.biHeight));
+ 
+ 	if (startx==endx || starty==endy) return false;
+ 
+@@ -2443,8 +2443,8 @@ bool CxImage::CircleTransform(int type,l
+ 						nx=x+(x%32)-16;
+ 						ny=y;
+ 					}
+-//					nx=max(xmin,min(nx,xmax));
+-//					ny=max(ymin,min(ny,ymax));
++//					nx=cmax(xmin,cmin(nx,xmax));
++//					ny=cmax(ymin,cmin(ny,ymax));
+ 				}
+ 				else { nx=-1;ny=-1;}
+ 				if (head.biClrUsed==0){
+--- a/lib/cximage-6.0/CxImage/ximawnd.cpp
++++ b/lib/cximage-6.0/CxImage/ximawnd.cpp
+@@ -682,10 +682,10 @@ long CxImage::Draw(HDC hdc, long x, long
+ 	RECT clipbox,paintbox;
+ 	GetClipBox(hdc,&clipbox);
+ 
+-	paintbox.top = min(clipbox.bottom,max(clipbox.top,y));
+-	paintbox.left = min(clipbox.right,max(clipbox.left,x));
+-	paintbox.right = max(clipbox.left,min(clipbox.right,x+cx));
+-	paintbox.bottom = max(clipbox.top,min(clipbox.bottom,y+cy));
++	paintbox.top = cmin(clipbox.bottom,cmax(clipbox.top,y));
++	paintbox.left = cmin(clipbox.right,cmax(clipbox.left,x));
++	paintbox.right = cmax(clipbox.left,cmin(clipbox.right,x+cx));
++	paintbox.bottom = cmax(clipbox.top,cmin(clipbox.bottom,y+cy));
+ 
+ 	long destw = paintbox.right - paintbox.left;
+ 	long desth = paintbox.bottom - paintbox.top;
+@@ -730,12 +730,12 @@ long CxImage::Draw(HDC hdc, long x, long
+ 
+ 				for(yy=0;yy<desth;yy++){
+ 					dy = head.biHeight-(ymax-yy-y)*fy;
+-					sy = max(0L,(long)floor(dy));
++					sy = cmax(0L,(long)floor(dy));
+ 					psrc = info.pImage+sy*info.dwEffWidth;
+ 					pdst = pbase+yy*ew;
+ 					for(xx=0;xx<destw;xx++){
+ 						dx = (xx+xmin-x)*fx;
+-						sx = max(0L,(long)floor(dx));
++						sx = cmax(0L,(long)floor(dx));
+ #if CXIMAGE_SUPPORT_INTERPOLATION
+ 						if (bSmooth){
+ 							if (fx > 1 && fy > 1) { 
+@@ -813,7 +813,7 @@ long CxImage::Draw(HDC hdc, long x, long
+ 				
+ 				for(yy=0;yy<desth;yy++){
+ 					dy = head.biHeight-(ymax-yy-y)*fy;
+-					sy = max(0L,(long)floor(dy));
++					sy = cmax(0L,(long)floor(dy));
+ 
+ 					alphaoffset = sy*head.biWidth;
+ 					pdst = pbase + yy*ew;
+@@ -821,7 +821,7 @@ long CxImage::Draw(HDC hdc, long x, long
+ 
+ 					for(xx=0;xx<destw;xx++){
+ 						dx = (xx+xmin-x)*fx;
+-						sx = max(0L,(long)floor(dx));
++						sx = cmax(0L,(long)floor(dx));
+ 
+ 						if (bAlpha) a=pAlphaalphaoffset+sx; else a=255;
+ 						a =(BYTE)((a*(1+info.nAlphaMax))>>8);

libdvdnav-no-return.patch Added

@@ -0,0 +1,40 @@
+--- src/vm/vmget.c.orig	2017-02-27 22:43:29.493007671 +0200
++++ src/vm/vmget.c	2017-02-27 22:46:49.717611551 +0200
+@@ -311,6 +311,7 @@
+ }
+ 
+ video_attr_t vm_get_video_attr(vm_t *vm) {
++  video_attr_t empty = {0,};
+   switch ((vm->state).domain) {
+   case DVD_DOMAIN_VTSTitle:
+     return vm->vtsi->vtsi_mat->vts_video_attr;
+@@ -322,9 +323,11 @@
+   default:
+     assert(0);
+   }
++  return empty;
+ }
+ 
+ audio_attr_t vm_get_audio_attr(vm_t *vm, int streamN) {
++  audio_attr_t empty = {0,};
+   switch ((vm->state).domain) {
+   case DVD_DOMAIN_VTSTitle:
+     return vm->vtsi->vtsi_mat->vts_audio_attrstreamN;
+@@ -336,9 +339,11 @@
+   default:
+     assert(0);
+   }
++  return empty;
+ }
+ 
+ subp_attr_t vm_get_subp_attr(vm_t *vm, int streamN) {
++  subp_attr_t empty = {0,};
+   switch ((vm->state).domain) {
+   case DVD_DOMAIN_VTSTitle:
+     return vm->vtsi->vtsi_mat->vts_subp_attrstreamN;
+@@ -350,4 +355,5 @@
+   default:
+     assert(0);
+   }
++  return empty;
+ }

no-xbmc-symbolic-link.patch Added

@@ -0,0 +1,33 @@
+--- Makefile.in.orig	2016-05-01 10:13:02.599442923 +0300
++++ Makefile.in	2016-05-01 10:13:31.678404639 +0300
+@@ -462,7 +462,6 @@
+ install-binaries: install-scripts
+ 	@echo "Copying @APP_NAME_LC@ binary to $(DESTDIR)$(libdir)/@APP_NAME_LC@/"
+ 	@install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@
+-	@cd $(DESTDIR)$(libdir);  -L xbmc  ||  -d xbmc  || ln -s @APP_NAME_LC@ xbmc
+ ifeq (1,@USE_X11@)
+ 	@install @APP_NAME_LC@-xrandr $(DESTDIR)$(libdir)/@APP_NAME_LC@/@APP_NAME_LC@-xrandr
+ endif
+@@ -500,14 +499,10 @@
+ install-scripts:
+ 	@install -d $(DESTDIR)$(bindir)
+ 	@install tools/Linux/kodi.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@
+-	@cd $(DESTDIR)$(bindir);  -L xbmc  ||  -f xbmc  || ln -s @APP_NAME_LC@ xbmc
+ 	@install tools/Linux/kodi-standalone.sh $(DESTDIR)$(bindir)/@APP_NAME_LC@-standalone
+-	@cd $(DESTDIR)$(bindir);  -L xbmc-standalone  ||  -f xbmc-standalone  ||  ln -s @APP_NAME_LC@-standalone xbmc-standalone
+ 	@install -d $(DESTDIR)$(datarootdir)/@APP_NAME_LC@
+-	@cd $(DESTDIR)$(datarootdir);  -L xbmc  ||  -d xbmc  || ln -s @APP_NAME_LC@ xbmc
+ 	@install -d $(DESTDIR)$(datarootdir)/xsessions
+ 	@install -m 0644 tools/Linux/kodi-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/@APP_NAME_LC@.desktop
+-	@cd $(DESTDIR)$(datarootdir)/xsessions;  -L xbmc.desktop  ||  -f xbmc.desktop  || ln -s @APP_NAME_LC@.desktop xbmc.desktop
+ 
+ install-datas: install-scripts
+ 	@echo "Copying support and legal files..."
+@@ -564,7 +559,6 @@
+ 	@install -m 0644 $(BINDINGS) $(DESTDIR)$(includedir)/@APP_NAME_LC@
+ 	@install -d $(DESTDIR)$(libdir)/@APP_NAME_LC@
+ 	@install -m 0644 project/cmake/*.cmake project/cmake/scripts/common/*.cmake $(DESTDIR)$(libdir)/@APP_NAME_LC@
+-	@cd $(DESTDIR)$(includedir);  -L xbmc  ||  -d xbmc  || ln -s @APP_NAME_LC@ xbmc
+ 
+ uninstall:
+ 	@echo "Removing @APP_NAME@..."

_constraints Deleted

_service:download_files:1.4.3-Next-Nexus-Alpha2-2.tar.gz Deleted

_service:download_files:17.1-Krypton.tar.gz Added

_service:download_files:21.1-Omega.tar.gz Deleted

_service:download_files:6.1.1-Next-Nexus-Alpha2-2.tar.gz Deleted

_service:download_files:6.1.3-Next-Nexus-Alpha2-2.tar.gz Deleted

_service:download_files:apache-groovy-binary-4.0.16.zip Deleted

_service:download_files:crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz Deleted

_service:download_files:libudfread-1.1.2.tar.gz Deleted

crossguid-8f399e8bd4.tar.gz Added

kodi.VERSION Changed

libdvdcss-master.tar.gz Added

libdvdnav-master.tar.gz Added

libdvdread-master.tar.gz Added

pre_checkin.sh Changed

@@ -2,10 +2,7 @@
 
 name=kodi
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with this pre_checkin.sh script
-ARCH_RESTRICTIONS="%arm aarch64" # Not used for now
-	ARCH_RESTRICTIONS="does-not-build"
-sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
-	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
+sed -e "s/%define noX_build 0/%define noX_build 1/g
 	s/^Name:.*$name/&-noX/" $name.spec > $name-noX.spec
 cp $name.changes $name-noX.changes
 
@@ -17,23 +14,19 @@
 # armv6 boards
 for BOARDNAME in $armv6_platforms; do
 	ARCH_RESTRICTIONS="armv6l armv6hl" # Not used for now
-	ARCH_RESTRICTIONS="does-not-build"
 	# Enable platform build for the given platform (only noX version)
-	sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
-	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
-	s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
+	sed -e "s/%define noX_build 0/%define noX_build 1/g
+	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
 	cp $name.changes $name-noX-$BOARDNAME.changes
 done
 
 for BOARDNAME in $armv7_platforms; do
-	ARCH_RESTRICTIONS="armv7l armv7hl" # Not used for now
-	ARCH_RESTRICTIONS="does-not-build"
+	ARCH_RESTRICTIONS="armv7l armv7hl"
 	# Enable platform build for the given platform (only noX version)
-	sed -e "s/%bcond_without kodi_with_X11/%bcond_with kodi_with_X11/g
-	s/^ExclusiveArch:.*/ExclusiveArch: $ARCH_RESTRICTIONS/g
-	s/^%define kodi_platform .*/%define kodi_platform $BOARDNAME/g
+	sed -e "s/%define noX_build 0/%define noX_build 1/g
+	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
 	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
 	cp $name.changes $name-noX-$BOARDNAME.changes

rpmlintrc Deleted

Overview

Request 3737 (superseded)

Request History