[oe] [PATCH 4/5] matrix-gui: make versioned recipes

[Chase Maupin]

* Abstracted common code to .inc file
* Made versioned recipe for version 1.1 and 1.2
* Removed _svn version of the recipe

Signed-off-by: Chase Maupin <chase.maupin at ti.com>
---
 recipes/ti/matrix-gui.inc    |   43 ++++++++++++++++++++++++++++++++++++++++
 recipes/ti/matrix-gui_1.1.bb |    7 ++++++
 recipes/ti/matrix-gui_1.2.bb |    5 ++++
 recipes/ti/matrix-gui_svn.bb |   45 ------------------------------------------
 4 files changed, 55 insertions(+), 45 deletions(-)
 create mode 100644 recipes/ti/matrix-gui.inc
 create mode 100644 recipes/ti/matrix-gui_1.1.bb
 create mode 100644 recipes/ti/matrix-gui_1.2.bb
 delete mode 100644 recipes/ti/matrix-gui_svn.bb

diff --git a/recipes/ti/matrix-gui.inc b/recipes/ti/matrix-gui.inc
new file mode 100644
index 0000000..afdd96a
--- /dev/null
+++ b/recipes/ti/matrix-gui.inc
@@ -0,0 +1,43 @@
+DESCRIPTION = "Matrix GUI for Qt X11"
+HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
+LICENSE = "BSD"
+SECTION = "multimedia"
+PRIORITY = "optional"
+
+COMPATIBLE_MACHINE = "(dm365|omapl138|omap3|ti816x)"
+
+PLATFORM_dm365 = "dm365"
+PLATFORM_omapl138 = "omapl138"
+PLATFORM_omap3evm = "omap3530"
+PLATFORM_dm37x-evm = "dm3730"
+PLATFORM_am37x-evm = "am3715"
+PLATFORM_beagleboard = "am3715"
+PLATFORM_ti816x = "ti816x"
+
+SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
+
+S = "${WORKDIR}/trunk"
+
+CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
+CXXFLAGS_dm365_append = " -DPlatform_dm365 "
+PACKAGE_ARCH = ${MACHINE_ARCH}
+
+inherit qt4x11
+
+do_install() {
+	install -d ${D}/${bindir}
+	install -m 0755 ${S}/matrix_gui ${D}/${bindir}
+	install -d ${D}${sysconfdir}/init.d/
+	install -c -m 0755 ${S}/${PLATFORM}/etc/x11/init ${D}${sysconfdir}/init.d/matrix-gui
+	install -d ${D}/${sysconfdir}/xdg/autostart
+	install -m 0755 ${S}/${PLATFORM}/etc/x11/matrix-gui.desktop ${D}/${sysconfdir}/xdg/autostart
+}
+
+FILES_${PN}-autostart = "${sysconfdir}/xdg/autostart/matrix-gui.desktop"
+
+#Make autostart package depend on matrix-gui package.  Doesn't make sense
+#to install the autostart package without the underlying matrix-gui package.
+RDEPENDS_${PN}-autostart += "${PN}"
+PACKAGES =+ "${PN}-autostart"
+
+RDEPENDS_${PN} += "matrix-gui-common"
diff --git a/recipes/ti/matrix-gui_1.1.bb b/recipes/ti/matrix-gui_1.1.bb
new file mode 100644
index 0000000..22a8b86
--- /dev/null
+++ b/recipes/ti/matrix-gui_1.1.bb
@@ -0,0 +1,7 @@
+require matrix-gui.inc
+
+COMPATIBLE_MACHINE = "(dm365|omapl138|omap3)"
+
+SRCREV = "136"
+PV = "1.1"
+PR = "r17"
diff --git a/recipes/ti/matrix-gui_1.2.bb b/recipes/ti/matrix-gui_1.2.bb
new file mode 100644
index 0000000..486fd2d
--- /dev/null
+++ b/recipes/ti/matrix-gui_1.2.bb
@@ -0,0 +1,5 @@
+require matrix-gui.inc
+
+SRCREV = "146"
+PV = "1.2"
+PR = "r0"
diff --git a/recipes/ti/matrix-gui_svn.bb b/recipes/ti/matrix-gui_svn.bb
deleted file mode 100644
index f52294d..0000000
--- a/recipes/ti/matrix-gui_svn.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-DESCRIPTION = "Matrix GUI for Qt X11"
-HOMEPAGE = "https://gforge.ti.com/gf/project/matrix_gui/"
-LICENSE = "BSD"
-SECTION = "multimedia"
-PRIORITY = "optional"
-
-SRCREV = "136"
-PV = "1.1"
-PR = "r16+svnr${SRCPV}"
-
-PLATFORM_dm365 = "dm365"
-PLATFORM_da850-omapl138-evm = "omapl138"
-PLATFORM_omap3evm = "omap3530"
-PLATFORM_dm37x-evm = "dm3730"
-PLATFORM_am37x-evm = "am3715"
-PLATFORM_beagleboard = "am3715"
-PLATFORM ?= "<UNDEFINED>"
-
-SRC_URI = "svn://gforge.ti.com/svn/matrix_gui/;module=trunk;proto=https;user=anonymous;pswd='' "
-
-S = "${WORKDIR}/trunk"
-
-CXXFLAGS_da850-omapl138-evm_append = " -DPlatform_omapl138 "
-CXXFLAGS_dm365_append = " -DPlatform_dm365 "
-PACKAGE_ARCH = ${MACHINE_ARCH}
-
-inherit qt4x11
-
-do_install() {
-	install -d ${D}/${bindir}
-	install -m 0755 ${S}/matrix_gui ${D}/${bindir}
-	install -d ${D}${sysconfdir}/init.d/
-	install -c -m 0755 ${S}/${PLATFORM}/etc/x11/init ${D}${sysconfdir}/init.d/matrix-gui
-	install -d ${D}/${sysconfdir}/xdg/autostart
-	install -m 0755 ${S}/${PLATFORM}/etc/x11/matrix-gui.desktop ${D}/${sysconfdir}/xdg/autostart
-}
-
-FILES_${PN}-autostart = "${sysconfdir}/xdg/autostart/matrix-gui.desktop"
-
-#Make autostart package depend on matrix-gui package.  Doesn't make sense
-#to install the autostart package without the underlying matrix-gui package.
-RDEPENDS_${PN}-autostart += "${PN}"
-PACKAGES =+ "${PN}-autostart"
-
-RDEPENDS_${PN} += "matrix-gui-common"
-- 
1.7.0.4