media-tv/kodi: 17.4-r1 compatibility with MariaDB

Gentoo-bug: 629084
Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/media-tv/kodi/files/kodi-17.4-mariadb.patch b/media-tv/kodi/files/kodi-17.4-mariadb.patch
new file mode 100644 (file)
index 0000000..6def8f8
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.4-mariadb.patch
@@ -0,0 +1,23 @@
+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/kodi-17.4-r1.ebuild b/media-tv/kodi/kodi-17.4-r1.ebuild
index e4099e51e0eaa47e32621f2c095c170f88cd224a..de54ded326de3c76d2bc7c6258aceaf3d0698d0e 100644 (file)
--- a/media-tv/kodi/kodi-17.4-r1.ebuild
+++ b/media-tv/kodi/kodi-17.4-r1.ebuild
@@ -15,6 +15,9 @@ LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
 FFMPEG_VERSION="3.1.9"
 FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
 CODENAME="Krypton"
+PATCHES=(
+       "${FILESDIR}/${P}-mariadb.patch"
+)
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
        https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
        https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz