ti-codecs-dm355: Align with other codec recipes

   * Use same structure as other codec recipes
      * Prepare for common include
   * Fix staged directory which broke after previous restructure
   * Rename to match full PV

Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>

3 files changed, 46 insertions, 44 deletions

diff --git a/recipes/ti/ti-codecs-dm355.inc b/recipes/ti/ti-codecs-dm355.inc
deleted file mode 100644
index 322bed2622..0000000000
--- a/recipes/ti/ti-codecs-dm355.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "DM355 Codecs"
-SECTION = "multimedia"
-
-BASE_SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs"
-SRC_URI = "${BASE_SRC_URI}/dm355_codecs_setuplinux_${PV}.bin \
-                   file://mapdmaq \
-                 "
-
-S = "${WORKDIR}/dm355_codecs_${PV}"
-
-require ti-paths.inc
-
-BINFILE = "dm355_codecs_setuplinux_${PV}.bin"
-TI_BIN_UNPK_CMDS = "Y:Y: qY:workdir"
-
-require ti-eula-unpack.inc
-
-do_compile() {
-        echo "Do nothing"
-}
-
-do_install () {
-     # install mapdmaq on target
-     install -d ${D}/${installdir}/codecs
-     install -m 0755 ${WORKDIR}/mapdmaq ${D}/${installdir}/codecs
-}
-
-do_stage() {
-    install -d ${CODEC_INSTALL_DIR}
-    cp -pPrf ${S}/* ${CODEC_INSTALL_DIR}
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-FILES_${PN} = "${installdir}/codecs/mapdmaq"
-
-INHIBIT_PACKAGE_STRIP = "1"
-INSANE_SKIP_${PN} = "True"
diff --git a/recipes/ti/ti-codecs-dm355_1.13.000.bb b/recipes/ti/ti-codecs-dm355_1.13.000.bb
new file mode 100644
index 0000000000..fe92c69227
--- /dev/null
+++ b/recipes/ti/ti-codecs-dm355_1.13.000.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "TI Codecs for DM355"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent"
+SECTION = "multimedia"
+
+# TODO :: Move to common .inc
+
+PV = "1_13_000"
+
+SRC_URI[dm355codecsbin.md5sum] = "64a53cd55bc63d3a6f4db742aff90de9"
+SRC_URI[dm355codecsbin.sha256sum] = "4fb1075ad83f6017616410eff35ada7d567f1ee1b5b23624a817e8fc7dda3f8a"
+
+PR = "r17"
+
+require ti-paths.inc
+require ti-staging.inc
+require ti-eula-unpack.inc
+
+PROVIDES += "ti-codecs-dm355-server"
+
+S = "${WORKDIR}/dm355_codecs_${PV}"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/${BINFILE};name=dm355codecsbin \
+           file://mapdmaq \
+"
+
+BINFILE = "dm355_codecs_setuplinux_${PV}.bin"
+TI_BIN_UNPK_CMDS = "y:Y: qY:workdir"
+
+do_compile() {
+    echo "Do Nothing" 
+}
+
+do_install() {
+
+    install -d ${D}/${installdir}/ti-codecs-server
+    cd ${S}
+
+    install -m 0755 ${WORKDIR}/mapdmaq ${D}/${installdir}/ti-codecs-server
+
+    install -d ${D}${CODEC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE}
+}
+
+PACKAGES += "ti-codecs-dm355-server"
+FILES_ti-codecs-dm355-server = "${installdir}/ti-codecs-server/*"
+
diff --git a/recipes/ti/ti-codecs-dm355_1.13.bb b/recipes/ti/ti-codecs-dm355_1.13.bb
deleted file mode 100644
index bb7adbdb8e..0000000000
--- a/recipes/ti/ti-codecs-dm355_1.13.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-PV = "1_13_000"
-PR = "r16"
-
-require ti-codecs-dm355.inc
-
-