| 1 |
commit: cc667f8994edb317eb357300f1ceb325cc4b1e9b |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 4 20:43:16 2020 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 4 20:43:48 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc667f89 |
| 7 |
|
| 8 |
media-tv/kodi: Fix test failures with USE=-webserver |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/734922 |
| 11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
...19.0_alpha1-conditional-TestHTTPDirectory.patch | 31 ++++++++++++++++++++++ |
| 15 |
media-tv/kodi/kodi-19.0_alpha1.ebuild | 4 +++ |
| 16 |
2 files changed, 35 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch b/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..096a4032628 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch |
| 23 |
@@ -0,0 +1,31 @@ |
| 24 |
+From 3be79a564343886ade7e88f447944fd4b5452959 Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Craig Andrews <candrews@××××××××××××.com> |
| 26 |
+Date: Fri, 31 Jul 2020 14:56:21 -0400 |
| 27 |
+Subject: [PATCH] [test] [webserver] Conditional TestHTTPDirectory |
| 28 |
+ |
| 29 |
+TestHTTPDirectory.cpp requires microhttpd so only include it if microhttpd is found. |
| 30 |
+ |
| 31 |
+TestHTTPDirectory.cpp includes network/WebServer.h which includes network/httprequesthandler/IHTTPRequestHandler.h which includes microhttpd.h |
| 32 |
+--- |
| 33 |
+ xbmc/filesystem/test/CMakeLists.txt | 5 ++++- |
| 34 |
+ 1 file changed, 4 insertions(+), 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/xbmc/filesystem/test/CMakeLists.txt b/xbmc/filesystem/test/CMakeLists.txt |
| 37 |
+index 235acc8549cf..9572459cf198 100644 |
| 38 |
+--- a/xbmc/filesystem/test/CMakeLists.txt |
| 39 |
++++ b/xbmc/filesystem/test/CMakeLists.txt |
| 40 |
+@@ -1,10 +1,13 @@ |
| 41 |
+ set(SOURCES TestDirectory.cpp |
| 42 |
+ TestFile.cpp |
| 43 |
+ TestFileFactory.cpp |
| 44 |
+- TestHTTPDirectory.cpp |
| 45 |
+ TestZipFile.cpp |
| 46 |
+ TestZipManager.cpp) |
| 47 |
+ |
| 48 |
++if(MICROHTTPD_FOUND) |
| 49 |
++ list(APPEND SOURCES TestHTTPDirectory.cpp) |
| 50 |
++endif() |
| 51 |
++ |
| 52 |
+ if(NFS_FOUND) |
| 53 |
+ list(APPEND SOURCES TestNfsFile.cpp) |
| 54 |
+ endif() |
| 55 |
|
| 56 |
diff --git a/media-tv/kodi/kodi-19.0_alpha1.ebuild b/media-tv/kodi/kodi-19.0_alpha1.ebuild |
| 57 |
index d253bed8325..9bf450173d8 100644 |
| 58 |
--- a/media-tv/kodi/kodi-19.0_alpha1.ebuild |
| 59 |
+++ b/media-tv/kodi/kodi-19.0_alpha1.ebuild |
| 60 |
@@ -29,6 +29,10 @@ else |
| 61 |
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 62 |
fi |
| 63 |
|
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}/${P}-conditional-TestHTTPDirectory.patch" |
| 66 |
+) |
| 67 |
+ |
| 68 |
inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg |
| 69 |
|
| 70 |
DESCRIPTION="A free and open source media-player and entertainment hub" |
Archives