Make mysql support optional.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 209 insertions, 13 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 3352ca866c65..9e6e1f6e61f5 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xbmc
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.105 2011/12/21 03:42:04 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.106 2012/01/24 02:45:06 vapier Exp $
+
+  24 Jan 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  +files/xbmc-9999-nomythtv.patch, metadata.xml:
+  Make mysql support optional.
 
   21 Dec 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Require simplejson for the weather plugin #395365 by Pertti Kosunen.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 16b9d0910d87..df8c69c94075 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,19 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xbmc-10.0-python-2.7.patch 30308 RMD160 15f01d93b0db903eadb5deb94d5092b0a4b68de4 SHA1 4f6da8045b575a80fd7d556c5b1f2fbbe2bc2da4 SHA256 8f6b2a0a962ad250fc317542d0fa180585d3c9e630ca98f99299b6f750555085
 AUX xbmc-10.1-gcc-4.6.patch 4295 RMD160 4aee4c91f9d2f9e947d37cd39f2700fc0eaec353 SHA1 5ae755b20e06560aaf1508b80c1f7661ef36802f SHA256 cef1154bc3352b215bfece1a749d901d43ec7aa0c6d050921ae8745c553e84c9
 AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46 SHA1 2435642148ec291d10bded3036592a6104f5ff03 SHA256 8b8e86cf7edef227e8267c52d60545b753eea11261f078131ee30f9eac8bb002
 AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
+AUX xbmc-9999-nomythtv.patch 5495 RMD160 23bea58cf1ba90593c9b9991022d09686fde9e92 SHA1 b8376baddf2d2084373b6eb5a9b139780c68c615 SHA256 f20703730aeeb16b6f9ccc96d85a306045d9eef858396458ac5356cd56f95876
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 EBUILD xbmc-10.1.ebuild 5390 RMD160 ccb062b93f485e70ffba8d108aae662d10533c12 SHA1 99bcc61eed8b3086085caeaa476e1c646e24bdd1 SHA256 df2669bfd06df9b2cbdb12ba25a5ad2858827f8613f495b2267109a1158a5d35
-EBUILD xbmc-9999.ebuild 5130 RMD160 25af31616500babd937f697758bbd47ba85166cb SHA1 2bb93c8b4b159ea8ea910b04df81b7cb17eaf6f4 SHA256 cd54dc8e35df0c27e38fac97f28083ecf01d8d7138fd758dab225a7b9383dc54
-MISC ChangeLog 16667 RMD160 3b640cf19348af77f56e84b58c93ed39ee1720f2 SHA1 14f559e02386b8f2813143660a459bce3e4e7ef5 SHA256 9e508644e3a058e58f171207024340115fc8c0028a083281318df9376a9ea217
-MISC metadata.xml 885 RMD160 67687f56afd352af492d990c0d1f0b35e08c16bc SHA1 6e4782708b211b5b45d039c633e14b324f0d3805 SHA256 8a5abffe9692e42653163891290a3f48c1ae68d73597b56e3fcc8ee60ee22c2b
+EBUILD xbmc-9999.ebuild 5220 RMD160 ecbaf4c2688fde5ab34ba3eeed9b02e632d889df SHA1 61af55f72f252edefbe80ff0a2061464c49b7625 SHA256 585170dc6c182822c8f73eeea0858be8d7ac75c067db4f741da994c4c4b6bc9a
+MISC ChangeLog 16816 RMD160 f47706d3233790b49cf176ba07e9d4bab2099875 SHA1 708ba67fb27b0dce22c1768ccf0c42241367c793 SHA256 74ac5f0185262961acb5c6fc5d1e2b38c2da01cf55a10b4a191d2a0a47e5b6e1
+MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7xVZgACgkQaC/OocHi7JaSiwD/X3jC+mGiL/klPV5KClbJNp29
-eBkNlDtebyChAqiLvRIA/j3EBkPrX+ekR4wApRu0ORIl3pyaCnzzNddIFZPSi1bW
-=pdjq
+iQIcBAEBAgAGBQJPHhtZAAoJELEHsLL7fEFWAjUP/jnsUus9X9LYZ6ynJ+THsJIA
+4qvx6RhUTHnjEbwq9rEoNwu8krKmdW6hVtjQn3QwVR6jbOg9aaxHfoohM4I4F/Pm
+rGoKO1y0cn9vC3yW/CRdJaHLoKezTuXYXfBfykuiibVuS7uPWArecVOhPsMIK9yG
+w5c2AUwJV8AVvBZUE+zYNKyWh5GH5G5gjNuQ3skxOflLBdR7sKWYW/FGRBolrbOb
+pE0w857jzQ+V2Rhhw9ZVFiMoW+ca4ZADvhgUMTCtp3oO93p8ECkvNxrCvw3nld8L
+R77uMu379iFWPYJTy1E/Dv4E4o4HgIm1EncO3WeXFiviU8bnKXbH3bZd+BSC5rLO
+wkfbizDBOnF6lj9cK5VWTxIVlfvD+gdO07elxDCKtR9RJsj8jZFmKD3AuZ4OS0iC
+9qiFrFvTkTb3kCxdqI9OZjiMnEPHwvx8CReXueqePS3v83SDsUgYAcYTC9xVsAb/
+NJdEehyseyVvixleLqpyo5VGqL85fgQevZhQANbz+fSN5qOtBZOIUonbTD/GQkKs
+cVUXzwJHPXUzScbOuJvBbymb/+pcAV7GjdSaSTKKkXdU/81Cs3RfGx1281M2YatM
+Fj7HEc4g//oVo4X9or0Joq+OhgP+A4aV0iMPRkU3it7GU/sbkOgPWsvXNEGeOFHE
+aHV7/ycfnod94NYvcG9i
+=RTaX
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
new file mode 100644
index 000000000000..6cd769d154d8
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
@@ -0,0 +1,177 @@
+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
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index 035500e5d94d..313797b64da7 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -8,6 +8,7 @@
  <flag name='goom'>Enable GOOM visualization plugin</flag>
  <flag name='midi'>Support MIDI files</flag>
  <flag name='projectm'>Enable projectM visualization plugin</flag>
+ <flag name='pvr'>Enable MythTV support</flag>
  <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
  <flag name='rsxs'>Enable really slick X screensavers</flag>
  <flag name='vaapi'>Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index ee7f7819cd5b..781b2c556a65 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.94 2011/12/21 03:42:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.95 2012/01/24 02:45:07 vapier Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa altivec avahi bluray css debug goom joystick midi profile +projectm pulseaudio +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
+IUSE="airplay alsa altivec avahi bluray css debug goom joystick midi profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
 
 COMMON_DEPEND="virtual/opengl
 	app-arch/bzip2
@@ -75,7 +75,7 @@ COMMON_DEPEND="virtual/opengl
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	sys-apps/dbus
 	sys-libs/zlib
-	virtual/mysql
+	pvr? ( virtual/mysql )
 	x11-apps/xdpyinfo
 	x11-apps/mesa-progs
 	vaapi? ( x11-libs/libva )
@@ -110,6 +110,8 @@ src_unpack() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${PN}-9999-nomysql.patch
+
 	# some dirs ship generated autotools, some dont
 	local d
 	for d in \
@@ -178,6 +180,7 @@ src_configure() {
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
+		$(use_enable pvr mythtv) \
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \