Request 6039 (accepted)

kodi-noX-raspberry-pi.changes Changed

@@ -1,35 +1,71 @@
 -------------------------------------------------------------------
-Sun Mar  3 08:13:25 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.5 Nexus 
+- Version update to Kodi 21.0 Omega
 
 -------------------------------------------------------------------
-Thu Feb 29 10:47:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Add Source24: taglib-1.12.tar.gz for Tumbleweed, because snapshot
-  20240226 brought an incompatible upgrade to libtag-2.0.
+- Version update to Kodi 21.0rc2 Omega
 
 -------------------------------------------------------------------
-Sun Feb 25 11:05:19 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Use %%patch -P N for RPM-4.19
+- 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.
 
 -------------------------------------------------------------------
-Sun Feb 11 08:28:09 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.4 Nexus 
+- Version update to Kodi 21.0rc1 Omega
+- Remove 0004-xbmc#24733.patch
 
 -------------------------------------------------------------------
-Wed Jan 10 08:37:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.3 Nexus 
-- Remove fix_building_with_fmt10.patch as it's included upstream now
-- Restore the "|| l" in case of a make failure
+- 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.
 
 -------------------------------------------------------------------
-Mon Dec 25 17:13:19 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
+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>

kodi-noX-raspberry-pi2.changes Changed

@@ -1,35 +1,71 @@
 -------------------------------------------------------------------
-Sun Mar  3 08:13:25 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.5 Nexus 
+- Version update to Kodi 21.0 Omega
 
 -------------------------------------------------------------------
-Thu Feb 29 10:47:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Add Source24: taglib-1.12.tar.gz for Tumbleweed, because snapshot
-  20240226 brought an incompatible upgrade to libtag-2.0.
+- Version update to Kodi 21.0rc2 Omega
 
 -------------------------------------------------------------------
-Sun Feb 25 11:05:19 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Use %%patch -P N for RPM-4.19
+- 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.
 
 -------------------------------------------------------------------
-Sun Feb 11 08:28:09 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.4 Nexus 
+- Version update to Kodi 21.0rc1 Omega
+- Remove 0004-xbmc#24733.patch
 
 -------------------------------------------------------------------
-Wed Jan 10 08:37:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.3 Nexus 
-- Remove fix_building_with_fmt10.patch as it's included upstream now
-- Restore the "|| l" in case of a make failure
+- 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.
 
 -------------------------------------------------------------------
-Mon Dec 25 17:13:19 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
+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>

kodi-noX.changes Changed

@@ -1,35 +1,71 @@
 -------------------------------------------------------------------
-Sun Mar  3 08:13:25 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.5 Nexus 
+- Version update to Kodi 21.0 Omega
 
 -------------------------------------------------------------------
-Thu Feb 29 10:47:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Add Source24: taglib-1.12.tar.gz for Tumbleweed, because snapshot
-  20240226 brought an incompatible upgrade to libtag-2.0.
+- Version update to Kodi 21.0rc2 Omega
 
 -------------------------------------------------------------------
-Sun Feb 25 11:05:19 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Use %%patch -P N for RPM-4.19
+- 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.
 
 -------------------------------------------------------------------
-Sun Feb 11 08:28:09 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.4 Nexus 
+- Version update to Kodi 21.0rc1 Omega
+- Remove 0004-xbmc#24733.patch
 
 -------------------------------------------------------------------
-Wed Jan 10 08:37:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.3 Nexus 
-- Remove fix_building_with_fmt10.patch as it's included upstream now
-- Restore the "|| l" in case of a make failure
+- 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.
 
 -------------------------------------------------------------------
-Mon Dec 25 17:13:19 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
+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>

kodi.changes Changed

@@ -1,35 +1,71 @@
 -------------------------------------------------------------------
-Sun Mar  3 08:13:25 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sat Apr  6 08:23:44 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.5 Nexus 
+- Version update to Kodi 21.0 Omega
 
 -------------------------------------------------------------------
-Thu Feb 29 10:47:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Tue Mar 19 07:57:17 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Add Source24: taglib-1.12.tar.gz for Tumbleweed, because snapshot
-  20240226 brought an incompatible upgrade to libtag-2.0.
+- Version update to Kodi 21.0rc2 Omega
 
 -------------------------------------------------------------------
-Sun Feb 25 11:05:19 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Fri Mar 15 09:00:51 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Use %%patch -P N for RPM-4.19
+- 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.
 
 -------------------------------------------------------------------
-Sun Feb 11 08:28:09 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Thu Mar  7 09:19:01 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.4 Nexus 
+- Version update to Kodi 21.0rc1 Omega
+- Remove 0004-xbmc#24733.patch
 
 -------------------------------------------------------------------
-Wed Jan 10 08:37:57 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
+Sun Feb 18 16:25:16 UTC 2024 - Manfred Hollstein <manfred.h@gmx.net>
 
-- Version update to Kodi 20.3 Nexus 
-- Remove fix_building_with_fmt10.patch as it's included upstream now
-- Restore the "|| l" in case of a make failure
+- 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.
 
 -------------------------------------------------------------------
-Mon Dec 25 17:13:19 UTC 2023 - Manfred Hollstein <manfred.h@gmx.net>
+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>

kodi-noX-raspberry-pi.spec Changed

@@ -18,13 +18,21 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Nexus
-%define ffmpeg_version 4.4.1-Nexus-Alpha1
+%define kodi_version Omega
 %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:
@@ -53,7 +61,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi
-Version:        20.5
+Version:        21.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,34 +73,23 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
+
+# The following sources will be downloaded via _service's download_files:
 Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
-Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
-Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
-Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/taglib-1.12.tar.gz
-## if %%{without sysffmpeg}
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-## endif
-
-#Patch0:         kodi-sse.patch
-#Patch0:         kodi.arm.patch
-#Patch1:         no-xbmc-symbolic-link.patch
-#Patch2:         kodi-texturepacker.patch
-#Patch3:         crossguid_build64.patch
-#Patch4:         kodi.aarch64.patch
-#Patch5:         kodi-tools-libdir.patch
-
-Patch6:         kodi-install.patch
-Patch7:         kodi-apply-dvdrun.patch
-Patch8:	        kodi-libdrm.patch
+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:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       http://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}
-Patch9:         kodi-disable-wayland.patch
+Patch3:         0003-kodi-disable-wayland.patch
 %endif
-Patch10:        ffmpeg-4.3.1-ogg.patch
-Patch11:        kodi-apply-ffmpeg.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,13 +116,14 @@
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
-BuildRequires:  fstrcmp-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)
+BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(gnutls)
@@ -135,6 +133,7 @@
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
+BuildRequires:  tinyxml2-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
@@ -146,14 +145,12 @@
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
-%if 0%{?suse_version} < 1550 || 0%{?sle_version} != 0
 BuildRequires:  pkgconfig(taglib) >= 1.9
-%endif
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
 BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
@@ -187,13 +184,13 @@
 %endif
 BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 58.18.100 with pkgconfig(libavcodec) < 59)
