From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Rtld4-0007HD-Hx for garchives@archives.gentoo.org; Sat, 04 Feb 2012 19:50:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17A2CE0630; Sat, 4 Feb 2012 19:50:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C8F67E0630 for ; Sat, 4 Feb 2012 19:50:26 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1142F1B400E for ; Sat, 4 Feb 2012 19:50:26 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id D5B832004C; Sat, 4 Feb 2012 19:50:24 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-9999-nomythtv.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: xbmc-9999-nomythtv.patch X-VCS-Directories: media-tv/xbmc/files X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120204195024.D5B832004C@flycatcher.gentoo.org> Date: Sat, 4 Feb 2012 19:50:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 06ca729f-6040-4977-8ad1-f0068f4ab925 X-Archives-Hash: f63afd7db5e867f74fb1bec61160a043 vapier 12/02/04 19:50:24 Modified: xbmc-9999-nomythtv.patch Log: Split mysql/mythtv support #401653. Revision Changes Path 1.3 media-tv/xbmc/files/xbmc-9999-nomythtv.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/file= s/xbmc-9999-nomythtv.patch?rev=3D1.3&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/file= s/xbmc-9999-nomythtv.patch?rev=3D1.3&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/file= s/xbmc-9999-nomythtv.patch?r1=3D1.2&r2=3D1.3 Index: xbmc-9999-nomythtv.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.= patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbmc-9999-nomythtv.patch 27 Jan 2012 22:49:50 -0000 1.2 +++ xbmc-9999-nomythtv.patch 4 Feb 2012 19:50:24 -0000 1.3 @@ -1,6 +1,6 @@ -http://trac.xbmc.org/attachment/ticket/11775 +http://trac.xbmc.org/ticket/11775 =20 -make mysql support optional +make mysql/mythtv support optional =20 --- a/Makefile.in +++ b/Makefile.in @@ -37,29 +37,36 @@ xcode_depends: \ --- a/configure.in +++ b/configure.in -@@ -68,6 +68,8 @@ goom_enabled=3D"=3D=3D GOOM enabled. =3D=3D" +@@ -68,6 +68,9 @@ goom_enabled=3D"=3D=3D GOOM enabled. =3D=3D" goom_disabled=3D"=3D=3D GOOM disabled. =3D=3D" pulse_not_found=3D"=3D=3D Could not find libpulse. PulseAudio support d= isabled. =3D=3D" pulse_disabled=3D"=3D=3D PulseAudio support manually disabled. =3D=3D" -+mysql_not_found=3D"Could not find required library libmysqlclient for M= ythTV." ++mysql_not_found=3D"Could not find libmysqlclient. MySQL (and MythTV) su= pport disabled. =3D=3D" ++mysql_disabled=3D"=3D=3D MySQL support disabled. =3D=3D" +mythtv_disabled=3D"=3D=3D MythTV support disabled. =3D=3D" dvdcss_enabled=3D"=3D=3D DVDCSS support enabled. =3D=3D" dvdcss_disabled=3D"=3D=3D DVDCSS support disabled. =3D=3D" hal_not_found=3D"=3D=3D Could not find hal. HAL support disabled. =3D=3D= " -@@ -238,6 +240,12 @@ AC_ARG_ENABLE([ffmpeg_libvorbis], +@@ -238,6 +241,18 @@ AC_ARG_ENABLE([ffmpeg_libvorbis], [use_ffmpeg_libvorbis=3D$enableval], [use_ffmpeg_libvorbis=3Dno]) =20 ++AC_ARG_ENABLE([mysql], ++ [AS_HELP_STRING([--enable-mysql], ++ [enable MySQL support (default is auto)])], ++ [use_mysql=3D$enableval], ++ [use_mysql=3Dauto]) ++ +AC_ARG_ENABLE([mythtv], + [AS_HELP_STRING([--enable-mythtv], -+ [enable MythTV support (default is yes)])], ++ [enable MythTV support (default is auto)])], + [use_mythtv=3D$enableval], -+ [use_mythtv=3Dyes]) ++ [use_mythtv=3Dauto]) + 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 =20 # platform common libraries @@ -69,26 +76,36 @@ - MYSQL_LIBS=3D`mysql_config --libs` - LIBS=3D"$LIBS $MYSQL_LIBS" - AC_SUBST(MYSQL_LIBS) -+if test "$use_mythtv" =3D "yes"; then +-else +- AC_MSG_ERROR($missing_program) ++have_mysql=3Dno ++if test "$use_mysql" !=3D "no"; then + AC_CHECK_PROG(MYSQL_CONFIG, mysql_config, "yes", "no") + if test $MYSQL_CONFIG =3D "yes"; then + INCLUDES=3D"$INCLUDES `mysql_config --include`" + MYSQL_LIBS=3D`mysql_config --libs` + LIBS=3D"$LIBS $MYSQL_LIBS" + AC_SUBST(MYSQL_LIBS) -+ else -+ AC_MSG_ERROR($missing_program) ++ AC_CHECK_LIB([mysqlclient], [main], have_mysql=3Dyes) + fi -+ AC_CHECK_LIB([mysqlclient], [main], ++fi ++if test "$have_mysql" =3D "yes"; then ++ AC_DEFINE([BUILD_MYSQL], [1], [Define to 1 to build MySQL.]) ++ AC ++ if test "$use_mysql" !=3D "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" =3D "yes" || test "$use_mythtv" =3D "yes"; then ++ AC_MSG_ERROR([$mysql_not_found]) ++else ++ use_mysql=3Dno ++ AC_MSG_NOTICE($mysql_disabled) ++ use_mythtv=3Dno ++ 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($m= issing_library)) +@@ -594,7 +625,6 @@ AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($m= issing_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 @@ AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not fi= nd 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=3D"$final_message\n HAL Support:\tNo" fi =20 ++if test "$use_mysql" =3D "yes"; then ++ final_message=3D"$final_message\n MySQL:\tYes" ++else ++ final_message=3D"$final_message\n MySQL:\tNo" ++fi ++ +if test "$use_mythtv" =3D "yes"; then + final_message=3D"$final_message\n MythTV:\tYes" +else @@ -109,10 +132,11 @@ # DVDCSS if test "$use_dvdcss" =3D "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 @@ #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" =20 =20 -@@ -265,6 +267,7 @@ bool CDatabase::Open(const DatabaseSettings &setting= s) +@@ -266,6 +268,7 @@ =20 m_sqlite =3D true; =20 -+#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 &setting= s) - else - CLog::Log(LOGINFO, "essential mysql database information is missi= ng (eg. host, name, user, pass)"); +@@ -276,7 +279,8 @@ + CLog::Log(LOGINFO, "Essential mysql database information is missi= ng. Require at least host, user and pass defined."); } -+#endif /* BUILD_MYTHTV */ -=20 - // always safely fallback to sqlite3, and use separate, versioned dat= abase - if (m_sqlite) -@@ -339,10 +343,12 @@ bool CDatabase::Connect(const DatabaseSettings &db= Settings, bool create) + else ++#endif /* BUILD_MYSQL */ + { + dbSettings.type =3D "sqlite3"; + dbSettings.host =3D _P(g_settings.GetDatabaseFolder()); + dbSettings.name =3D 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", dbSett= ings.type.c_str()); @@ -167,7 +192,7 @@ qry_dat.cpp \ sqlitedataset.cpp \ =20 -+ifeq (@BUILD_MYTHTV@,1) ++ifeq (@BUILD_MYSQL@,1) +SRCS+=3D\ + mysqldataset.cpp +endif