diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-02-16 04:31:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-02-16 04:31:32 +0000 |
| commit | 0f8edc877ce7ea26991b73c6a0e740ef3939ba2d (patch) | |
| tree | 4f8d185cb6cbe8805af57cdef13253eb6e5141ba /media-tv | |
| parent | whitespace (diff) | |
| download | gentoo-2-0f8edc877ce7ea26991b73c6a0e740ef3939ba2d.tar.gz gentoo-2-0f8edc877ce7ea26991b73c6a0e740ef3939ba2d.tar.bz2 gentoo-2-0f8edc877ce7ea26991b73c6a0e740ef3939ba2d.zip | |
Revise mysql patch to work #403869 by Martin Dummer.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'media-tv')
| -rw-r--r-- | media-tv/xbmc/ChangeLog | 6 | ||||
| -rw-r--r-- | media-tv/xbmc/files/xbmc-9999-nomythtv.patch | 38 |
2 files changed, 26 insertions, 18 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog index 20112687d244..82de9b390765 100644 --- a/media-tv/xbmc/ChangeLog +++ b/media-tv/xbmc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-tv/xbmc # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.113 2012/02/14 22:39:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.114 2012/02/16 04:31:32 vapier Exp $ + + 16 Feb 2012; Mike Frysinger <vapier@gentoo.org> + files/xbmc-9999-nomythtv.patch: + Revise mysql patch to work #403869 by Martin Dummer. *xbmc-11.0_beta3 (14 Feb 2012) diff --git a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch index 298a579d7a5e..09286dba0a87 100644 --- a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch +++ b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch @@ -66,7 +66,7 @@ make mysql/mythtv support optional AC_ARG_ENABLE([dvdcss], [AS_HELP_STRING([--enable-dvdcss], [enable DVDCSS support (default is yes)])], -@@ -563,14 +578,30 @@ else +@@ -563,14 +578,31 @@ else fi # platform common libraries @@ -90,14 +90,15 @@ make mysql/mythtv support optional + fi +fi +if test "$have_mysql" = "yes"; then ++ BUILD_MYTHTV=1 + AC_DEFINE([BUILD_MYSQL], [1], [Define to 1 to build MySQL.]) -+ AC + if test "$use_mysql" != "no"; then -+ AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.]), ++ AC_DEFINE([BUILD_MYTHTV], [1], [Define to 1 to build mythtv.]) + fi +elif test "$use_mysql" = "yes" || test "$use_mythtv" = "yes"; then + AC_MSG_ERROR([$mysql_not_found]) +else ++ BUILD_MYTHTV=0 + use_mysql=no + AC_MSG_NOTICE($mysql_disabled) + use_mythtv=no @@ -183,20 +184,23 @@ make mysql/mythtv support optional else { CLog::Log(LOGERROR, "Unable to determine database type: %s", dbSettings.type.c_str()); ---- a/xbmc/dbwrappers/Makefile -+++ b/xbmc/dbwrappers/Makefile -@@ -1,9 +1,13 @@ - SRCS=Database.cpp \ - dataset.cpp \ -- mysqldataset.cpp \ - qry_dat.cpp \ - sqlitedataset.cpp \ +--- a/xbmc/dbwrappers/mysqldataset.cpp ++++ b/xbmc/dbwrappers/mysqldataset.cpp +@@ -23,9 +23,11 @@ + #include <string> + #include <set> -+ifeq (@BUILD_MYSQL@,1) -+SRCS+=\ -+ mysqldataset.cpp -+endif ++#include "system.h" // for GetLastError() ++#ifdef BUILD_MYSQL + - LIB=dbwrappers.a + #include "mysqldataset.h" + #include "utils/log.h" +-#include "system.h" // for GetLastError() + #include "mysql/errmsg.h" + #ifdef _WIN32 + #pragma comment(lib, "mysqlclient.lib") +@@ -1562,3 +1564,4 @@ + + }//namespace - include ../../Makefile.include ++#endif /* BUILD_MYSQL */ |