diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
| commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
| tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /media-tv/kodi/files | |
| parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) | |
gentoo resync : 29.10.2017
Diffstat (limited to 'media-tv/kodi/files')
| -rw-r--r-- | media-tv/kodi/files/kodi-17.4-mariadb.patch | 23 | ||||
| -rw-r--r-- | media-tv/kodi/files/kodi-17.5-network-test-fix.patch | 46 |
2 files changed, 46 insertions, 23 deletions
diff --git a/media-tv/kodi/files/kodi-17.4-mariadb.patch b/media-tv/kodi/files/kodi-17.4-mariadb.patch deleted file mode 100644 index 6def8f8a3043..000000000000 --- a/media-tv/kodi/files/kodi-17.4-mariadb.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ff848b104182467e5048351fdf27a07dd55a34a6 Mon Sep 17 00:00:00 2001 -From: Wolfgang Schupp <w.schupp@a1.net> -Date: Tue, 29 Aug 2017 09:08:05 +0200 -Subject: [PATCH] Merge pull request #12727 from candrews/patch-6 - -[cmake] FindMySqlClient: Compatibility with MariaDB ---- - project/cmake/modules/FindMySqlClient.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/project/cmake/modules/FindMySqlClient.cmake b/project/cmake/modules/FindMySqlClient.cmake -index ceccea39b1e3..7b485778e4fc 100644 ---- a/project/cmake/modules/FindMySqlClient.cmake -+++ b/project/cmake/modules/FindMySqlClient.cmake -@@ -21,7 +21,7 @@ else() - set(EXTRA_FIND_ARGS) - endif() - --find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql_time.h) -+find_path(MYSQLCLIENT_INCLUDE_DIR NAMES mysql/mysql.h mysql/server/mysql.h) - find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient libmysql - PATH_SUFFIXES mysql - ${EXTRA_FIND_ARGS}) diff --git a/media-tv/kodi/files/kodi-17.5-network-test-fix.patch b/media-tv/kodi/files/kodi-17.5-network-test-fix.patch new file mode 100644 index 000000000000..2f61cda953fe --- /dev/null +++ b/media-tv/kodi/files/kodi-17.5-network-test-fix.patch @@ -0,0 +1,46 @@ +From f585edfffa79ebbbcb0557be2e889809b76b5def Mon Sep 17 00:00:00 2001 +From: Rechi <Rechi@users.noreply.github.com> +Date: Wed, 21 Dec 2016 17:10:54 +0100 +Subject: [PATCH 1/2] [cmake] build TestWebServer only if HTTPRequestHandlers + are build + +--- + xbmc/network/test/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/xbmc/network/test/CMakeLists.txt b/xbmc/network/test/CMakeLists.txt +index 5d1dab328160..a323d1835b07 100644 +--- a/xbmc/network/test/CMakeLists.txt ++++ b/xbmc/network/test/CMakeLists.txt +@@ -1,3 +1,5 @@ +-set(SOURCES TestWebServer.cpp) ++if(MICROHTTPD_FOUND) ++ set(SOURCES TestWebServer.cpp) + +-core_add_test_library(network_test) ++ core_add_test_library(network_test) ++endif() + +From f7a514064923d0d693c122cc8fbe3b72cc205820 Mon Sep 17 00:00:00 2001 +From: Rechi <Rechi@users.noreply.github.com> +Date: Wed, 21 Dec 2016 17:10:57 +0100 +Subject: [PATCH 2/2] [win] remove HAS_WEB_SERVER & HAS_WEB_INTERFACE defines, + they are handled trough HAVE_LIBMICROHTTPD (cmake) + +--- + xbmc/system.h | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/xbmc/system.h b/xbmc/system.h +index 07dfe87e4a01..26757ca90642 100644 +--- a/xbmc/system.h ++++ b/xbmc/system.h +@@ -97,8 +97,6 @@ + #define HAS_WIN32_NETWORK + #define HAS_IRSERVERSUITE + #define HAS_AUDIO +-#define HAS_WEB_SERVER +-#define HAS_WEB_INTERFACE + #define HAS_FILESYSTEM_SMB + #define HAS_ZEROCONF + #define HAS_MDNS |