mythtv: unified, need testing

3 files changed, 41 insertions, 64 deletions

diff --git a/packages/mythtv/mythtv.inc b/packages/mythtv/mythtv.inc
new file mode 100644
index 0000000000..4ceda5d421
--- /dev/null
+++ b/packages/mythtv/mythtv.inc
@@ -0,0 +1,32 @@
+DESCRIPTION = "A full featured personal video recorder system."
+HOMEPAGE = "http://www.mythtv.org"
+LICENSE = "GPL"
+SECTION = "x11/multimedia"
+DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free"
+RDEPENDS_${PN} = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
+
+SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2"
+
+inherit qmake qt3x11
+
+# there is a -march=586 somewhere in the source tree
+COMPATIBLE_HOST = 'i.86.*-linux'
+
+QMAKE_PROFILES = "mythtv.pro"
+
+def mythtv_arch(d):
+        import bb, re
+        arch = bb.data.getVar('TARGET_ARCH', d, 1)
+        if re.match("^i.86$", arch):
+                arch = "x86"
+        elif arch == "x86_64":
+                arch = "x86"
+        elif arch == "arm":
+                arch = "armv4l"
+        return arch
+
+MYTHTV_ARCH := "${@mythtv_arch(d)}"
+
+do_install() {
+	oe_runmake INSTALL_ROOT=${D} install
+}
diff --git a/packages/mythtv/mythtv_0.18.1.bb b/packages/mythtv/mythtv_0.18.1.bb
index 2686fa86a2..1602ce0e42 100644
--- a/packages/mythtv/mythtv_0.18.1.bb
+++ b/packages/mythtv/mythtv_0.18.1.bb
@@ -1,34 +1,10 @@
-DESCRIPTION = "A full featured personal video recorder system."
-HOMEPAGE = "http://www.mythtv.org"
-LICENSE = "GPL"
-SECTION = "x11/multimedia"
-DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free"
-RDEPENDS = "qt-x11-plugins-sqldrivers qt-x11-plugins-imageformats"
-PR = "r1"
-
-SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \
-	file://msmpeg-underscore-pic.patch;patch=1 \
-	file://settings.pro"
-
-inherit qmake qt3x11
-
-# there is a -march=586 somewhere in the source tree
-COMPATIBLE_HOST = 'i.86.*-linux'
+require mythtv.inc
 
-QMAKE_PROFILES = "mythtv.pro"
+PR = "r1"
 
-def mythtv_arch(d):
-        import bb, re
-        arch = bb.data.getVar('TARGET_ARCH', d, 1)
-        if re.match("^i.86$", arch):
-                arch = "x86"
-        elif arch == "x86_64":
-                arch = "x86"
-        elif arch == "arm":
-                arch = "armv4l"
-        return arch
+SRC_URI += "file://msmpeg-underscore-pic.patch;patch=1 \
+	    file://settings.pro"
 
-MYTHTV_ARCH := "${@mythtv_arch(d)}"
 
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
@@ -70,8 +46,3 @@ do_configure_prepend() {
 	sed 's!PREFIX =.*!PREFIX = ${prefix}!' < settings.pro > settings.pro.new
 	mv settings.pro.new settings.pro
 }
-
-do_install() {
-	oe_runmake INSTALL_ROOT=${D} install
-}
-
diff --git a/packages/mythtv/mythtv_0.20.bb b/packages/mythtv/mythtv_0.20.bb
index ab9060de94..c9e2fdc431 100644
--- a/packages/mythtv/mythtv_0.20.bb
+++ b/packages/mythtv/mythtv_0.20.bb
@@ -1,22 +1,14 @@
-DESCRIPTION = "A full featured personal video recorder system."
-HOMEPAGE = "http://www.mythtv.org"
-LICENSE = "GPL"
-SECTION = "x11/multimedia"
-DEPENDS = "libxinerama lame libxv libxxf86vm libxvmc lirc qt-x11-free openchrome"
+require mythtv.inc
+
+DEPENDS += "openchrome"
 PR = "r0"
 
-SRC_URI = "http://www.mythtv.org/mc/mythtv-${PV}.tar.bz2 \
-	file://configure.patch;patch=1 \
-	file://libmyth-libdir.patch;patch=1"
+SRC_URI += "file://configure.patch;patch=1 \
+            file://libmyth-libdir.patch;patch=1"
 
 # Seen on the mythtv web page:
 # http://www.mythtv.org/mc/fix-mythweb-in-0.20.diff;patch=1
 
-inherit qmake qt3x11
-
-# there is a -march=586 somewhere in the source tree
-COMPATIBLE_HOST = 'i.86.*-linux'
-
 QMAKE_PROFILES = "mythtv.pro"
 
 mythlibs = "mythavutil mythavcodec mythavformat myth mythtv mythui mythfreemheg mythupnp mythlivemedia"
@@ -47,20 +39,6 @@ python __anonymous () {
 
     bb.data.setVar("PACKAGES", packages, d)
 }
-
-def mythtv_arch(d):
-        import bb, re
-        arch = bb.data.getVar('TARGET_ARCH', d, 1)
-        if re.match("^i.86$", arch):
-                arch = "x86"
-        elif arch == "x86_64":
-                arch = "x86"
-        elif arch == "arm":
-                arch = "armv4l"
-        return arch
-
-MYTHTV_ARCH := "${@mythtv_arch(d)}"
-
 do_configure_prepend() {
 # it's not autotools anyway, so we call ./configure directly
 	find . -name "Makefile"|xargs rm -f
@@ -81,10 +59,6 @@ do_configure_prepend() {
 	mv settings.pro.new settings.pro
 }
 
-do_install() {
-	oe_runmake INSTALL_ROOT=${D} install
-}
-
 python populate_packages_prepend () {
 	new_packages = []