-BuildRequires:  (pkgconfig(libavfilter) >= 6.107.100 with pkgconfig(libavfilter) < 8)
-BuildRequires:  (pkgconfig(libavformat) >= 58.12.100 with pkgconfig(libavformat) < 59)
-BuildRequires:  (pkgconfig(libavutil) >= 56.14.100 with pkgconfig(libavutil) < 57)
-BuildRequires:  (pkgconfig(libpostproc) >= 54.7.100 with pkgconfig(libpostproc) < 56)
-BuildRequires:  (pkgconfig(libswscale) >= 4.8.100 with pkgconfig(libswscale) < 6)
-BuildRequires:  (pkgconfig(libswresample) >= 3.1.100 with pkgconfig(libswresample) < 4)
+BuildRequires:  pkgconfig(libavcodec) >= 60
+BuildRequires:  pkgconfig(libavfilter) >= 9
+BuildRequires:  pkgconfig(libavformat) >= 60
+BuildRequires:  pkgconfig(libavutil) >= 58
+BuildRequires:  pkgconfig(libpostproc) >= 57
+BuildRequires:  pkgconfig(libswresample) >= 4
+BuildRequires:  pkgconfig(libswscale) >= 7
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -208,7 +205,6 @@
 BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
@@ -243,7 +239,9 @@
 BuildRequires:  pkgconfig(x265)
 %endif
 BuildRequires:  swig
-BuildRequires:  java < 21
+BuildRequires:  java
+BuildRequires:  apache-commons-lang3
+BuildRequires:  apache-commons-text
 BuildRequires:  doxygen
 %if %{with enable_opengl}
 BuildRequires:  pkgconfig(gl)
@@ -257,6 +255,7 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+BuildRequires:  pkgconfig(libdisplay-info)
 %if %{with kodi_with_wayland}
 BuildRequires:  pkgconfig(libva-wayland)
 BuildRequires:  pkgconfig(wayland-scanner)
@@ -348,24 +347,7 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-#%setup -q -n xbmc-%{version}
-
-#%patch -P 0
-#%patch -P 1
-#%patch -P 2
-#%patch -P 3
-#%patch -P 4
-#%patch -P 5
-
-%patch -P 6
-# %patch -P 7
-#%patch -P 8 -p1
-%if %{without sysffmpeg}
-%patch -P 11
-%endif
-%if %{without kodi_with_wayland}
-%patch -P 9
-%endif
+%autopatch -p1
 
 %build
 
@@ -401,6 +383,12 @@
 %endif
 %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' \
@@ -414,14 +402,14 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_FFMPEG=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 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DENABLE_INTERNAL_TAGLIB=ON \
-    -DTAGLIB_URL=%{SOURCE24} \
-%endif
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
@@ -429,20 +417,19 @@
     -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 \
     ${NULL}
 
-    #-DRapidJSON_URL=%{SOURCE25}
-    #-DENABLE_INTERNAL_RapidJSON=ON
-    #-DENABLE_INTERNAL_FLATBUFFERS=ON
-    #-DFLATBUFFERS_URL=%{SOURCE26}
-    #-DENABLE_INTERNAL_FSTRCMP=ON
-    #-DFSTRCMP_URL=%{SOURCE27}
-
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+rm -rf %{_builddir}/groovy
 
 %install
 pushd build
@@ -491,6 +478,17 @@
  --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
