From 23eac977aff9eba72b0792b80155d6709e923738 Mon Sep 17 00:00:00 2001
From: Christian Wiese <chris@opensde.org>
Date: Fri, 8 Apr 2011 14:25:38 +0200
Subject: [PATCH] mythtv: Updated (0.19 -> 0.24)

---
 ...> configure-unknown-option.patch.disabled} |  3 +-
 ...tv-0.24-libmythhdhomerun-use-ldflags.patch | 37 +++++++++++++++
 multimedia/mythtv/mythtv.conf                 | 46 +++++++++++--------
 multimedia/mythtv/mythtv.desc                 |  6 +--
 .../{uname.patch => uname.patch.disabled}     |  3 +-
 5 files changed, 72 insertions(+), 23 deletions(-)
 rename multimedia/mythtv/{configure-unknown-option.patch => configure-unknown-option.patch.disabled} (89%)
 create mode 100644 multimedia/mythtv/mythtv-0.24-libmythhdhomerun-use-ldflags.patch
 rename multimedia/mythtv/{uname.patch => uname.patch.disabled} (92%)

diff --git a/multimedia/mythtv/configure-unknown-option.patch b/multimedia/mythtv/configure-unknown-option.patch.disabled
similarity index 89%
rename from multimedia/mythtv/configure-unknown-option.patch
rename to multimedia/mythtv/configure-unknown-option.patch.disabled
index 4533b2fe0..aeffcc21a 100644
--- a/multimedia/mythtv/configure-unknown-option.patch
+++ b/multimedia/mythtv/configure-unknown-option.patch.disabled
@@ -1,7 +1,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../mythtv/configure-unknown-option.patch
+# Filename: package/.../mythtv/configure-unknown-option.patch.disabled
+# Copyright (C) 2011 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
diff --git a/multimedia/mythtv/mythtv-0.24-libmythhdhomerun-use-ldflags.patch b/multimedia/mythtv/mythtv-0.24-libmythhdhomerun-use-ldflags.patch
new file mode 100644
index 000000000..3f5488e4c
--- /dev/null
+++ b/multimedia/mythtv/mythtv-0.24-libmythhdhomerun-use-ldflags.patch
@@ -0,0 +1,37 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../mythtv/mythtv-0.24-libmythhdhomerun-use-ldflags.patch
+# Copyright (C) 2011 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+Description: Fix to use extra LDFLAGS while linking libmythhdhomerun
+
+MythTV provides a configure option '--extra-ldflags' to pass extra LDFLAGS
+which is handy if a library is not installed in a path supported by default.
+On OpenSDE based systems X11R7 gets installed with the prefix '/usr/X11R7'
+so libraries are installed in '/usr/X11R7/lib', which is not found by the
+MythTV build system, thus we are passing '-L/usr/X11R7/lib' using the
+'--extra-ldflags' configure option.
+This seems to work fairly well, besides with libmythhdhomerun which is not
+honoring the provided extra LDFLAGS.
+ 
+--- mythtv-0.24/libs/libmythhdhomerun/libmythhdhomerun.pro.orig	2011-04-08 12:48:54.436075914 +0200
++++ mythtv-0.24/libs/libmythhdhomerun/libmythhdhomerun.pro	2011-04-08 12:14:57.184075914 +0200
+@@ -33,6 +33,6 @@
+     LIBS += -lws2_32 -liphlpapi -lpthread
+ }
+ 
+-LIBS += $$EXTRALIBS 
++LIBS += $$LDFLAGS $$EXTRALIBS 
+ 
+ include ( ../libs-targetfix.pro )
diff --git a/multimedia/mythtv/mythtv.conf b/multimedia/mythtv/mythtv.conf
index bc9c21abc..232ae4e6e 100644
--- a/multimedia/mythtv/mythtv.conf
+++ b/multimedia/mythtv/mythtv.conf
@@ -2,6 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../mythtv/mythtv.conf
+# Copyright (C) 2011 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -14,29 +15,38 @@
 
 . $base/package/*/*/mythtv-conf.in
 
