[patch] patch for swig and groovy issues

kodi-9999-groovy_swig.patch (text/plain), 2.72 KB, created by Sirko on 2024-01-21 04:25:37 UTC

--- /usr/portage/media-tv/kodi/kodi-9999.ebuild	2024-01-15 05:11:38.000000000 +0930
+++ kodi-99999.ebuild	2024-01-21 13:47:36.866861250 +0930
@@ -1,8 +1,13 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+# https://github.com/xbmc/xbmc/issues/24385 (swig <4.2.0)
+# https://github.com/xbmc/xbmc/commit/d6bc920e056baad7782f47b86cba85d1336bb134 (groovy)
 
 EAPI=7
 
+GROOVY_VERSION="4.0.16"
+APACHE_COMMONS_LANG_VERSION="3.14.0"
+APACHE_COMMONS_TEXT_VERSION="1.11.0"
 PYTHON_REQ_USE="sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.3-Next-Nexus-Alpha2-2"
 LIBDVDREAD_VERSION="6.1.3-Next-Nexus-Alpha2-2"
@@ -14,8 +19,11 @@
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/apache-groovy-binary-${GROOVY_VERSION}.zip
+	https://dlcdn.apache.org//commons/lang/binaries/commons-lang3-${APACHE_COMMONS_LANG_VERSION}-bin.tar.gz
+	https://dlcdn.apache.org//commons/text/binaries/commons-text-${APACHE_COMMONS_TEXT_VERSION}-bin.tar.gz
 	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-if [[ ${PV} == *9999 ]] ; then
+if [[ ${PV} == *99999 ]] ; then
 	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
 	inherit git-r3
 else
@@ -174,8 +182,9 @@
 "
 BDEPEND="${COMMON_DEPEND}
 	dev-build/cmake
-	dev-lang/swig
+	<dev-lang/swig-4.2.0
 	media-libs/giflib
+	app-arch/unzip
 	>=dev-libs/flatbuffers-1.11.0
 	>=media-libs/libjpeg-turbo-2.0.4:=
 	>=media-libs/libpng-1.6.26:0=
@@ -200,6 +209,9 @@
 	else
 		default
 	fi
+	unpack apache-groovy-binary-${GROOVY_VERSION}.zip
+	unpack commons-lang3-${APACHE_COMMONS_LANG_VERSION}-bin.tar.gz
+	unpack commons-text-${APACHE_COMMONS_TEXT_VERSION}-bin.tar.gz
 }
 
 src_prepare() {
@@ -299,6 +311,9 @@
 		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
 		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
 		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+		-Dgroovy_SOURCE_DIR="${WORKDIR}/groovy-${GROOVY_VERSION}"
+		-Dapache-commons-lang_SOURCE_DIR="${WORKDIR}/commons-lang3-${APACHE_COMMONS_LANG_VERSION}"
+		-Dapache-commons-text_SOURCE_DIR="${WORKDIR}/commons-text-${APACHE_COMMONS_TEXT_VERSION}"
 		-DPYTHON_VER="${EPYTHON#python}"
 		-DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
 		-DCORE_PLATFORM_NAME="${core_platform_name}"