Updated nomythtv patch for current git sources, by hal in bug #488494

(Portage version: 2.2.7-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

5 files changed, 87 insertions, 15 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index f1f2859b14df..cc49b6f4838d 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.196 2013/09/05 05:06:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.197 2013/11/10 17:21:41 grobian Exp $
+
+  10 Nov 2013; Fabian Groffen <grobian@gentoo.org>
+  +files/xbmc-12.1-nomythtv.patch, files/xbmc-9999-nomythtv.patch,
+  xbmc-12.1-r1.ebuild, xbmc-12.2-r1.ebuild:
+  Updated nomythtv patch for current git sources, by hal in bug #488494
 
   05 Sep 2013; Mike Frysinger <vapier@gentoo.org> xbmc-12.1-r1.ebuild,
   xbmc-12.2-r1.ebuild, xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/files/xbmc-12.1-nomythtv.patch b/media-tv/xbmc/files/xbmc-12.1-nomythtv.patch
new file mode 100644
index 000000000000..f793ba34dcf0
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-12.1-nomythtv.patch
@@ -0,0 +1,68 @@
+http://trac.xbmc.org/ticket/11775
+
+make mythtv support optional
+
+diff --git a/Makefile.in b/Makefile.in
+index 9ffae7e..17cc525 100755
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -147,7 +147,7 @@ LIB_DIRS=\
+ 	lib/cpluff \
+ 	lib/xbmc-dll-symbols
+ 
+-ifeq (@USE_MYSQL@,1)
++ifeq (@USE_MYTHTV@,1)
+ LIB_DIRS += lib/cmyth
+ CMYTH=cmyth
+ endif
+diff --git a/configure.in b/configure.in
+index d44825f..629d7b4 100755
+--- a/configure.in
++++ b/configure.in
+@@ -387,6 +387,12 @@ AC_ARG_ENABLE([mysql],
+   [use_mysql=$enableval],
+   [use_mysql=yes])
+ 
++AC_ARG_ENABLE([mythtv],
++  [AS_HELP_STRING([--disable-mythtv],
++  [disable mythtv])],
++  [use_mythtv=$enableval],
++  [use_mythtv=yes])
++
+ AC_ARG_ENABLE([webserver],
+   [AS_HELP_STRING([--disable-webserver],
+   [disable webserver])],
+@@ -748,6 +754,9 @@ if test "$use_mysql" = "yes"; then
+   else
+     AC_MSG_ERROR($missing_program)
+   fi
++  if test "$use_mythtv" = "yes"; then
++    AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"])
++  fi
+ fi
+ AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
+@@ -1895,6 +1904,15 @@ else
+   final_message="$final_message\n  MySQL:\tNo"
+   USE_MYSQL=0
+ fi
++
++if test "$use_mythtv" = "yes"; then
++  final_message="$final_message\n  MythTV:\tYes"
++  USE_MYTHTV=1
++else
++  final_message="$final_message\n  MythTV:\tNo"
++  USE_MYTHTV=0
++fi
++
+ if test "$use_webserver" = "yes"; then
+   final_message="$final_message\n  Webserver:\tYes"
+   USE_WEB_SERVER=1
+@@ -2123,6 +2141,7 @@ AC_SUBST(USE_LIBUDEV)
+ AC_SUBST(USE_LIBUSB)
+ AC_SUBST(USE_LIBCEC)
+ AC_SUBST(USE_MYSQL)
++AC_SUBST(USE_MYTHTV)
+ AC_SUBST(USE_WEB_SERVER)
+ 
+ 
diff --git a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
index f793ba34dcf0..40ab23b98d1c 100644
--- a/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
+++ b/media-tv/xbmc/files/xbmc-9999-nomythtv.patch
@@ -6,7 +6,7 @@ diff --git a/Makefile.in b/Makefile.in
 index 9ffae7e..17cc525 100755
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -147,7 +147,7 @@ LIB_DIRS=\
+@@ -209,7 +209,7 @@ LIB_DIRS=\
  	lib/cpluff \
  	lib/xbmc-dll-symbols
  
@@ -19,9 +19,9 @@ diff --git a/configure.in b/configure.in
 index d44825f..629d7b4 100755
 --- a/configure.in
 +++ b/configure.in
-@@ -387,6 +387,12 @@ AC_ARG_ENABLE([mysql],
-   [use_mysql=$enableval],
-   [use_mysql=yes])
+@@ -479,6 +479,12 @@ AC_ARG_ENABLE([mysql],
+   [AS_HELP_STRING([--disable-mysql],
+   [disable mysql])],
  
 +AC_ARG_ENABLE([mythtv],
 +  [AS_HELP_STRING([--disable-mythtv],
@@ -32,7 +32,7 @@ index d44825f..629d7b4 100755
  AC_ARG_ENABLE([webserver],
    [AS_HELP_STRING([--disable-webserver],
    [disable webserver])],
-@@ -748,6 +754,9 @@ if test "$use_mysql" = "yes"; then
+@@ -1080,6 +1086,9 @@ if test "$use_mysql" = "yes"; then
    else
      AC_MSG_ERROR($missing_program)
    fi
@@ -42,7 +42,7 @@ index d44825f..629d7b4 100755
  fi
  AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library))
  AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
-@@ -1895,6 +1904,15 @@ else
+@@ -2372,6 +2381,15 @@ else
    final_message="$final_message\n  MySQL:\tNo"
    USE_MYSQL=0
  fi
@@ -58,11 +58,10 @@ index d44825f..629d7b4 100755
  if test "$use_webserver" = "yes"; then
    final_message="$final_message\n  Webserver:\tYes"
    USE_WEB_SERVER=1
-@@ -2123,6 +2141,7 @@ AC_SUBST(USE_LIBUDEV)
+@@ -2675,6 +2693,7 @@ AC_SUBST(USE_LIBUDEV)
  AC_SUBST(USE_LIBUSB)
  AC_SUBST(USE_LIBCEC)
  AC_SUBST(USE_MYSQL)
 +AC_SUBST(USE_MYTHTV)
- AC_SUBST(USE_WEB_SERVER)
- 
- 
+ AC_SUBST(USE_WAYLAND)
+
diff --git a/media-tv/xbmc/xbmc-12.1-r1.ebuild b/media-tv/xbmc/xbmc-12.1-r1.ebuild
index bc6c5bab6767..208abba2b0f0 100644
--- a/media-tv/xbmc/xbmc-12.1-r1.ebuild
+++ b/media-tv/xbmc/xbmc-12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.5 2013/09/05 05:06:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.1-r1.ebuild,v 1.6 2013/11/10 17:21:41 grobian Exp $
 
 EAPI="5"
 
@@ -147,7 +147,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+	epatch "${FILESDIR}"/${PN}-12.1-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
 	# The mythtv patch touches configure.ac, so force a regen
 	rm -f configure
diff --git a/media-tv/xbmc/xbmc-12.2-r1.ebuild b/media-tv/xbmc/xbmc-12.2-r1.ebuild
index ae9860579e8c..63e64f0b2fab 100644
--- a/media-tv/xbmc/xbmc-12.2-r1.ebuild
+++ b/media-tv/xbmc/xbmc-12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.2-r1.ebuild,v 1.7 2013/09/05 05:06:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-12.2-r1.ebuild,v 1.8 2013/11/10 17:21:41 grobian Exp $
 
 EAPI="5"
 
@@ -147,7 +147,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
+	epatch "${FILESDIR}"/${PN}-12.1-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
 	# Backported fixes
 	EPATCH_MULTI_MSG="Applying patches backported from master..." \