Revise mysql patch to work #403869 by Martin Dummer.

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

3 files changed, 41 insertions, 33 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 20112687d244..82de9b390765 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.113 2012/02/14 22:39:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.114 2012/02/16 04:31:32 vapier Exp $
+
+  16 Feb 2012; Mike Frysinger <vapier@gentoo.org>
+  files/xbmc-9999-nomythtv.patch:
+  Revise mysql patch to work #403869 by Martin Dummer.
 
 *xbmc-11.0_beta3 (14 Feb 2012)
 
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 34f11747a96e..e146cb036fae 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -7,28 +7,28 @@ AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46
 AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
 AUX xbmc-11.0-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 6029 RMD160 d8cd1b795225b15f11c8fffd7b92fccffb62e5f2 SHA1 e36f5a7c0b7c98a2141ba858a904d01eb54693a9 SHA256 409a755e2dc7a77c5a73d0e39d9bb46eb824a9501f40225866938ec1d0c0eb4e
+AUX xbmc-9999-nomythtv.patch 6190 RMD160 829dff4b58098ee0935aed6fcda345e06abdb7b3 SHA1 d34afef9342b1d5781729433795cb23240fa5d6b SHA256 ffb1eb49f94b4ae41e5d79172499671915122a58af248b0585ee276e4aa2c87e
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 DIST xbmc-11.0-Eden_beta3.tar.gz 56614229 RMD160 9c689b32479a7f8c53de2df51d1cf2bb7e1a1158 SHA1 c619d785bcc995363e637c0cf0f3cd4e63efef60 SHA256 30ce58a2f4a2c08b125ce0965675a0dd94ed16c945f4861a3198552f76875024
 EBUILD xbmc-10.1.ebuild 5390 RMD160 ccb062b93f485e70ffba8d108aae662d10533c12 SHA1 99bcc61eed8b3086085caeaa476e1c646e24bdd1 SHA256 df2669bfd06df9b2cbdb12ba25a5ad2858827f8613f495b2267109a1158a5d35
 EBUILD xbmc-11.0_beta3.ebuild 5409 RMD160 247ee2f58a5b926a7136921352231b2bb7314090 SHA1 3886fdefa465994a8e1dac24d9478b9c2081a317 SHA256 ccb0d31da0234604d7e41ead4a1d2136642e1823f554146400c835661b2dbf56
 EBUILD xbmc-9999.ebuild 5385 RMD160 635f52c192a95a4f32e40affc06707c0ba0c1011 SHA1 c42c0f4afbcbfbc60a7e42601ebd07bde73963d1 SHA256 57b2597fba4aac744a9a7f7431a7715d2005c01ba0d3e0337359d2ba81648099
-MISC ChangeLog 17837 RMD160 97c4175c7fae0c833334e06142ba64da43bc503b SHA1 e318ba07c11d23b4dba2fc65294bef7908464062 SHA256 335127337ba2751db0ccc5f5a03dbe95094fc7703796c0484ec13ce880b94d21
+MISC ChangeLog 17977 RMD160 4d38d5ff618f7984542c26fb1946cd78387b2bde SHA1 376be19a30c59822476599766de61874f6e3a8ae SHA256 937100f5734050ea23c97ca873c2656a73b988d365002c2fe7ef2a383e8db135
 MISC metadata.xml 932 RMD160 fbedc1d562949001f2195a49f375d2e4a1fdc7ff SHA1 c102da84b6cd9160308943fc7cc7801aff691a46 SHA256 2f82a971dfec33d4958ee8977011928976c4aab5f4e03139be6a6245bf3eb62d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPOuKuAAoJELEHsLL7fEFWMkUQAMfb2SXZtWjgYhRuHgT0yhR5
-d/4zsIuCqKU+5NWxlyFMXlqZD/lowCgCH0tWPeJu+X26PcAxtmGBF/ONheNEwx+p
-p+eCPkpSLf9jLjvK1LUZBiuJxqbh729oE3XPquj10bjMA/fnF28ayzIBI11OlNYn
-gKfJeWiHv5kFcho2nrqFB/ZK+C3XQzW5ozF7K37ZAV9pFdQhEN72rxABnxh2EAeJ
-OnbL8mfcxKxtvSAVpMXGykqpDeDnilqXy5OBdYBJCI1ryj3Ht1NFWYx3CQNz7IM3
-/TEjAkN7UzNofAhUlVyegpy1X0ZTQH++L1lrJF03fArAC7CjmWBebtGEdfEtZz8M
-/uUXmIAiMJaqNQoSDIwWM/N0374LvB4PdJR9q2ba0CXqEgwqy1MjhQ5YlJ+EnEtu
-zvSp0w3HECJ+m+HF6U4lyzQ8zhIlUgVQu98I7tx8H2YSpfstuWElCd/KZFVJiuGh
-zy6oMPA8jemZJCakvSuILfsUEhFNd0nrZj0xW9oeBYLxsNPMGVxXnsMQR5f34Kj8
-8ddL8RlwHkEa5kXPX9mRJvSOaHlqFqkvjlAZ5a0ueyNHHXEMUabCijHbE8nnW/fk
-ngaZsDI/EAiWXu4FEgf2o8JoRiCFHeKlu9OFf0js884/UChpOGGdvIdQny1e7oi/
-azPVHge8OJZP06BYJpwx
-=/xnb
+iQIcBAEBAgAGBQJPPIauAAoJELEHsLL7fEFWJK4P/Rf9feCaUwaL2Ezib060+U7t
+AyjeS3MZBjD1oyQDENakU8VYU5KPW0hDqGYdfXTKjAU9HA4mq5jJHpKWoqEFl0u4
+AccN75Tuf23GW1JZMq/BP6h9K4r788bMOLHAyqMLJzYIV8lZRBQRoaW7iMWJ0Vkq
+48vuvog256RMzXFYMhcQr6FwnRd5s2hZjL3Kkx2IUrbOUs11+U0DHVtEWgNg+SxB
+l7EliyovzPjYUDN3/SIwaBk1SuY8/vnV0U3o4VS5act102dAKdI3Guf7cML3ekDH
+ac9nylZ5msCl4BD+hjZRgkrVZL1y+QK25BeeYl87jetKVoyU7OGR5XEEXpILM9xF
+6soQHLiiUDhdQEc3gsMyjN7lG3YPf+ipYr/z1Xz3ILePiUYrvJONtPSWefECU/IZ
+WhNzp09sxHqbPpupmTtwjIq8QpWRUPGA28EbF8CKP0jBxAUVD6DaZ0v8UridqFlE
+skIXt0udPUxP3ZlhdrJIzpyRoJwpquDn5t1fjtFNkUxzsFB4Cc/qhFxrv2sH5Pw9
+oYCoDbYBhhnM/P2NxaJ53i8KZ8t+TIyYB+XV2JLrYjZgK0/zrKjU71BizUWqCx1X
+K3Ih60XjNYuVSJptFykOrKXFMUGbWKYcnVxFz3mlH4+yM0OuEJARR+xCt5/QG4Zt
+RZo8Ef35tBfoEzjZUSlC
+=ItgR
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
index 298a579d7a5e..09286dba0a87 100644
--- a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
+++ b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
@@ -66,7 +66,7 @@ make mysql/mythtv support optional
  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 @@ make mysql/mythtv support optional
 +  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 @@ make mysql/mythtv support optional
    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 \
+--- a/xbmc/dbwrappers/mysqldataset.cpp
++++ b/xbmc/dbwrappers/mysqldataset.cpp
+@@ -23,9 +23,11 @@
+ #include <string>
+ #include <set>
  
-+ifeq (@BUILD_MYSQL@,1)
-+SRCS+=\
-+     mysqldataset.cpp
-+endif
++#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 */