-runconf=0
-hook_add preconf 3 "fix_mythtv_prefix"
+# mythtv is using a custom configure script which is not accepting our
+# auto-generated configure options
+confopt=''
 
-# Skip mythuitest, does complain about missing QGLWidget
-hook_add preconf 4 "sed -i -e 's,mythuitest,,' ./programs/programs.pro"
+var_append confopt ' ' "--prefix=/$prefix"
 
-hook_add preconf 5 "mythtv_config"
+# compiler
+var_append confopt ' ' "--cc=$CC"
+var_append confopt ' ' "--cxx=$CXX"
+# architecture/cpu
+var_append confopt ' ' "--arch=$arch_machine"
+var_append confopt ' ' "--cpu=$SDECFG_X86_OPT"
+# TODO tuning
+# --tune=CPU     tune instruction usage for a particular CPU [generic]
 
-var_append GCC_WRAPPER_APPEND ' ' "-I$root/$prefix/include -L$root/$prefix/lib"
+# controlled by OpenSDE itself
+var_append confopt ' ' "--disable-ccache --disable-distcc"
 
 # X11
-pkginstalled xorg-server || var_append confopt ' ' "--disable-xv --disable-x11"
-pkginstalled libxvmc && var_append confopt ' ' "--enable-xvmc"
-
-# DVB Support
-var_append confopt ' ' "--enable-dvb --enable-dvb-eit --dvb-path=$root/usr/include"
+if pkginstalled -f libx11; then
+	# location of X11 include files
+	var_append confopt ' ' "--x11-path=$(pkgprefix -r includedir libx11)"
+	#var_append confopt ' ' "--extra-cflags=-I$(pkgprefix -r includedir libx11)"
+	var_append confopt ' ' "--extra-ldflags=-L$(pkgprefix -r libdir libx11)"
+else
+	var_append confopt ' ' "--disable-x11"
+fi
 
 # Lirc Support
-pkginstalled lirc && var_append confopt ' ' "--enable-lirc"
-
-# controlled by T2 itself
-var_append confopt ' ' "--disable-ccache --disable-distcc"
+if ! pkginstalled -f lirc; then
+	var_append confopt ' ' "--disable-lirc"
+fi
 
-hook_add premake 5 "qmake myth*.pro"
-hook_add premake 8 "make qmake"
-hook_add postmake 5 "cp -av database configfiles contrib $root/$datadir"
+# install database and contrib stuff
+hook_add postmake 5 "cp -av database contrib $root/$datadir"
diff --git a/multimedia/mythtv/mythtv.desc b/multimedia/mythtv/mythtv.desc
index 5ea0a6c34..1bc7d85c5 100644
--- a/multimedia/mythtv/mythtv.desc
+++ b/multimedia/mythtv/mythtv.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../mythtv/mythtv.desc
-[COPY] Copyright (C) 2006 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2011 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -54,8 +54,8 @@
 
 [L] GPL
 [S] Beta
-[V] 0.19
+[V] 0.24
 [P] X -----5---9 179.600
 
-[D] 2876538566 mythtv-0.19.tar.bz2 http://www.mythtv.org/mc/
+[D] 2606978704 mythtv-0.24.tar.bz2 !http://www.mythtv.org/download/mythtv/0.24
 #[D] X mythtv-0.19-r7980.tar.bz2 svn+http://svn.mythtv.org/svn/trunk/mythtv -r 7980
diff --git a/multimedia/mythtv/uname.patch b/multimedia/mythtv/uname.patch.disabled
similarity index 92%
rename from multimedia/mythtv/uname.patch
rename to multimedia/mythtv/uname.patch.disabled
index c1c3a7c2b..3f4171ce6 100644
--- a/multimedia/mythtv/uname.patch
+++ b/multimedia/mythtv/uname.patch.disabled
@@ -1,7 +1,8 @@
 # --- SDE-COPYRIGHT-NOTE-BEGIN ---
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
-# Filename: package/.../mythtv/uname.patch
+# Filename: package/.../mythtv/uname.patch.disabled
+# Copyright (C) 2011 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.