@@ -514,13 +512,16 @@
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/kodi-TexturePacker
-%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
 %endif
 %{_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/*
@@ -605,8 +606,6 @@
 %{_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}/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
@@ -666,7 +665,7 @@
 %{_datadir}/kodi/cmake/ArchSetup.cmake
 %{_datadir}/kodi/cmake/CheckCommits.cmake
 %{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
 %{_datadir}/kodi/cmake/GeneratorSetup.cmake
 %{_datadir}/kodi/cmake/HandleDepends.cmake
 %{_datadir}/kodi/cmake/Macros.cmake

kodi-noX-raspberry-pi2.spec Changed

@@ -18,13 +18,21 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Nexus
-%define ffmpeg_version 4.4.1-Nexus-Alpha1
+%define kodi_version Omega
 %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:
@@ -53,7 +61,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX-raspberry-pi2
-Version:        20.5
+Version:        21.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,34 +73,23 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
+
+# The following sources will be downloaded via _service's download_files:
 Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
-Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
-Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
-Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/taglib-1.12.tar.gz
-## if %%{without sysffmpeg}
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-## endif
-
-#Patch0:         kodi-sse.patch
-#Patch0:         kodi.arm.patch
-#Patch1:         no-xbmc-symbolic-link.patch
-#Patch2:         kodi-texturepacker.patch
-#Patch3:         crossguid_build64.patch
-#Patch4:         kodi.aarch64.patch
-#Patch5:         kodi-tools-libdir.patch
-
-Patch6:         kodi-install.patch
-Patch7:         kodi-apply-dvdrun.patch
-Patch8:	        kodi-libdrm.patch
+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:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       http://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}
-Patch9:         kodi-disable-wayland.patch
+Patch3:         0003-kodi-disable-wayland.patch
 %endif
-Patch10:        ffmpeg-4.3.1-ogg.patch
-Patch11:        kodi-apply-ffmpeg.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,13 +116,14 @@
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
-BuildRequires:  fstrcmp-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)
+BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(gnutls)
@@ -135,6 +133,7 @@
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
+BuildRequires:  tinyxml2-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
@@ -146,14 +145,12 @@
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
-%if 0%{?suse_version} < 1550 || 0%{?sle_version} != 0
 BuildRequires:  pkgconfig(taglib) >= 1.9
-%endif
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
 BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
@@ -187,13 +184,13 @@
 %endif
 BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 58.18.100 with pkgconfig(libavcodec) < 59)
-BuildRequires:  (pkgconfig(libavfilter) >= 6.107.100 with pkgconfig(libavfilter) < 8)
-BuildRequires:  (pkgconfig(libavformat) >= 58.12.100 with pkgconfig(libavformat) < 59)
-BuildRequires:  (pkgconfig(libavutil) >= 56.14.100 with pkgconfig(libavutil) < 57)
-BuildRequires:  (pkgconfig(libpostproc) >= 54.7.100 with pkgconfig(libpostproc) < 56)
-BuildRequires:  (pkgconfig(libswscale) >= 4.8.100 with pkgconfig(libswscale) < 6)
-BuildRequires:  (pkgconfig(libswresample) >= 3.1.100 with pkgconfig(libswresample) < 4)
+BuildRequires:  pkgconfig(libavcodec) >= 60
+BuildRequires:  pkgconfig(libavfilter) >= 9
+BuildRequires:  pkgconfig(libavformat) >= 60
+BuildRequires:  pkgconfig(libavutil) >= 58
+BuildRequires:  pkgconfig(libpostproc) >= 57
+BuildRequires:  pkgconfig(libswresample) >= 4
+BuildRequires:  pkgconfig(libswscale) >= 7
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -208,7 +205,6 @@
 BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
@@ -243,7 +239,9 @@
 BuildRequires:  pkgconfig(x265)
 %endif
 BuildRequires:  swig
-BuildRequires:  java < 21
+BuildRequires:  java
+BuildRequires:  apache-commons-lang3
+BuildRequires:  apache-commons-text
 BuildRequires:  doxygen
 %if %{with enable_opengl}
 BuildRequires:  pkgconfig(gl)
@@ -257,6 +255,7 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+BuildRequires:  pkgconfig(libdisplay-info)
 %if %{with kodi_with_wayland}
 BuildRequires:  pkgconfig(libva-wayland)
 BuildRequires:  pkgconfig(wayland-scanner)
@@ -348,24 +347,7 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-#%setup -q -n xbmc-%{version}
-
-#%patch -P 0
-#%patch -P 1
-#%patch -P 2
-#%patch -P 3
-#%patch -P 4
-#%patch -P 5
-
-%patch -P 6
-# %patch -P 7
-#%patch -P 8 -p1
-%if %{without sysffmpeg}
-%patch -P 11
-%endif
-%if %{without kodi_with_wayland}
-%patch -P 9
-%endif
+%autopatch -p1
 
 %build
 
@@ -401,6 +383,12 @@
 %endif
 %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' \
@@ -414,14 +402,14 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_FFMPEG=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 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DENABLE_INTERNAL_TAGLIB=ON \
-    -DTAGLIB_URL=%{SOURCE24} \
-%endif
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
@@ -429,20 +417,19 @@
     -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 \
     ${NULL}
 
-    #-DRapidJSON_URL=%{SOURCE25}
-    #-DENABLE_INTERNAL_RapidJSON=ON
-    #-DENABLE_INTERNAL_FLATBUFFERS=ON
-    #-DFLATBUFFERS_URL=%{SOURCE26}
-    #-DENABLE_INTERNAL_FSTRCMP=ON
-    #-DFSTRCMP_URL=%{SOURCE27}
-
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+rm -rf %{_builddir}/groovy
 
 %install
 pushd build
@@ -491,6 +478,17 @@
  --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
@@ -514,13 +512,16 @@
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/kodi-TexturePacker
-%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
 %endif
 %{_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/*
@@ -605,8 +606,6 @@
 %{_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}/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
@@ -666,7 +665,7 @@
 %{_datadir}/kodi/cmake/ArchSetup.cmake
 %{_datadir}/kodi/cmake/CheckCommits.cmake
 %{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
 %{_datadir}/kodi/cmake/GeneratorSetup.cmake
 %{_datadir}/kodi/cmake/HandleDepends.cmake
 %{_datadir}/kodi/cmake/Macros.cmake

kodi-noX.spec Changed

@@ -18,13 +18,21 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Nexus
-%define ffmpeg_version 4.4.1-Nexus-Alpha1
+%define kodi_version Omega
 %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:
@@ -53,7 +61,7 @@
 ExclusiveArch: does-not-build
 
 Name:           kodi-noX
-Version:        20.5
+Version:        21.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,34 +73,23 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
+
+# The following sources will be downloaded via _service's download_files:
 Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
-Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
-Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
-Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/taglib-1.12.tar.gz
-## if %%{without sysffmpeg}
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-## endif
-
-#Patch0:         kodi-sse.patch
-#Patch0:         kodi.arm.patch
-#Patch1:         no-xbmc-symbolic-link.patch
-#Patch2:         kodi-texturepacker.patch
-#Patch3:         crossguid_build64.patch
-#Patch4:         kodi.aarch64.patch
-#Patch5:         kodi-tools-libdir.patch
-
-Patch6:         kodi-install.patch
-Patch7:         kodi-apply-dvdrun.patch
-Patch8:	        kodi-libdrm.patch
+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:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       http://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}
-Patch9:         kodi-disable-wayland.patch
+Patch3:         0003-kodi-disable-wayland.patch
 %endif
-Patch10:        ffmpeg-4.3.1-ogg.patch
-Patch11:        kodi-apply-ffmpeg.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,13 +116,14 @@
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
-BuildRequires:  fstrcmp-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)
+BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(gnutls)
@@ -135,6 +133,7 @@
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
+BuildRequires:  tinyxml2-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
@@ -146,14 +145,12 @@
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
-%if 0%{?suse_version} < 1550 || 0%{?sle_version} != 0
 BuildRequires:  pkgconfig(taglib) >= 1.9
-%endif
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
 BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
@@ -187,13 +184,13 @@
 %endif
 BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 58.18.100 with pkgconfig(libavcodec) < 59)
-BuildRequires:  (pkgconfig(libavfilter) >= 6.107.100 with pkgconfig(libavfilter) < 8)
-BuildRequires:  (pkgconfig(libavformat) >= 58.12.100 with pkgconfig(libavformat) < 59)
-BuildRequires:  (pkgconfig(libavutil) >= 56.14.100 with pkgconfig(libavutil) < 57)
-BuildRequires:  (pkgconfig(libpostproc) >= 54.7.100 with pkgconfig(libpostproc) < 56)
-BuildRequires:  (pkgconfig(libswscale) >= 4.8.100 with pkgconfig(libswscale) < 6)
-BuildRequires:  (pkgconfig(libswresample) >= 3.1.100 with pkgconfig(libswresample) < 4)
+BuildRequires:  pkgconfig(libavcodec) >= 60
+BuildRequires:  pkgconfig(libavfilter) >= 9
+BuildRequires:  pkgconfig(libavformat) >= 60
+BuildRequires:  pkgconfig(libavutil) >= 58
+BuildRequires:  pkgconfig(libpostproc) >= 57
+BuildRequires:  pkgconfig(libswresample) >= 4
+BuildRequires:  pkgconfig(libswscale) >= 7
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -208,7 +205,6 @@
 BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
@@ -243,7 +239,9 @@
 BuildRequires:  pkgconfig(x265)
 %endif
 BuildRequires:  swig
-BuildRequires:  java < 21
+BuildRequires:  java
+BuildRequires:  apache-commons-lang3
+BuildRequires:  apache-commons-text
 BuildRequires:  doxygen
 %if %{with enable_opengl}
 BuildRequires:  pkgconfig(gl)
@@ -257,6 +255,7 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+BuildRequires:  pkgconfig(libdisplay-info)
 %if %{with kodi_with_wayland}
 BuildRequires:  pkgconfig(libva-wayland)
 BuildRequires:  pkgconfig(wayland-scanner)
@@ -348,24 +347,7 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-#%setup -q -n xbmc-%{version}
-
-#%patch -P 0
-#%patch -P 1
-#%patch -P 2
-#%patch -P 3
-#%patch -P 4
-#%patch -P 5
-
-%patch -P 6
-# %patch -P 7
-#%patch -P 8 -p1
-%if %{without sysffmpeg}
-%patch -P 11
-%endif
-%if %{without kodi_with_wayland}
-%patch -P 9
-%endif
+%autopatch -p1
 
 %build
 
@@ -401,6 +383,12 @@
 %endif
 %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' \
@@ -414,14 +402,14 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_FFMPEG=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 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DENABLE_INTERNAL_TAGLIB=ON \
-    -DTAGLIB_URL=%{SOURCE24} \
-%endif
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
@@ -429,20 +417,19 @@
     -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 \
     ${NULL}
 
-    #-DRapidJSON_URL=%{SOURCE25}
-    #-DENABLE_INTERNAL_RapidJSON=ON
-    #-DENABLE_INTERNAL_FLATBUFFERS=ON
-    #-DFLATBUFFERS_URL=%{SOURCE26}
-    #-DENABLE_INTERNAL_FSTRCMP=ON
-    #-DFSTRCMP_URL=%{SOURCE27}
-
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+rm -rf %{_builddir}/groovy
 
 %install
 pushd build
@@ -491,6 +478,17 @@
  --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
@@ -514,13 +512,16 @@
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/kodi-TexturePacker
-%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
 %endif
 %{_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/*
@@ -605,8 +606,6 @@
 %{_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}/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
@@ -666,7 +665,7 @@
 %{_datadir}/kodi/cmake/ArchSetup.cmake
 %{_datadir}/kodi/cmake/CheckCommits.cmake
 %{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
 %{_datadir}/kodi/cmake/GeneratorSetup.cmake
 %{_datadir}/kodi/cmake/HandleDepends.cmake
 %{_datadir}/kodi/cmake/Macros.cmake

kodi.spec Changed

@@ -18,13 +18,21 @@
 
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from
 # kodi.* files with the pre_checkin.sh script
-%define kodi_version Nexus
-%define ffmpeg_version 4.4.1-Nexus-Alpha1
+%define kodi_version Omega
 %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:
@@ -53,7 +61,7 @@
 ExclusiveArch: %ix86 x86_64 %arm aarch64
 
 Name:           kodi
-Version:        20.5
+Version:        21.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -65,34 +73,23 @@
 Source3:        kodi.VERSION
 Source10:       kodi.service
 Source11:       kodi-noX.service
+
+# The following sources will be downloaded via _service's download_files:
 Source20:       http://mirrors.kodi.tv/build-deps/sources/crossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdnav/tar.gz/refs/tags/6.1.1-Next-Nexus-Alpha2-2
-Source21:	libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdcss/tar.gz/refs/tags/1.4.3-Next-Nexus-Alpha2-2
-Source22:	libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz
-# DOWNLOAD from https://codeload.github.com/xbmc/libdvdread/tar.gz/refs/tags/6.1.3-Next-Nexus-Alpha2-2
-Source23:       libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz
-Source24:       http://mirrors.kodi.tv/build-deps/sources/taglib-1.12.tar.gz
-## if %%{without sysffmpeg}
-Source30:       https://github.com/xbmc/FFmpeg/archive/%{ffmpeg_version}.tar.gz
-## endif
-
-#Patch0:         kodi-sse.patch
-#Patch0:         kodi.arm.patch
-#Patch1:         no-xbmc-symbolic-link.patch
-#Patch2:         kodi-texturepacker.patch
-#Patch3:         crossguid_build64.patch
-#Patch4:         kodi.aarch64.patch
-#Patch5:         kodi-tools-libdir.patch
-
-Patch6:         kodi-install.patch
-Patch7:         kodi-apply-dvdrun.patch
-Patch8:	        kodi-libdrm.patch
+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:       http://mirrors.kodi.tv/build-deps/sources/libudfread-1.1.2.tar.gz
+Source25:       http://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}
-Patch9:         kodi-disable-wayland.patch
+Patch3:         0003-kodi-disable-wayland.patch
 %endif
-Patch10:        ffmpeg-4.3.1-ogg.patch
-Patch11:        kodi-apply-ffmpeg.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -119,13 +116,14 @@
 BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  flatbuffers-devel
-BuildRequires:  fstrcmp-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)
+BuildRequires:  pkgconfig(libass) >= 0.17.0
 BuildRequires:  pkgconfig(libcurl)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(gnutls)
@@ -135,6 +133,7 @@
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(libcrypto)
 BuildRequires:  tinyxml-devel
+BuildRequires:  tinyxml2-devel
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  libyajl-devel >= 2
 BuildRequires:  pkgconfig(libidn2)
@@ -146,14 +145,12 @@
 BuildRequires:  pkgconfig(libpcrecpp)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(freetype2)
-%if 0%{?suse_version} < 1550 || 0%{?sle_version} != 0
 BuildRequires:  pkgconfig(taglib) >= 1.9
-%endif
 BuildRequires:  pkgconfig(libcdio) >= 2.1.0
 BuildRequires:  pkgconfig(lirc)
 BuildRequires:  pkgconfig(RapidJSON)
 %if %{with kodi_libbluray}
-BuildRequires:  pkgconfig(libbluray)  >= 0.7.0
+BuildRequires:  pkgconfig(libbluray)  >= 0.9.3
 %endif
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
@@ -187,13 +184,13 @@
 %endif
 BuildRequires:  libcap-devel
 %if %{with sysffmpeg}
-BuildRequires:  (pkgconfig(libavcodec) >= 58.18.100 with pkgconfig(libavcodec) < 59)
-BuildRequires:  (pkgconfig(libavfilter) >= 6.107.100 with pkgconfig(libavfilter) < 8)
-BuildRequires:  (pkgconfig(libavformat) >= 58.12.100 with pkgconfig(libavformat) < 59)
-BuildRequires:  (pkgconfig(libavutil) >= 56.14.100 with pkgconfig(libavutil) < 57)
-BuildRequires:  (pkgconfig(libpostproc) >= 54.7.100 with pkgconfig(libpostproc) < 56)
-BuildRequires:  (pkgconfig(libswscale) >= 4.8.100 with pkgconfig(libswscale) < 6)
-BuildRequires:  (pkgconfig(libswresample) >= 3.1.100 with pkgconfig(libswresample) < 4)
+BuildRequires:  pkgconfig(libavcodec) >= 60
+BuildRequires:  pkgconfig(libavfilter) >= 9
+BuildRequires:  pkgconfig(libavformat) >= 60
+BuildRequires:  pkgconfig(libavutil) >= 58
+BuildRequires:  pkgconfig(libpostproc) >= 57
+BuildRequires:  pkgconfig(libswresample) >= 4
+BuildRequires:  pkgconfig(libswscale) >= 7
 %else
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
@@ -208,7 +205,6 @@
 BuildRequires:  pkgconfig(fribidi) >= 0.19.0
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(jack)
-BuildRequires:  pkgconfig(libass)
 BuildRequires:  pkgconfig(libbluray)
 BuildRequires:  pkgconfig(libcdio_paranoia)
 BuildRequires:  pkgconfig(libdc1394-2)
@@ -243,7 +239,9 @@
 BuildRequires:  pkgconfig(x265)
 %endif
 BuildRequires:  swig
-BuildRequires:  java < 21
+BuildRequires:  java
+BuildRequires:  apache-commons-lang3
+BuildRequires:  apache-commons-text
 BuildRequires:  doxygen
 %if %{with enable_opengl}
 BuildRequires:  pkgconfig(gl)
@@ -257,6 +255,7 @@
 BuildRequires:  pkgconfig(libva-x11) >= 1.0.0
 %endif
 %endif
+BuildRequires:  pkgconfig(libdisplay-info)
 %if %{with kodi_with_wayland}
 BuildRequires:  pkgconfig(libva-wayland)
 BuildRequires:  pkgconfig(wayland-scanner)
@@ -348,24 +347,7 @@
 
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
-#%setup -q -n xbmc-%{version}
-
-#%patch -P 0
-#%patch -P 1
-#%patch -P 2
-#%patch -P 3
-#%patch -P 4
-#%patch -P 5
-
-%patch -P 6
-# %patch -P 7
-#%patch -P 8 -p1
-%if %{without sysffmpeg}
-%patch -P 11
-%endif
-%if %{without kodi_with_wayland}
-%patch -P 9
-%endif
+%autopatch -p1
 
 %build
 
@@ -401,6 +383,12 @@
 %endif
 %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' \
@@ -414,14 +402,14 @@
     -DCMAKE_C_COMPILER=$CC \
     -DCMAKE_CXX_COMPILER=$CXX \
     -DENABLE_INTERNAL_FMT=OFF \
-    -DENABLE_INTERNAL_FFMPEG=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 \
-%if 0%{?suse_version} >= 1550 && 0%{?sle_version} == 0
-    -DENABLE_INTERNAL_TAGLIB=ON \
-    -DTAGLIB_URL=%{SOURCE24} \
-%endif
     -DCROSSGUID_URL=%{SOURCE20} \
     -DLIBDVDNAV_URL=%{SOURCE21} \
     -DLIBDVDCSS_URL=%{SOURCE22} \
@@ -429,20 +417,19 @@
     -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 \
     ${NULL}
 
-    #-DRapidJSON_URL=%{SOURCE25}
-    #-DENABLE_INTERNAL_RapidJSON=ON
-    #-DENABLE_INTERNAL_FLATBUFFERS=ON
-    #-DFLATBUFFERS_URL=%{SOURCE26}
-    #-DENABLE_INTERNAL_FSTRCMP=ON
-    #-DFSTRCMP_URL=%{SOURCE27}
-
 make -O %{?_smp_mflags} V=1 CC=$CC CXX=$CXX || l
+rm -rf %{_builddir}/groovy
 
 %install
 pushd build
@@ -491,6 +478,17 @@
  --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
@@ -514,13 +512,16 @@
 %{_bindir}/kodi
 %{_bindir}/kodi-standalone
 %{_bindir}/kodi-TexturePacker
-%{_bindir}/JsonSchemaBuilder
 %dir %{_libdir}/kodi
 %if %{with kodi_with_X11}
 %{_libdir}/kodi/kodi-xrandr
 %{_libdir}/kodi/kodi.bin
 %endif
 %{_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/*
@@ -605,8 +606,6 @@
 %{_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}/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
@@ -666,7 +665,7 @@
 %{_datadir}/kodi/cmake/ArchSetup.cmake
 %{_datadir}/kodi/cmake/CheckCommits.cmake
 %{_datadir}/kodi/cmake/CheckTargetPlatform.cmake
-%{_datadir}/kodi/cmake/GenerateVersionedFiles.cmake
+%{_datadir}/kodi/cmake/GenerateCompileInfo.cmake
 %{_datadir}/kodi/cmake/GeneratorSetup.cmake
 %{_datadir}/kodi/cmake/HandleDepends.cmake
 %{_datadir}/kodi/cmake/Macros.cmake

0001-crossguid-dgb.patch Added

@@ -0,0 +1,22 @@
+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 Added

0003-kodi-disable-wayland.patch Added

crossguid_build64.patch Deleted

@@ -1,57 +0,0 @@
---- 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 Deleted

ffmpeg-4.3.1-ogg.patch Deleted

@@ -1,361 +0,0 @@
-From cec779723072f32a37ccfabe5488ffe2228f4ea0 Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Sun, 20 Sep 2020 09:32:44 +0200
-Subject: PATCH 1/8 avformat/aviobuf: write data into the IO buffer till the
- very end of the buffer
-
-There was an off-by-one error when checking if the IO buffer still has enough
-space till the end. One more byte can be safely written.
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/aviobuf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index a48ceebaef..aab3f1ef00 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -528,7 +528,7 @@ static void fill_buffer(AVIOContext *s)
- {
-     int max_buffer_size = s->max_packet_size ?
-                           s->max_packet_size : IO_BUFFER_SIZE;
--    uint8_t *dst        = s->buf_end - s->buffer + max_buffer_size < s->buffer_size ?
-+    uint8_t *dst        = s->buf_end - s->buffer + max_buffer_size <= s->buffer_size ?
-                           s->buf_end : s->buffer;
-     int len             = s->buffer_size - (dst - s->buffer);
- 
--- 
-2.35.3
-
-
-From 09e3cc9889ae7d4aad6a8a9c624d1e23499c0f0b Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Sat, 26 Sep 2020 19:20:50 +0200
-Subject: PATCH 2/8 avformat/aviobuf: check if requested seekback buffer is
- already read
-
-Existing code did not check if the requested seekback buffer is
-already read entirely. In this case, nothing has to be done to guarantee
-seekback.
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/aviobuf.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index aab3f1ef00..de047c44f6 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -987,6 +987,9 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
-     int filled = s->buf_end - s->buffer;
-     ptrdiff_t checksum_ptr_offset = s->checksum_ptr ? s->checksum_ptr - s->buffer : -1;
- 
-+    if (buf_size <= s->buf_end - s->buf_ptr)
-+        return 0;
-+
-     buf_size += s->buf_ptr - s->buffer + max_buffer_size;
- 
-     if (buf_size < filled || s->seekable || !s->read_packet)
--- 
-2.35.3
-
-
-From 5ee650fd6c5276e3977ad9f856146053e16b23e5 Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Sun, 20 Sep 2020 00:01:48 +0200
-Subject: PATCH 3/8 avformat/aviobuf: fix checks in ffio_ensure_seekback
-
-The new buf_size was detemined too conservatively, maybe because of the
-off-by-one issue which was fixed recently in fill_buffer. We can safely
-substract 1 more from the new buffer size, because max_buffer_size space must
-only be guaranteed when we are reading the last byte of the requested window.
-
-Comparing the new buf_size against filled did not make a lot of sense, what
-makes sense is that we want to reallocate the buffer if the new buf_size is
-bigger than the old, therefore the change in the check.
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/aviobuf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index de047c44f6..c8be9122a7 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -990,9 +990,9 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
-     if (buf_size <= s->buf_end - s->buf_ptr)
-         return 0;
- 
--    buf_size += s->buf_ptr - s->buffer + max_buffer_size;
-+    buf_size += s->buf_ptr - s->buffer + max_buffer_size - 1;
- 
--    if (buf_size < filled || s->seekable || !s->read_packet)
-+    if (buf_size <= s->buffer_size || s->seekable || !s->read_packet)
-         return 0;
-     av_assert0(!s->write_flag);
- 
--- 
-2.35.3
-
-
-From 11f324f1db3976f726ff850196200176b7f31c0f Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Mon, 28 Sep 2020 23:48:34 +0200
-Subject: PATCH 4/8 avformat/aviobuf: discard part of the IO buffer in
- ffio_ensure_seekback if needed
-
-Previously ffio_ensure_seekback never flushed the buffer, so successive
-ffio_ensure_seekback calls were all respected. This could eventually cause
-unlimited memory and CPU usage if a demuxer called ffio_ensure_seekback on all
-it's read data.
-
-Most demuxers however only rely on being able to seek back till the position of
-the last ffio_ensure_seekback call, therefore we change the semantics of
-ffio_ensure_seekback so that a new call can invalidate seek guarantees of the
-old. In order to support some level of "nested" ffio_ensure_seekback calls, we
-document that the function only invalidates the old window (and potentially
-discards the already read data from the IO buffer), if the newly requested
-window does not fit into the old one.
-
-This way we limit the memory usage for ffio_ensure_seekback calls requesting
-consecutive data windows.
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/avio_internal.h |  4 +++-
- libavformat/aviobuf.c       | 27 +++++++++++++++++----------
- 2 files changed, 20 insertions(+), 11 deletions(-)
-
-diff --git libavformat/avio_internal.h libavformat/avio_internal.h
-index c575df8035..fe87f2a288 100644
---- libavformat/avio_internal.h
-+++ libavformat/avio_internal.h
-@@ -100,7 +100,9 @@ int ffio_realloc_buf(AVIOContext *s, int buf_size);
-  *
-  * Will ensure that when reading sequentially up to buf_size, seeking
-  * within the current pos and pos+buf_size is possible.
-- * Once the stream position moves outside this window this guarantee is lost.
-+ * Once the stream position moves outside this window or another
-+ * ffio_ensure_seekback call requests a buffer outside this window this
-+ * guarantee is lost.
-  */
- int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size);
- 
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index c8be9122a7..d3e07ed38f 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -979,35 +979,42 @@ URLContext* ffio_geturlcontext(AVIOContext *s)
-         return NULL;
- }
- 
-+static void update_checksum(AVIOContext *s)
-+{
-+    if (s->update_checksum && s->buf_ptr > s->checksum_ptr) {
-+        s->checksum = s->update_checksum(s->checksum, s->checksum_ptr,
-+                                         s->buf_ptr - s->checksum_ptr);
-+    }
-+}
-+
- int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
- {
-     uint8_t *buffer;
-     int max_buffer_size = s->max_packet_size ?
-                           s->max_packet_size : IO_BUFFER_SIZE;
--    int filled = s->buf_end - s->buffer;
--    ptrdiff_t checksum_ptr_offset = s->checksum_ptr ? s->checksum_ptr - s->buffer : -1;
-+    ptrdiff_t filled = s->buf_end - s->buf_ptr;
- 
-     if (buf_size <= s->buf_end - s->buf_ptr)
-         return 0;
- 
--    buf_size += s->buf_ptr - s->buffer + max_buffer_size - 1;
-+    buf_size += max_buffer_size - 1;
- 
--    if (buf_size <= s->buffer_size || s->seekable || !s->read_packet)
-+    if (buf_size + s->buf_ptr - s->buffer <= s->buffer_size || s->seekable || !s->read_packet)
-         return 0;
-     av_assert0(!s->write_flag);
- 
-+    buf_size = FFMAX(buf_size, s->buffer_size);
-     buffer = av_malloc(buf_size);
-     if (!buffer)
-         return AVERROR(ENOMEM);
--
--    memcpy(buffer, s->buffer, filled);
-+    update_checksum(s);
-+    memcpy(buffer, s->buf_ptr, filled);
-     av_free(s->buffer);
--    s->buf_ptr = buffer + (s->buf_ptr - s->buffer);
--    s->buf_end = buffer + (s->buf_end - s->buffer);
-     s->buffer = buffer;
-     s->buffer_size = buf_size;
--    if (checksum_ptr_offset >= 0)
--        s->checksum_ptr = s->buffer + checksum_ptr_offset;
-+    s->buf_ptr = s->buffer;
-+    s->buf_end = s->buffer + filled;
-+    s->checksum_ptr = s->buffer;
-     return 0;
- }
- 
--- 
-2.35.3
-
-
-From 238ca22eed9987705b48a80ce44176f5d956e460 Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Tue, 29 Sep 2020 00:15:27 +0200
-Subject: PATCH 5/8 avformat/aviobuf: do not allocate a new buffer in
- ffio_ensure_seekback if not needed
-
-Let's move unread data to the start of the old buffer instead.
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/aviobuf.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index d3e07ed38f..34ae25b4b1 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -1003,7 +1003,10 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
-         return 0;
-     av_assert0(!s->write_flag);
- 
--    buf_size = FFMAX(buf_size, s->buffer_size);
-+    if (buf_size <= s->buffer_size) {
-+        update_checksum(s);
-+        memmove(s->buffer, s->buf_ptr, filled);
-+    } else {
-     buffer = av_malloc(buf_size);
-     if (!buffer)
-         return AVERROR(ENOMEM);
-@@ -1012,6 +1015,7 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
-     av_free(s->buffer);
-     s->buffer = buffer;
-     s->buffer_size = buf_size;
-+    }
-     s->buf_ptr = s->buffer;
-     s->buf_end = s->buffer + filled;
-     s->checksum_ptr = s->buffer;
--- 
-2.35.3
-
-
-From 07c6d9b4088afb7d88708ff3e0761c1b9386f4fc Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Tue, 29 Sep 2020 00:16:47 +0200
-Subject: PATCH 6/8 avformat/aviobuf: fix indentation
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/aviobuf.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index 34ae25b4b1..8f6f8019d1 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -1007,14 +1007,14 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size)
-         update_checksum(s);
-         memmove(s->buffer, s->buf_ptr, filled);
-     } else {
--    buffer = av_malloc(buf_size);
--    if (!buffer)
--        return AVERROR(ENOMEM);
--    update_checksum(s);
--    memcpy(buffer, s->buf_ptr, filled);
--    av_free(s->buffer);
--    s->buffer = buffer;
--    s->buffer_size = buf_size;
-+        buffer = av_malloc(buf_size);
-+        if (!buffer)
-+            return AVERROR(ENOMEM);
-+        update_checksum(s);
-+        memcpy(buffer, s->buf_ptr, filled);
-+        av_free(s->buffer);
-+        s->buffer = buffer;
-+        s->buffer_size = buf_size;
-     }
-     s->buf_ptr = s->buffer;
-     s->buf_end = s->buffer + filled;
--- 
-2.35.3
-
-
-From b1bf8ee8951cc099ab43d96baa952323560c768b Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Sun, 20 Sep 2020 00:02:19 +0200
-Subject: PATCH 7/8 avformat/aviobuf: increase default read buffer size to
- 2*max_buffer_size for streamed data
-
-This should increase the effectiveness of ffio_ensure_seekback by reducing the
-number of buffer reallocations and memmoves/memcpys because even a small
-seekback window requires max_buffer_size+window_size buffer space.
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/aviobuf.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index 8f6f8019d1..039f3182e1 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -926,6 +926,11 @@ int ffio_fdopen(AVIOContext **s, URLContext *h)
-     } else {
-         buffer_size = IO_BUFFER_SIZE;
-     }
-+    if (!(h->flags & AVIO_FLAG_WRITE) && h->is_streamed) {
-+        if (buffer_size > INT_MAX/2)
-+            return AVERROR(EINVAL);
-+        buffer_size *= 2;
-+    }
-     buffer = av_malloc(buffer_size);
-     if (!buffer)
-         return AVERROR(ENOMEM);
--- 
-2.35.3
-
-
-From 727c8d9dea957ffc66af741ac318710398fa8c6f Mon Sep 17 00:00:00 2001
-From: Marton Balint <cus@passwd.hu>
-Date: Fri, 9 Oct 2020 00:18:07 +0200
-Subject: PATCH 8/8 Revert "aviobuf: Discard old buffered, previously read
- data in ffio_read_partial"
-
-This is unneeded after 2ca48e466675a8a3630061cd2c15325eab8eda97 and it breaks
-ffio_ensure_seekback().
-
-This reverts commit 53c25ee0736497b46bb76064cc2c84c976b2d295.
-
-Signed-off-by: Marton Balint <cus@passwd.hu>
----
- libavformat/aviobuf.c | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git libavformat/aviobuf.c libavformat/aviobuf.c
-index 039f3182e1..050c063998 100644
---- libavformat/aviobuf.c
-+++ libavformat/aviobuf.c
-@@ -707,13 +707,6 @@ int avio_read_partial(AVIOContext *s, unsigned char *buf, int size)
- 
-     len = s->buf_end - s->buf_ptr;
-     if (len == 0) {
--        /* Reset the buf_end pointer to the start of the buffer, to make sure
--         * the fill_buffer call tries to read as much data as fits into the
--         * full buffer, instead of just what space is left after buf_end.
--         * This avoids returning partial packets at the end of the buffer,
--         * for packet based inputs.
--         */
--        s->buf_end = s->buf_ptr = s->buffer;
-         fill_buffer(s);
-         len = s->buf_end - s->buf_ptr;
-     }
--- 
-2.35.3
-

