diff options
Diffstat (limited to 'media-tv/xbmc/files')
| -rw-r--r-- | media-tv/xbmc/files/xbmc-9999-nomythtv.patch | 93 |
1 files changed, 59 insertions, 34 deletions
diff --git a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch index db8925549ed7..298a579d7a5e 100644 --- a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch +++ b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch @@ -1,6 +1,6 @@ -http://trac.xbmc.org/attachment/ticket/11775 +http://trac.xbmc.org/ticket/11775 -make mysql support optional +make mysql/mythtv support optional --- a/Makefile.in +++ b/Makefile.in @@ -37,29 +37,36 @@ make mysql support optional xcode_depends: \ --- a/configure.in +++ b/configure.in -@@ -68,6 +68,8 @@ goom_enabled="== GOOM enabled. ==" +@@ -68,6 +68,9 @@ goom_enabled="== GOOM enabled. ==" goom_disabled="== GOOM disabled. ==" pulse_not_found="== Could not find libpulse. PulseAudio support disabled. ==" pulse_disabled="== PulseAudio support manually disabled. ==" -+mysql_not_found="Could not find required library libmysqlclient for MythTV." ++mysql_not_found="Could not find libmysqlclient. MySQL (and MythTV) support disabled. ==" ++mysql_disabled="== MySQL support disabled. ==" +mythtv_disabled="== MythTV support disabled. ==" dvdcss_enabled="== DVDCSS support enabled. ==" dvdcss_disabled="== DVDCSS support disabled. ==" hal_not_found="== Could not find hal. HAL support disabled. ==" -@@ -238,6 +240,12 @@ AC_ARG_ENABLE([ffmpeg_libvorbis], +@@ -238,6 +241,18 @@ AC_ARG_ENABLE([ffmpeg_libvorbis], [use_ffmpeg_libvorbis=$enableval], [use_ffmpeg_libvorbis=no]) ++AC_ARG_ENABLE([mysql], ++ [AS_HELP_STRING([--enable-mysql], ++ [enable MySQL support (default is auto)])], ++ [use_mysql=$enableval], ++ [use_mysql=auto]) ++ +AC_ARG_ENABLE([mythtv], + [AS_HELP_STRING([--enable-mythtv], -+ [enable MythTV support (default is yes)])], ++ [enable MythTV support (default is auto)])], + [use_mythtv=$enableval], -+ [use_mythtv=yes]) ++ [use_mythtv=auto]) + AC_ARG_ENABLE([dvdcss], [AS_HELP_STRING([--enable-dvdcss], [enable DVDCSS support (default is yes)])], -@@ -563,14 +571,21 @@ else +@@ -563,14 +578,30 @@ else fi # platform common libraries @@ -69,26 +76,36 @@ make mysql support optional - MYSQL_LIBS=`mysql_config --libs` - LIBS="$LIBS $MYSQL_LIBS" - AC_SUBST(MYSQL_LIBS) -+if test "$use_mythtv" = "yes"; then +-else +- AC_MSG_ERROR($missing_program) ++have_mysql=no ++if test "$use_mysql" != "no"; then + AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no") + if test $MYSQL_CONFIG = "yes"; then + INCLUDES="$INCLUDES `mysql_config --include`" + MYSQL_LIBS=`mysql_config --libs` + LIBS="$LIBS $MYSQL_LIBS" + AC_SUBST(MYSQL_LIBS) -+ else -+ AC_MSG_ERROR($missing_program) ++ AC_CHECK_LIB([mysqlclient], [main], have_mysql=yes) + fi -+ AC_CHECK_LIB([mysqlclient], [main], ++fi ++if test "$have_mysql" = "yes"; then ++ 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_MSG_ERROR($mysql_not_found)) - else -- AC_MSG_ERROR($missing_program) -+ AC_MSG_RESULT($mythtv_disabled) ++ fi ++elif test "$use_mysql" = "yes" || test "$use_mythtv" = "yes"; then ++ AC_MSG_ERROR([$mysql_not_found]) ++else ++ use_mysql=no ++ AC_MSG_NOTICE($mysql_disabled) ++ use_mythtv=no ++ AC_MSG_NOTICE($mythtv_disabled) fi AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library)) AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library)) -@@ -594,7 +609,6 @@ AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) +@@ -594,7 +625,6 @@ AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library)) @@ -96,10 +113,16 @@ make mysql support optional AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh])) AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([bluetooth], [hci_devid],, AC_MSG_RESULT([Could not find suitable version of libbluetooth])) -@@ -1319,6 +1333,12 @@ else +@@ -1319,6 +1349,18 @@ else final_message="$final_message\n HAL Support:\tNo" fi ++if test "$use_mysql" = "yes"; then ++ final_message="$final_message\n MySQL:\tYes" ++else ++ final_message="$final_message\n MySQL:\tNo" ++fi ++ +if test "$use_mythtv" = "yes"; then + final_message="$final_message\n MythTV:\tYes" +else @@ -109,10 +132,11 @@ make mysql support optional # DVDCSS if test "$use_dvdcss" = "yes"; then AC_MSG_NOTICE($dvdcss_enabled) -@@ -1490,6 +1510,7 @@ AC_SUBST(USE_EXTERNAL_FFMPEG) +@@ -1490,6 +1532,8 @@ AC_SUBST(USE_EXTERNAL_FFMPEG) AC_SUBST(PYTHON_VERSION) AC_SUBST(OUTPUT_FILES) AC_SUBST(HAVE_XBMC_NONFREE) ++AC_SUBST(BUILD_MYSQL) +AC_SUBST(BUILD_MYTHTV) AC_SUBST(USE_ASAP_CODEC) AC_SUBST(LIBCURL_BASENAME) @@ -123,38 +147,39 @@ make mysql support optional #include "utils/AutoPtrHandle.h" #include "utils/log.h" #include "utils/URIUtils.h" -+#ifdef BUILD_MYTHTV ++#ifdef BUILD_MYSQL #include "mysqldataset.h" -+#endif /* BUILD_MYTHTV */ ++#endif /* BUILD_MYSQL */ #include "sqlitedataset.h" -@@ -265,6 +267,7 @@ bool CDatabase::Open(const DatabaseSettings &settings) +@@ -266,6 +268,7 @@ m_sqlite = true; -+#ifdef BUILD_MYTHTV ++#ifdef BUILD_MYSQL if ( dbSettings.type.Equals("mysql") ) { // check we have all information before we cancel the fallback -@@ -274,6 +277,7 @@ bool CDatabase::Open(const DatabaseSettings &settings) - else - CLog::Log(LOGINFO, "essential mysql database information is missing (eg. host, name, user, pass)"); +@@ -276,7 +279,8 @@ + CLog::Log(LOGINFO, "Essential mysql database information is missing. Require at least host, user and pass defined."); } -+#endif /* BUILD_MYTHTV */ - - // always safely fallback to sqlite3, and use separate, versioned database - if (m_sqlite) -@@ -339,10 +343,12 @@ bool CDatabase::Connect(const DatabaseSettings &dbSettings, bool create) + else ++#endif /* BUILD_MYSQL */ + { + dbSettings.type = "sqlite3"; + dbSettings.host = _P(g_settings.GetDatabaseFolder()); + dbSettings.name = GetBaseDBName(); +@@ -369,10 +373,12 @@ { m_pDB.reset( new SqliteDatabase() ) ; } -+#ifdef BUILD_MYTHTV ++#ifdef BUILD_MYSQL else if (dbSettings.type.Equals("mysql")) { m_pDB.reset( new MysqlDatabase() ) ; } -+#endif /* BUILD_MYTHTV */ ++#endif /* BUILD_MYSQL */ else { CLog::Log(LOGERROR, "Unable to determine database type: %s", dbSettings.type.c_str()); @@ -167,7 +192,7 @@ make mysql support optional qry_dat.cpp \ sqlitedataset.cpp \ -+ifeq (@BUILD_MYTHTV@,1) ++ifeq (@BUILD_MYSQL@,1) +SRCS+=\ + mysqldataset.cpp +endif |