From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E41551396D0 for ; Tue, 29 Aug 2017 14:42:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58D8CE0E45; Tue, 29 Aug 2017 14:42:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 383E0E0E45 for ; Tue, 29 Aug 2017 14:42:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47D2A33BE4E for ; Tue, 29 Aug 2017 14:42:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDF6A86CA for ; Tue, 29 Aug 2017 14:42:51 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1504017412.700b83cd97246d4efdd905845d0a579bc4609031.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/kodi/files/kodi-17.4-mariadb.patch media-tv/kodi/kodi-17.4-r1.ebuild X-VCS-Directories: media-tv/kodi/files/ media-tv/kodi/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: 700b83cd97246d4efdd905845d0a579bc4609031 X-VCS-Branch: master Date: Tue, 29 Aug 2017 14:42:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 22a8ef96-6e37-4923-9419-5fc3cc5898cb X-Archives-Hash: eb56e9c8b011df7dff25811d20903ecd commit: 700b83cd97246d4efdd905845d0a579bc4609031 Author: Craig Andrews gentoo org> AuthorDate: Tue Aug 29 14:34:28 2017 +0000 Commit: Craig Andrews gentoo org> CommitDate: Tue Aug 29 14:36:52 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700b83cd media-tv/kodi: 17.4-r1 compatibility with MariaDB Gentoo-bug: 629084 Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-tv/kodi/files/kodi-17.4-mariadb.patch | 23 +++++++++++++++++++++++ media-tv/kodi/kodi-17.4-r1.ebuild | 3 +++ 2 files changed, 26 insertions(+) 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 index 00000000000..6def8f8a304 --- /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 +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 e4099e51e0e..de54ded326d 100644 --- 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