gentoo auto-resync : 28:01:2024 - 18:57:25

5 files changed, 97 insertions, 4 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index c76215c19004..e8a92bc0e0b0 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index f93c015f1533..2d19e6f449e6 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -4,9 +4,11 @@ AUX kodi-19.4-fix-mesa-22.3.0-build.patch 301 BLAKE2B 7a351aa891015524f8377763dd
 AUX kodi-19.5-flatbuffers.patch 1172 BLAKE2B 35434d6d71296bc4377ccb762d1dc1d73d100f446bf8b1f5ea96c2b5a80240a63f3f75c3bcb79bcfec038cba611e0c223769b518ba5f537f38770497dd7a461d SHA512 3687a77a35e8588873d1291ad2b9cfc7ff659fcf88ffad389e2016659800ad96ab645bd6843ee46f83856eddccc3f4e6965ba62c4aec18c4a1d6ff438a4cc812
 AUX kodi-19.5-gcc-13.patch 1849 BLAKE2B 1d3183305557b260bad52dbe0bb5828118013c08274861b902c6fa23e86422cc2d49936f125a00d57c29ba0ec7a9001cac53ac499e2ef4345d3a81f143d48c80 SHA512 e2f66f6a0ff4fa1a49a15a185cfbc9a76af8ff4630241a8c01e3de4d1e09f12d2724dc1fa7bb71c1c15e563810babcbb4217635a4e5460b33bbb0a4f81f2e5db
 AUX kodi-20.2-binutils-2.41.patch 3399 BLAKE2B 5608adfb32777371a71091de237e6173c72c272a5911e999c3e4bde6f0c0f788db644ccf1098ddabbbba7e6d2a0d65fbfa7570f6acf83cd351a6e779dd8b7f5f SHA512 aec2995737c78cf4ae3e9a4e9212f0481664fd91eb83e07d0bd354cede014015929628833e8b5a87fb19dda20d30abc5585d676a69bff3ee0111fb1f21bb87e7
+AUX kodi-20.3-gcc-14.patch 2048 BLAKE2B 8b34f1717c8c79c37ec6ccd51fbdbdc3495bb50166a22e1f3494a2d97c104055b187fe1fd84a4d35c125ba3975f4537372deae09666135117419ff02b10f0d42 SHA512 cd9210a573fe59cd822fb564c0aa32e6b3faad87bc79c02ae53740dba87e85f1a2a6429032f3393006e16ac6fb7a81ae18155c87ddd62bdd54680e09a90fa322
 DIST apache-groovy-binary-4.0.16.zip 29793704 BLAKE2B 30f77c6400c85821cf78f6ba1070da1e68644531f85f71cf7695443b13b81393cc89d4103eb869d1523f0a22a6e1c3428dcabf4f79c8a2c6eb2a6dea74e84e8f SHA512 743698979c801f3cfb36545888b5303e1e25dae5692bb45cab7ebbe102a6eda31f09abc6978349ad90ecaf630416fc87eacba7781244855e7e771a3c44041fa0
 DIST commons-lang3-3.14.0-bin.tar.gz 9442785 BLAKE2B 2ecdd06f97ac2688220055a08f67da9b859bed3ab00ff41800d5d9a1cebda599db2e816425c10c265dd6827a0ef79fc3dd094a8b3c9b9ae4ceae8f5750a59cf2 SHA512 8e7e62418a49ba810512c13a640a8bf35f878fcd54af32fdaab1111e37817f58b21b475980ba663fba4887e45ef8d88af8ff17796f20d202e929e8e2574546dc
 DIST commons-text-1.11.0-bin.tar.gz 3018564 BLAKE2B c32e41c6b8c90dea876caf4c2cedc9358d5e49506bfee7aee42ac6b92dbe8505d5e5d81c860a739bb06214b832cc29e91ddb95f3cfc24515c970302a519a5e43 SHA512 2e94877000dd270b69e2e8cbf49f258a90b4c628b6b6b0814e300a2f0e9c391f0816dceb0707e596ae3b7c9532f93e7a4917df47c77f44b3a810e14042ce5f3f
+DIST ffmpeg-6.0.1.tar.gz 15437409 BLAKE2B 6424e30c6d354abbbea8a807822ae61589413189e9c4ba7aa51c307179287506b9072626e9745861fe83753c0015b50d179f9b4f298fe9abf74bee13936639af SHA512 945e34840092dc0fd3824eb1af2be79868af2afb4fe13159b19a9bcfc464cc4d53243c13ff065199290e9393ddbf4b1c5c8abccf83a31a31d6c7490e499fd1fc
 DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz 13725564 BLAKE2B 51d310e7000aeba657d55341c5fdb540474e197b85062228ab4b314c8309ec11985aa7f105193333fc6106529e8e58c86eafe268190894be8532d0e0b9065fa6 SHA512 8beb04d577b5251e74b0d52f4d130997a8ba94bbd488c7c8309e6b45095c27807e150212888ce3a384b23dff52f8df1a7bde5407bae924ddc363f8125c0616c5
 DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
@@ -18,7 +20,7 @@ DIST libdvdnav-6.1.1-Next-Nexus-Alpha2-2.tar.gz 128547 BLAKE2B db4d05836d8fbb363
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 DIST libdvdread-6.1.3-Next-Nexus-Alpha2-2.tar.gz 110513 BLAKE2B c94feb5a03a12efa5b7767965118d2500a088299ea36f3b82e46d157e45893e6b04503cb50f179ca681bac914457607fab26acfa6e304752b355c407578572d1 SHA512 629a41157d07b8ec0ea1fe89ae5ec48f63047472a862782b805c531ae31a0376fc4dc15175f8280c3ef91d7fa977bacebb1b51232640034a34bab2293210fc5e
 EBUILD kodi-19.5-r1.ebuild 11268 BLAKE2B 7ba7c022083d91fb3cb891e27b4bb47e634d4b01fac8f58585d57ce00c94de490f5553d4809603fdf18dd58e34f72e5d378d328eab0ecf144025745562db3697 SHA512 267b921609c7be0c7567ba8fd989a4e6cc8dcd5a86e422653b253b2c8ecbe950d85daaad079743caa78521f3233075d7ad878db3e76bb4e80814ca15f6f922c5
-EBUILD kodi-20.3.ebuild 12247 BLAKE2B 89c8f922a8dee692d47be79aa1c90bb527efa48367f819212ae3fce85bdf83f58b7e6b33e8fa79cbaa67fd955313020b49aeec5ac3e098ac1d9532dafa2601fd SHA512 5f2d806c46ab24014081fa5f6dbad63f7d1a77f71ea70ce2e4cd06f2eb04dff19fdba059f891ec8e8b94433ba53aa258fc368e9ed8a97511b1b54dc98b73905d
+EBUILD kodi-20.3.ebuild 12285 BLAKE2B bef3a15ba208714f1ac5f4d1e6d202f4a09fb587ac064bfda13064c7227a22815d35c1e259720ef1360ae787319562d650688e131a63a55abf3e7b4f9ba3e61c SHA512 762c763e93e91875ce81556a1014dbb2d1b3644149956aca94655ea3663a467048dfab17b514587ce690c5fea77f83f8f49a6e94d76d815e695da0efe5c085c9
 EBUILD kodi-20.9999.ebuild 12240 BLAKE2B 9f297580d6c176176747a80511bd45a476e453536407257016da7d9c14b604e896d628db11bc2af1844cafd81ab3220d62f385561886dd6e0a57023d8872b571 SHA512 8bd67df08fb1d57f6d10e274670b1e8794c8966b6c7c9daf796de8e6be072b2d1bb37222d5f4563ce35dc2581a1deaa375356dae044ef623d638b50899c9b19e
