Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
Date: Tue, 29 Aug 2017 14:42:54
Message-Id: 1504017412.700b83cd97246d4efdd905845d0a579bc4609031.candrews@gentoo
1 commit: 700b83cd97246d4efdd905845d0a579bc4609031
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 29 14:34:28 2017 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 29 14:36:52 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700b83cd
7
8 media-tv/kodi: 17.4-r1 compatibility with MariaDB
9
10 Gentoo-bug: 629084
11 Package-Manager: Portage-2.3.8, Repoman-2.3.3
12
13 media-tv/kodi/files/kodi-17.4-mariadb.patch | 23 +++++++++++++++++++++++
14 media-tv/kodi/kodi-17.4-r1.ebuild | 3 +++
15 2 files changed, 26 insertions(+)
16
17 diff --git a/media-tv/kodi/files/kodi-17.4-mariadb.patch b/media-tv/kodi/files/kodi-17.4-mariadb.patch
18 new file mode 100644
19 index 00000000000..6def8f8a304
20 --- /dev/null
21 +++ b/media-tv/kodi/files/kodi-17.4-mariadb.patch
22 @@ -0,0 +1,23 @@
23 +From ff848b104182467e5048351fdf27a07dd55a34a6 Mon Sep 17 00:00:00 2001
24 +From: Wolfgang Schupp <w.schupp@××.net>
25 +Date: Tue, 29 Aug 2017 09:08:05 +0200
26 +Subject: [PATCH] Merge pull request #12727 from candrews/patch-6
27 +
28 +[cmake] FindMySqlClient: Compatibility with MariaDB
29 +---
30 + project/cmake/modules/FindMySqlClient.cmake | 2 +-
31 + 1 file changed, 1 insertion(+), 1 deletion(-)
32 +
33 +diff --git a/project/cmake/modules/FindMySqlClient.cmake b/project/cmake/modules/FindMySqlClient.cmake
34 +index ceccea39b1e3..7b485778e4fc 100644
35 +--- a/project/cmake/modules/FindMySqlClient.cmake
36 ++++ b/project/cmake/modules/FindMySqlClient.cmake
37 +@@ -21,7 +21,7 @@ else()
38 + set(EXTRA_FIND_ARGS)
39 + endif()
40 +
41 +-find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql_time.h)
42 ++find_path(MYSQLCLIENT_INCLUDE_DIR NAMES mysql/mysql.h mysql/server/mysql.h)
43 + find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient libmysql
44 + PATH_SUFFIXES mysql
45 + ${EXTRA_FIND_ARGS})
46
47 diff --git a/media-tv/kodi/kodi-17.4-r1.ebuild b/media-tv/kodi/kodi-17.4-r1.ebuild
48 index e4099e51e0e..de54ded326d 100644
49 --- a/media-tv/kodi/kodi-17.4-r1.ebuild
50 +++ b/media-tv/kodi/kodi-17.4-r1.ebuild
51 @@ -15,6 +15,9 @@ LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
52 FFMPEG_VERSION="3.1.9"
53 FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
54 CODENAME="Krypton"
55 +PATCHES=(
56 + "${FILESDIR}/${P}-mariadb.patch"
57 +)
58 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
59 https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
60 https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz