[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/

["Sam James" <sam@gentoo.org>]

commit:     197b2ffa3f1e2b05d1e353c3b31c690f8a3876cf
Author:     Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Fri Feb 21 06:23:09 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 13:00:06 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197b2ffa

media-tv/kodi: update silence-libdvdread-git patch

Upstream commit: b7cbf93fb0eff07b6b968d0b5ca745871488ac64

Closes: https://bugs.gentoo.org/949828
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Thanks-To: Steffen Hau <steffen <AT> hauihau.de>
Closes: https://github.com/gentoo/gentoo/pull/40284
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/kodi-22-silence-libdvdread-git.patch     | 36 ++++++++++++++++++++++
 media-tv/kodi/kodi-9999.ebuild                     |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/media-tv/kodi/files/kodi-22-silence-libdvdread-git.patch b/media-tv/kodi/files/kodi-22-silence-libdvdread-git.patch
new file mode 100644
index 000000000000..91c1a5e9305e
--- /dev/null
+++ b/media-tv/kodi/files/kodi-22-silence-libdvdread-git.patch
@@ -0,0 +1,36 @@
+From a193fae2ace4aa9086f9b73fa7008a016c30061e Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Wed, 21 Aug 2024 13:40:02 +0300
+Subject: [PATCH] Silence git "command not found"
+
+--- a/cmake/modules/FindLibDvdRead.cmake
++++ b/cmake/modules/FindLibDvdRead.cmake
+@@ -39,6 +39,9 @@ if(NOT TARGET LibDvdRead::LibDvdRead)
+ 
+   set(LIBDVDREAD_VERSION ${${MODULE}_VER})
+ 
++  set(patches "${CORE_SOURCE_DIR}/tools/depends/target/${${CMAKE_FIND_PACKAGE_NAME}_MODULE_LC}/silence-git.patch")
++  generate_patchcommand("${patches}")
++
+   set(HOST_ARCH ${ARCH})
+   if(CORE_SYSTEM_NAME STREQUAL android)
+     if(ARCH STREQUAL arm)
+--- /dev/null
++++ b/tools/depends/target/libdvdread/silence-git.patch
+@@ -0,0 +1,13 @@
++diff --git a/Makefile.am b/Makefile.am
++index f2849b8..7cee887 100644
++--- a/Makefile.am
+++++ b/Makefile.am
++@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -Im4
++ 
++ AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src/dvdread $(CSS_CFLAGS)
++ 
++-dist_doc_DATA = AUTHORS ChangeLog COPYING NEWS README.md TODO
+++dist_doc_DATA = AUTHORS COPYING NEWS README.md TODO
++ 
++ MAINTAINERCLEANFILES = ChangeLog
++ 
+-- 
+2.46.0
+

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index c17aca09fd3c..50bc0ab27be4 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -271,7 +271,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch
-	"${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch
+	"${FILESDIR}"/kodi-22-silence-libdvdread-git.patch
 )
 
 # bug #544020