-EBUILD kodi-9999.ebuild 12927 BLAKE2B d5c872ea69d37f688512a94bc2ae639f93dc2ad6361a819af3ce1df5d9b429e04fb64fbc10768595171e247b9eacf663cfadb482a63c09359cda1d9dcae3e05e SHA512 78aa47d691e7e144adcac4412d3a32db27ad6738d68b8c7d1341ed50fe9cb615176fb8266a56508985f0a32493b086fa95c445c44ae7163602c83887b4e51ea5
+EBUILD kodi-9999.ebuild 13709 BLAKE2B 57ba639a78ab8e5f81b11bce50017a007a5b7113a6aabe3a839a81d3eaa6abf727e08d4311e737673e51e244ed2c302e692e6f8e7b0303d3d02a91f2b135ebd1 SHA512 402f4a7ebff2b92de2f1b8a961248c148a2dca5d206bc5c0e3a557ab56745202f8b0b003d5158c957766c86a28248ddd93ab82cd25272ad230e78916ba8459e2
 MISC metadata.xml 2759 BLAKE2B 295c261dd609d1e51cc67b10db8562321bd14a9bfe624723fd9549075124869f4f8427d686c86426b1d3fe18b606a41ef7381e126e434ffb8f2f20bd0467c44f SHA512 f26bcb2eb6a644fca8a7f7ad4bbc92c5d9f56b136174bb8b73401b0826cc1897571134f428e21686543a7e5b1e277823bbd29da3f3711184f8e4f248c5a1d16b
diff --git a/media-tv/kodi/files/kodi-20.3-gcc-14.patch b/media-tv/kodi/files/kodi-20.3-gcc-14.patch
new file mode 100644
index 000000000000..b4c5ee94eb80
--- /dev/null
+++ b/media-tv/kodi/files/kodi-20.3-gcc-14.patch
@@ -0,0 +1,72 @@
+https://github.com/xbmc/xbmc/commit/3dcea03c915f2062d4f8740d66abdf033fba9d6c
+https://bugs.gentoo.org/923041
+
+From 3dcea03c915f2062d4f8740d66abdf033fba9d6c Mon Sep 17 00:00:00 2001
+From: Manuel Lauss <manuel.lauss@gmail.com>
+Date: Fri, 13 Oct 2023 12:27:15 +0200
+Subject: [PATCH] add missing c++ headers
+
+Add a few missing headers which are no longer indirectly included by
+other headers, fixes build with gcc-14
+--- a/xbmc/addons/AddonUpdateRules.cpp
++++ b/xbmc/addons/AddonUpdateRules.cpp
+@@ -12,6 +12,7 @@
+ #include "addons/addoninfo/AddonInfo.h"
+ #include "utils/log.h"
+ 
++#include <algorithm>
+ #include <mutex>
+ 
+ using namespace ADDON;
+--- a/xbmc/addons/binary-addons/AddonDll.cpp
++++ b/xbmc/addons/binary-addons/AddonDll.cpp
+@@ -27,6 +27,7 @@
+ #include "utils/Variant.h"
+ #include "utils/log.h"
+ 
++#include <algorithm>
+ #include <utility>
+ 
+ using namespace KODI::MESSAGING;
+--- a/xbmc/interfaces/json-rpc/TextureOperations.cpp
++++ b/xbmc/interfaces/json-rpc/TextureOperations.cpp
+@@ -14,6 +14,8 @@
+ #include "TextureDatabase.h"
+ #include "utils/Variant.h"
+ 
++#include <algorithm>
++
+ using namespace JSONRPC;
+ 
+ JSONRPC_STATUS CTextureOperations::GetTextures(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant &parameterObject, CVariant &result)
+--- a/xbmc/utils/EGLImage.cpp
++++ b/xbmc/utils/EGLImage.cpp
+@@ -14,6 +14,7 @@
+ #include "utils/StringUtils.h"
+ #include "utils/log.h"
+ 
++#include <algorithm>
+ #include <map>
+ 
+ namespace
+--- a/xbmc/windowing/gbm/drm/DRMConnector.cpp
++++ b/xbmc/windowing/gbm/drm/DRMConnector.cpp
+@@ -11,6 +11,7 @@
+ #include "utils/XTimeUtils.h"
+ #include "utils/log.h"
+ 
++#include <algorithm>
+ #include <map>
+ 
+ using namespace KODI::WINDOWING::GBM;
+--- a/xbmc/windowing/gbm/drm/DRMPlane.cpp
++++ b/xbmc/windowing/gbm/drm/DRMPlane.cpp
+@@ -13,6 +13,8 @@
+ #include "utils/StringUtils.h"
+ #include "utils/log.h"
+ 
++#include <algorithm>
++
+ using namespace KODI::WINDOWING::GBM;
+ 
+ CDRMPlane::CDRMPlane(int fd, uint32_t plane) : CDRMObject(fd), m_plane(drmModeGetPlane(m_fd, plane))
diff --git a/media-tv/kodi/kodi-20.3.ebuild b/media-tv/kodi/kodi-20.3.ebuild
index 887e7a594f77..f8421e429d8d 100644
--- a/media-tv/kodi/kodi-20.3.ebuild
+++ b/media-tv/kodi/kodi-20.3.ebuild
@@ -271,6 +271,7 @@ Please consider enabling IP_MULTICAST under Networking options.
 
 PATCHES=(
 	"${FILESDIR}"/kodi-20.2-binutils-2.41.patch
+	"${FILESDIR}"/kodi-20.3-gcc-14.patch
 )
 
 pkg_setup() {
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 503c3d27ca41..45afbd631bb4 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -12,6 +12,7 @@ CODENAME="Omega"
 LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2"
 LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2"
 LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2-2"
+FFMPEG_VERSION="6.0.1"
 
 # Java bundles from xbmc/interfaces/swig/CMakeLists.txt
 GROOVY_VERSION="4.0.16"
@@ -48,6 +49,9 @@ SRC_URI="
 		https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz
 			-> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	)
+	!system-ffmpeg? (
+		https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz
+	)
 "
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
@@ -72,7 +76,7 @@ SLOT="0"
 # use flag is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
 # that's going to be worse.
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus doc eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire pulseaudio raspberry-pi samba +system-ffmpeg test udf udev upnp vaapi vdpau wayland webserver X +xslt zeroconf ${CPU_FLAGS}"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	^^ ( gbm wayland X )
@@ -279,6 +283,10 @@ src_unpack() {
 	else
 		unpack ${MY_P}.tar.gz
 	fi
+
+	unpack apache-groovy-binary-${GROOVY_VERSION}.zip
+	unpack commons-lang3-${APACHE_COMMON_LANG_VERSION}-bin.tar.gz
+	unpack commons-text-${APACHE_COMMON_TEXT_VERSION}-bin.tar.gz
 }
 
 src_prepare() {
@@ -374,8 +382,9 @@ src_configure() {
 		-DENABLE_VDPAU=$(usex vdpau)
 		-DENABLE_XSLT=$(usex xslt)
 
+		-DWITH_FFMPEG=$(usex system-ffmpeg)
+
 		#To bundle or not
-		-DENABLE_INTERNAL_CEC=OFF
 		-DENABLE_INTERNAL_CROSSGUID=OFF
 		-DENABLE_INTERNAL_DAV1D=OFF
 		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
@@ -393,11 +402,18 @@ src_configure() {
 		-DTARBALL_DIR="${DISTDIR}"
 		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
 		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}"
+		-Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMON_LANG_VERSION}"
+		-Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMON_TEXT_VERSION}"
 	)
 
 	# Separated to avoid "Manually-specified variables were not used by the project:"
+	use cec && mycmakeargs+=( -DENABLE_INTERNAL_CEC=OFF )
 	use css && mycmakeargs+=( -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" )
 	use nfs && mycmakeargs+=( -DENABLE_INTERNAL_NFS=OFF )
+	use !system-ffmpeg && mycmakeargs+=(
+		-DFFMPEG_URL="${DISTDIR}/ffmpeg-${FFMPEG_VERSION}.tar.gz"
+	)
 	use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
 	use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
 
@@ -453,6 +469,8 @@ src_test() {
 		# bug #779184
 		# https://github.com/xbmc/xbmc/issues/18594
 		$(usev x86 TestDateTime.SetFromDBTime)
+		# Tries to ping localhost, naturally breaking network-sandbox
+		TestNetwork.PingHost
 	)
 
 	# see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213