* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-9999-nomythtv.patch
@ 2012-01-24 2:45 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2012-01-24 2:45 UTC (permalink / raw
To: gentoo-commits
vapier 12/01/24 02:45:06
Added: xbmc-9999-nomythtv.patch
Log:
Make mysql support optional.
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Revision Changes Path
1.1 media-tv/xbmc/files/xbmc-9999-nomythtv.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.1&content-type=text/plain
Index: xbmc-9999-nomythtv.patch
===================================================================
http://trac.xbmc.org/attachment/ticket/11775
make mysql support optional
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,13 +127,17 @@ endif
LIB_DIRS=\
lib/cximage-6.0 \
lib/libexif \
- lib/cmyth \
lib/libhdhomerun \
lib/libid3tag \
lib/libapetag \
lib/cpluff \
lib/xbmc-dll-symbols
+ifeq (@BUILD_MYTHTV@,1)
+LIB_DIRS+=\
+ lib/cmyth
+endif
+
SS_DIRS=
ifeq (@USE_OPENGL@,1)
SS_DIRS+= xbmc/screensavers/rsxs-0.9/xbmc
@@ -418,7 +422,10 @@ imagelib: dllloader
$(MAKE) -C lib/cximage-6.0
codecs: papcodecs dvdpcodecs
-libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
+libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
+ifeq (@BUILD_MYTHTV@,1)
+libs: cmyth
+endif
externals: codecs libs visualizations screensavers
xcode_depends: \
--- a/configure.in
+++ b/configure.in
@@ -68,6 +68,8 @@ 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."
+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],
[use_ffmpeg_libvorbis=$enableval],
[use_ffmpeg_libvorbis=no])
+AC_ARG_ENABLE([mythtv],
+ [AS_HELP_STRING([--enable-mythtv],
+ [enable MythTV support (default is yes)])],
+ [use_mythtv=$enableval],
+ [use_mythtv=yes])
+
AC_ARG_ENABLE([dvdcss],
[AS_HELP_STRING([--enable-dvdcss],
[enable DVDCSS support (default is yes)])],
@@ -563,14 +571,21 @@ else
fi
# platform common libraries
-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)
+if test "$use_mythtv" = "yes"; 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)
+ fi
+ AC_CHECK_LIB([mysqlclient], [main],
+ 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
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))
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
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
final_message="$final_message\n HAL Support:\tNo"
fi
+if test "$use_mythtv" = "yes"; then
+ final_message="$final_message\n MythTV:\tYes"
+else
+ final_message="$final_message\n MythTV:\tNo"
+fi
+
# DVDCSS
if test "$use_dvdcss" = "yes"; then
AC_MSG_NOTICE($dvdcss_enabled)
@@ -1490,6 +1510,7 @@ AC_SUBST(USE_EXTERNAL_FFMPEG)
AC_SUBST(PYTHON_VERSION)
AC_SUBST(OUTPUT_FILES)
AC_SUBST(HAVE_XBMC_NONFREE)
+AC_SUBST(BUILD_MYTHTV)
AC_SUBST(USE_ASAP_CODEC)
AC_SUBST(LIBCURL_BASENAME)
AC_SUBST(LIBFLAC_BASENAME)
--- a/xbmc/dbwrappers/Database.cpp
+++ b/xbmc/dbwrappers/Database.cpp
@@ -29,7 +29,9 @@
#include "utils/AutoPtrHandle.h"
#include "utils/log.h"
#include "utils/URIUtils.h"
+#ifdef BUILD_MYTHTV
#include "mysqldataset.h"
+#endif /* BUILD_MYTHTV */
#include "sqlitedataset.h"
@@ -265,6 +267,7 @@ bool CDatabase::Open(const DatabaseSettings &settings)
m_sqlite = true;
+#ifdef BUILD_MYTHTV
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)");
}
+#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)
{
m_pDB.reset( new SqliteDatabase() ) ;
}
+#ifdef BUILD_MYTHTV
else if (dbSettings.type.Equals("mysql"))
{
m_pDB.reset( new MysqlDatabase() ) ;
}
+#endif /* BUILD_MYTHTV */
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 \
+ifeq (@BUILD_MYTHTV@,1)
+SRCS+=\
+ mysqldataset.cpp
+endif
+
LIB=dbwrappers.a
include ../../Makefile.include
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-9999-nomythtv.patch
@ 2012-01-27 22:49 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2012-01-27 22:49 UTC (permalink / raw
To: gentoo-commits
vapier 12/01/27 22:49:50
Modified: xbmc-9999-nomythtv.patch
Log:
Update patch to apply to latest git #400781 by Ben Kohler.
Revision Changes Path
1.2 media-tv/xbmc/files/xbmc-9999-nomythtv.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?r1=1.1&r2=1.2
Index: xbmc-9999-nomythtv.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xbmc-9999-nomythtv.patch 24 Jan 2012 02:45:06 -0000 1.1
+++ xbmc-9999-nomythtv.patch 27 Jan 2012 22:49:50 -0000 1.2
@@ -90,8 +90,8 @@
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))
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
- AC_CHECK_LIB([ssl], [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))
-AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
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))
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-9999-nomythtv.patch
@ 2012-02-04 19:50 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2012-02-04 19:50 UTC (permalink / raw
To: gentoo-commits
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/files/xbmc-9999-nomythtv.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?r1=1.2&r2=1.3
Index: xbmc-9999-nomythtv.patch
===================================================================
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
-make mysql support optional
+make mysql/mythtv support optional
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,29 +37,36 @@
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 @@
- 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 @@
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 @@
# 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 @@
#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 @@
qry_dat.cpp \
sqlitedataset.cpp \
-+ifeq (@BUILD_MYTHTV@,1)
++ifeq (@BUILD_MYSQL@,1)
+SRCS+=\
+ mysqldataset.cpp
+endif
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-9999-nomythtv.patch
@ 2012-02-16 4:31 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2012-02-16 4:31 UTC (permalink / raw
To: gentoo-commits
vapier 12/02/16 04:31:32
Modified: xbmc-9999-nomythtv.patch
Log:
Revise mysql patch to work #403869 by Martin Dummer.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Revision Changes Path
1.4 media-tv/xbmc/files/xbmc-9999-nomythtv.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?r1=1.3&r2=1.4
Index: xbmc-9999-nomythtv.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xbmc-9999-nomythtv.patch 4 Feb 2012 19:50:24 -0000 1.3
+++ xbmc-9999-nomythtv.patch 16 Feb 2012 04:31:32 -0000 1.4
@@ -66,7 +66,7 @@
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 @@
+ 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 @@
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 \
-
-+ifeq (@BUILD_MYSQL@,1)
-+SRCS+=\
-+ mysqldataset.cpp
-+endif
+--- a/xbmc/dbwrappers/mysqldataset.cpp
++++ b/xbmc/dbwrappers/mysqldataset.cpp
+@@ -23,9 +23,11 @@
+ #include <string>
+ #include <set>
+
++#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 */
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-9999-nomythtv.patch
@ 2012-08-04 16:25 Mike Frysinger (vapier)
0 siblings, 0 replies; 5+ messages in thread
From: Mike Frysinger (vapier) @ 2012-08-04 16:25 UTC (permalink / raw
To: gentoo-commits
vapier 12/08/04 16:25:42
Modified: xbmc-9999-nomythtv.patch
Log:
Update mythtv patch to latest git #429588 by BT.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Revision Changes Path
1.6 media-tv/xbmc/files/xbmc-9999-nomythtv.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch?r1=1.5&r2=1.6
Index: xbmc-9999-nomythtv.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-tv/xbmc/files/xbmc-9999-nomythtv.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xbmc-9999-nomythtv.patch 15 Jul 2012 23:10:05 -0000 1.5
+++ xbmc-9999-nomythtv.patch 4 Aug 2012 16:25:42 -0000 1.6
@@ -13,17 +13,8 @@
-ifeq (@USE_MYSQL@,1)
+ifeq (@USE_MYTHTV@,1)
LIB_DIRS += lib/cmyth
+ CMYTH=cmyth
endif
-
-@@ -322,7 +322,7 @@ imagelib: dllloader
- codecs: papcodecs dvdpcodecs
-
- libs: libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
--ifeq (@USE_MYSQL@,1)
-+ifeq (@USE_MYTHTV@,1)
- libs += cmyth
- endif
-
diff --git a/configure.in b/configure.in
index d44825f..629d7b4 100755
--- a/configure.in
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-08-04 16:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-16 4:31 [gentoo-commits] gentoo-x86 commit in media-tv/xbmc/files: xbmc-9999-nomythtv.patch Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2012-08-04 16:25 Mike Frysinger (vapier)
2012-02-04 19:50 Mike Frysinger (vapier)
2012-01-27 22:49 Mike Frysinger (vapier)
2012-01-24 2:45 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox