Split mysql/mythtv support #401653.

4 files changed, 75 insertions, 65 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 2fd78c286adc..e102c87b1763 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.110 2012/02/04 18:28:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.111 2012/02/04 19:50:24 vapier Exp $
+
+  04 Feb 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  files/xbmc-9999-nomythtv.patch:
+  Split mysql/mythtv support #401653.
 
   04 Feb 2012; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Require ffmpeg be built with USE=encode to make things "just work" #402103 by
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index e568c361ad81..e491d23fc12c 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,31 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-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-10.1-libpng-1.5.patch 18833 RMD160 023626a75b96fbae4d662ff875f1647113d53bad SHA1 463ff9dda04707fc71db3d431eded9f396698aa9 SHA256 83b49d44b7855dcb2f7d34e2e9628f4c1f8e06ae8f9e94ac06a6036620705daa
 AUX xbmc-9999-no-arm-flags.patch 542 RMD160 108586f2956cc27cc9f3c582565bd4e2f22fede0 SHA1 e6dc2f2b63e208fccb0c1ecb50322d6a9c9fda88 SHA256 72164a8b91f3209cff06ea1a103580f827135951a7a798eefabc04ee1a6d3e84
-AUX xbmc-9999-nomythtv.patch 5495 RMD160 d2840c85e5bcfc1bf54d9bbd949110028366149f SHA1 1c4207f3350279308b9935c15f4a78a414c0f58f SHA256 22a82d117a06fc5081752e90739b369323c9b051554bf42baa523a192f507f88
+AUX xbmc-9999-nomythtv.patch 6029 RMD160 d8cd1b795225b15f11c8fffd7b92fccffb62e5f2 SHA1 e36f5a7c0b7c98a2141ba858a904d01eb54693a9 SHA256 409a755e2dc7a77c5a73d0e39d9bb46eb824a9501f40225866938ec1d0c0eb4e
 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 5289 RMD160 cd87c7a3e37391e324db7d1329bf20fdcd19cea9 SHA1 180e5fc724cd5ad3e628f287f5005629d68db9bd SHA256 28f45918ce7401a0c705c4063717fe2882ba0212e01734371fe5dbde85e947ea
+EBUILD xbmc-9999.ebuild 5384 RMD160 0ab8afa65ae9ec4b80c4271ee1b7574ca6e3bca4 SHA1 0146575e910299bb88ab8d12aa23cbfda775165a SHA256 dbcd39ff1bc8849a5cdfffa22685a81b89d68242f5531d4f949147e7aff7950a
 MISC ChangeLog 17430 RMD160 6fe9d0bce8a3a8167adbc6f9ec9db3882d195262 SHA1 e54ea43e4c77dc1fee86ef5834e7affe3792f16e SHA256 b1eb911ae7530ff19bfc99e8322d92af1036ac028dbfa31367483cabaeb4a21e
 MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQIcBAEBAgAGBQJPLXjJAAoJELEHsLL7fEFWlSoQAKS5L6N0NQyb+iu/20MKEUsH
-GLUbkFkVVqHg8wpgyWf+jHYOQDq45PutHoay5fa9D1sx9Siym3RvyCjjkHMFIGQp
-y1AFz1d9E+RsvhXisoGDdLp22w6hsdPO7wg/xd88NkkGTkN57RwQKqcoGEl+PNqq
-RAkTLGhm3cYwghBHzfsGUF3QB1ftywNRiujmVZ0k7aaKJe90f1KD/DwX2+JS6X6g
-zVE9EwUs1OljWxg6PCsZ3HiWSHf8AQvtLzhoKJiMhk03Q/ZAZn0CIe/i2TzdtoT6
-rM7O4fblAti8if1dA6S+1TfkenqbI0qoNVVJu39Jls1g073VgYxmUq2zMZIMjjFa
-YXZqtbSLPZF+cKcCqFtepGp5wcXhqHheuOPK3NHIwWKIBnvzS79eOIMIzpYFaDBk
-PS1g69/LODNpbpnOEXV8G1h6UyKfNVc1iQF+zz/mqjzdt0uwFRGXMOn5vH1FlhKa
-jcH2nUcmdnZdGZk0QftHmygS+F2rfaG1j7KQviYjQgDvmIj3Z2ujkLDVl9yOfnEb
-liVmg4sWs0/CDTJNjHCv1mp1sc2fJLj59bfP3N+2lOWSk5omMRtpbj4QamwFyDXz
-UmUnS0/RchHhJpFJMJFyrSeE66U5tZwNOao5YAAaSl8zNzCBl5PcT1wghqllUlWa
-l3F+aPnZGcLc+fZhw7JM
-=fc/E
------END PGP SIGNATURE-----
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
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 3a8162e32509..52a9abf1958f 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,8 +1,8 @@
 # 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.98 2012/02/04 18:28:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.99 2012/02/04 19:50:24 vapier Exp $
 
-EAPI="2"
+EAPI="4"
 
 inherit eutils python
 
@@ -22,7 +22,8 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
+IUSE="airplay alsa altivec avahi bluray css debug goom joystick midi mysql profile +projectm pulseaudio pvr +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
+REQUIRED_USE="pvr? ( mysql )"
 
 COMMON_DEPEND="virtual/opengl
 	app-arch/bzip2
@@ -75,7 +76,7 @@ COMMON_DEPEND="virtual/opengl
 	samba? ( >=net-fs/samba-3.4.6[smbclient] )
 	sys-apps/dbus
 	sys-libs/zlib
-	pvr? ( virtual/mysql )
+	mysql? ( virtual/mysql )
 	x11-apps/xdpyinfo
 	x11-apps/mesa-progs
 	vaapi? ( x11-libs/libva )
@@ -123,7 +124,6 @@ src_prepare() {
 	do
 		[[ -e ${d}/configure ]] && continue
 		pushd ${d} >/dev/null
-		einfo "Generating autotools in ${d}"
 		eautoreconf
 		popd >/dev/null
 	done
@@ -178,6 +178,7 @@ src_configure() {
 		--disable-hal \
 		$(use_enable joystick) \
 		$(use_enable midi mid) \
+		$(use_enable mysql) \
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
@@ -192,8 +193,8 @@ src_configure() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
-	prepalldocs
+	default
+	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
 
 	insinto /usr/share/applications
 	doins tools/Linux/xbmc.desktop