fix_building_with_fmt10.patch Deleted

@@ -1,97 +0,0 @@
-commit 3a20f5b67ff32cc3663e0ccd72941e666e8756a4
-Author: Lukas Rusak <lorusak@gmail.com>
-Date:   Tue Jun 27 11:21:50 2023 -0700
-
-    CGUIWindowHome: use AnnouncementFlagToString when logging
-    
-    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
-
-diff --git a/xbmc/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp
-index c42e073c48..abc6cfc94d 100644
---- a/xbmc/windows/GUIWindowHome.cpp
-+++ b/xbmc/windows/GUIWindowHome.cpp
-@@ -78,7 +78,8 @@ void CGUIWindowHome::Announce(ANNOUNCEMENT::AnnouncementFlag flag,
- {
-   int ra_flag = 0;
- 
--  CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}", flag, sender, message);
-+  CLog::Log(LOGDEBUG, LOGANNOUNCE, "GOT ANNOUNCEMENT, type: {}, from {}, message {}",
-+            AnnouncementFlagToString(flag), sender, message);
- 
-   // we are only interested in library changes
-   if ((flag & (ANNOUNCEMENT::VideoLibrary | ANNOUNCEMENT::AudioLibrary)) == 0)
-
-commit c82006b575b78efbb3f5aff40a159b90f245ea9d
-Author: Lukas Rusak <lorusak@gmail.com>
-Date:   Tue Jun 27 11:22:32 2023 -0700
-
-    CGUIColorButtonControl: use explicit cast to UTILS::COLOR::Color when formatting
-    
-    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
-
-diff --git a/xbmc/guilib/GUIColorButtonControl.cpp b/xbmc/guilib/GUIColorButtonControl.cpp
-index 940834cb68..67597d7ab5 100644
---- a/xbmc/guilib/GUIColorButtonControl.cpp
-+++ b/xbmc/guilib/GUIColorButtonControl.cpp
-@@ -188,7 +188,8 @@ void CGUIColorButtonControl::RenderInfoText()
- void CGUIColorButtonControl::ProcessInfoText(unsigned int currentTime)
- {
-   CRect labelRenderRect = m_labelInfo.GetRenderRect();
--  bool changed = m_labelInfo.SetText(StringUtils::Format("#{:08X}", m_imgBoxColor));
-+  bool changed = m_labelInfo.SetText(
-+      StringUtils::Format("#{:08X}", static_cast<UTILS::COLOR::Color>(m_imgBoxColor)));
-   // Set Label X position based on image mask control position
-   float textWidth = m_labelInfo.GetTextWidth() + 2 * m_labelInfo.GetLabelInfo().offsetX;
-   float textPosX = m_imgColorMask->GetXPosition() - textWidth;
-
-commit e4b1aa8450fabfb41379953c8ccec0a512421531
-Author: Lukas Rusak <lorusak@gmail.com>
-Date:   Tue Jun 27 11:24:02 2023 -0700
-
-    CLog: allow using fmt::enums::format_as for explicit enum conversion when using libfmt>=10
-    
-    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
-
-diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
-index 9fc4aae368..adf46905a8 100644
---- a/xbmc/utils/log.h
-+++ b/xbmc/utils/log.h
-@@ -46,6 +46,10 @@ class dist_sink;
- } // namespace sinks
- } // namespace spdlog
- 
-+#if FMT_VERSION >= 100000
-+using fmt::enums::format_as;
-+#endif
-+
- class CLog : public ISettingsHandler, public ISettingCallback
- {
- public:
-
-commit 26c164a28cfd18ceef7a1f2bbba5bf8a4a5a750c
-Author: Lukas Rusak <lorusak@gmail.com>
-Date:   Tue Jun 27 11:24:34 2023 -0700
-
-    CLog: add formatter for std::atomic for explicit atomic conversion when using libfmt>=10
-    
-    Signed-off-by: Lukas Rusak <lorusak@gmail.com>
-
-diff --git a/xbmc/utils/log.h b/xbmc/utils/log.h
-index adf46905a8..1c42c888cb 100644
---- a/xbmc/utils/log.h
-+++ b/xbmc/utils/log.h
-@@ -48,6 +48,14 @@ class dist_sink;
- 
- #if FMT_VERSION >= 100000
- using fmt::enums::format_as;
-+
-+namespace fmt
-+{
-+template<typename T, typename Char>
-+struct formatter<std::atomic<T>, Char> : formatter<T, Char>
-+{
-+};
-+} // namespace fmt
- #endif
- 
- class CLog : public ISettingsHandler, public ISettingCallback

kodi-15.0-gcc5.patch Deleted

kodi-apply-dvdrun.patch Deleted

kodi-apply-ffmpeg.patch Deleted

kodi-disable-wayland.patch Deleted

kodi-install.patch Deleted

kodi-libdrm.patch Deleted

kodi-sse.patch Deleted

kodi-texturepacker.patch Deleted

kodi-tools-libdir.patch Deleted

@@ -1,89 +0,0 @@
-Index: tools/depends/target/libdvdread/Makefile
-===================================================================
---- tools/depends/target/libdvdread/Makefile.orig	2017-11-21 11:15:09.356861040 +0200
-+++ tools/depends/target/libdvdread/Makefile	2017-11-22 14:01:17.324102964 +0200
-@@ -3,7 +3,7 @@ include DVDREAD-VERSION
- DEPS = DVDREAD-VERSION Makefile
- 
- # configuration settings
--config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
-+config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
- EXTRA_CFLAGS = -D_XBMC
- 
- ifeq ($(CROSS_COMPILING), yes)
-@@ -16,7 +16,7 @@ else
-   ifeq ($(PLATFORM),)
-     PLATFORM = native
-     TARBALLS_LOCATION = $(ROOT_DIR)
--    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdcss/dvdcss-install/lib/pkgconfig"
-+    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdcss/dvdcss-install/$(DVD_LIB)/pkgconfig"
-     EXTRA_CFLAGS += -I$(ROOT_DIR)/../libdvdcss/dvdcss-install/include
-   endif
- endif
-@@ -42,7 +42,6 @@ else
-   ARCHIVE=$(LIBNAME)-$(GITREV).tar.gz
- endif
- 
--
- CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
- 
- all: .installed-$(PLATFORM)
-Index: lib/libdvd/Makefile.in
-===================================================================
---- lib/libdvd/Makefile.in.orig	2017-11-21 11:15:09.356861040 +0200
-+++ lib/libdvd/Makefile.in	2017-11-21 11:44:59.603860055 +0200
-@@ -6,13 +6,13 @@ CXX=@CXX@
- 
- ifeq (@CROSS_COMPILING@,yes)
-   DEPENDS_DIR = $(shell grep "^PREFIX=/" @abs_top_srcdir@/tools/depends/Makefile.include | sed 's/PREFIX=//g')
--  DVDNAV_A = $(DEPENDS_DIR)/lib/libdvdnav.a
--  DVDREAD_A = $(DEPENDS_DIR)/lib/libdvdread.a
--  DVDCSS_A = $(DEPENDS_DIR)/lib/libdvdcss.a
-+  DVDNAV_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdnav.a
-+  DVDREAD_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdread.a
-+  DVDCSS_A = $(DEPENDS_DIR)/$(DVD_LIB)/libdvdcss.a
- else
--  DVDNAV_A = @abs_top_srcdir@/tools/depends/target/libdvdnav/dvdnav-install/lib/libdvdnav.a
--  DVDREAD_A = @abs_top_srcdir@/tools/depends/target/libdvdread/dvdread-install/lib/libdvdread.a
--  DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/lib/libdvdcss.a
-+  DVDNAV_A = @abs_top_srcdir@/tools/depends/target/libdvdnav/dvdnav-install/$(DVD_LIB)/libdvdnav.a
-+  DVDREAD_A = @abs_top_srcdir@/tools/depends/target/libdvdread/dvdread-install/$(DVD_LIB)/libdvdread.a
-+  DVDCSS_A = @abs_top_srcdir@/tools/depends/target/libdvdcss/dvdcss-install/$(DVD_LIB)/libdvdcss.a
- endif
- 
- SYSDIR = @abs_top_srcdir@/system/players/VideoPlayer
-Index: tools/depends/target/libdvdcss/Makefile
-===================================================================
---- tools/depends/target/libdvdcss/Makefile.orig	2017-10-23 07:55:21.000000000 +0200
-+++ tools/depends/target/libdvdcss/Makefile	2017-11-22 11:23:22.801643723 +0200
-@@ -19,7 +19,7 @@ RETRIEVE_TOOL := curl -Ls --create-dirs
- ARCHIVE_TOOL := tar --strip-components=1 -xf
- 
- # configuration settings
--config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
-+config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
- 
- CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
- 
-Index: tools/depends/target/libdvdnav/Makefile
-===================================================================
---- tools/depends/target/libdvdnav/Makefile.orig	2017-10-23 07:55:21.000000000 +0200
-+++ tools/depends/target/libdvdnav/Makefile	2017-11-22 14:01:49.397317647 +0200
-@@ -3,7 +3,7 @@ include DVDNAV-VERSION
- DEPS = DVDNAV-VERSION Makefile
- 
- # configuration settings
--config = --prefix=$(PREFIX) --disable-shared --enable-static --with-pic
-+config = --prefix=$(PREFIX) --libdir=$(PREFIX)/$(DVD_LIB) --disable-shared --enable-static --with-pic
- EXTRA_CFLAGS = -D_XBMC -DHAVE_DVDCSS_DVDCSS_H
- 
- ifeq ($(CROSS_COMPILING), yes)
-@@ -16,7 +16,7 @@ else
-   ifeq ($(PLATFORM),)
-     PLATFORM = native
-     TARBALLS_LOCATION = $(ROOT_DIR)
--    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdread/dvdread-install/lib/pkgconfig:$(ROOT_DIR)/../libdvdcss/dvdcss-install/lib/pkgconfig"
-+    PKGCONFIGPATH = PKG_CONFIG_PATH="$(ROOT_DIR)/../libdvdread/dvdread-install/$(DVD_LIB)/pkgconfig:$(ROOT_DIR)/../libdvdcss/dvdcss-install/$(DVD_LIB)/pkgconfig"
-     EXTRA_CFLAGS += -I$(ROOT_DIR)/../libdvdread/dvdread-install/include -I$(ROOT_DIR)/../libdvdcss/dvdcss-install/include
-   endif
- endif

kodi.aarch64.patch Deleted

@@ -1,40 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -624,13 +624,6 @@ case $host in
-      ARCH="aarch64"
-      use_arch="aarch64"
-      use_neon=yes
--     # Check whether --enable-gl was given.
--     if test "${enable_gl+set}" = set; then :
--       enableval=$enable_gl; use_gl=$enableval
--     else
--       use_gl=no
--       use_gles=yes
--     fi
-      USE_STATIC_FFMPEG=1
-      ;;
-   arm*-*linux-android*)
---- m4/xbmc_arch.m4.orig
-+++ m4/xbmc_arch.m4
-@@ -23,6 +23,9 @@ case $build in
-   powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*)
-      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_POWERPC64")
-      ;;
-+  aarch64-*-linux-gnu*|aarch64-*-linux-uclibc*)
-+     AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-+     ;;
-   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
-      AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
-      ;;
---- tools/depends/configure.ac.orig
-+++ tools/depends/configure.ac
-@@ -120,6 +120,9 @@ platform_cc=gcc
- platform_cxx=g++
- 
- case $build in
-+  aarch64*-*-linux-gnu*|aarch*-*-linux-be*)
-+    build_os="linux"
-+  ;;
-   arm*-*-linux-gnu*|arm*-*-linux-uclibc*)
-     build_os="linux"
-   ;;

kodi.arm.patch Deleted

kodi.cximage.gcc6.patch Deleted

@@ -1,1391 +0,0 @@
-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 Deleted

@@ -1,40 +0,0 @@
---- 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 Deleted

@@ -1,33 +0,0 @@
---- 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@..."

kodi.VERSION Changed

libdvdcss-1.4.3-Next-Nexus-Alpha2-2.tar.gz Deleted

libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz Deleted

libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz Deleted

Overview

Request 6039 (accepted)

Request History