ti-codecs-dm6467: Recipe align with omap3/omapl/dm6446

   * rename to match PV
   * public SRC_URI based on DVSDK 3.10 beta
   * prepsources/compile
   * package into ti-codecs-server
   * prepare for common .inc

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

2 files changed, 87 insertions, 41 deletions

diff --git a/recipes/ti/ti-codecs-dm6467_1.0.0.3.bb b/recipes/ti/ti-codecs-dm6467_1.0.0.3.bb
deleted file mode 100644
index cef2616764..0000000000
--- a/recipes/ti/ti-codecs-dm6467_1.0.0.3.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-require ti-codec.inc
-
-PR = "r1"
-CSVER = "2"
-PV = "1_00_00_03"
-
-SRC_URI = "http://install.source.dir.local/cs${CSVER}dm6467_${PV}.tar.gz;name=dm6467codecs"
-
-SRC_URI[dm6467codecs.md5sum] = "b7732ecbf329520dd2d25b14fbeef8f2"
-SRC_URI[dm6467codecs.sha256sum] = "ab9115477f52814f4f0e860f89ca56bfd9ed0e8b89a3cbae9337aeac35a4abfe"
-
-# Set the source directory
-S = "${WORKDIR}/cs${CSVER}dm6467_${PV}"
-
-# compile time dependencies
-DEPENDS="ti-codec-engine ti-biosutils ti-dsplink"
-
-do_compile() {
-	make CE_INSTALL_DIR=${CE_INSTALL_DIR} \
-		 FC_INSTALL_DIR=${FC_INSTALL_DIR} \
-		 EDMA3_LLD_INSTALL_DIR=${EDMA3_LLD_INSTALL_DIR} \
-		 LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
-		 CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
-		 LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
-	     BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
-		 CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
-		 XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
-		 clean all
-
-}
-
-do_install () {
-    install -d ${D}/${installdir}/codec-combo
-	cd ${S}
-	for file in `find . -name *.x64P`; do
-		cp ${file} ${D}/${installdir}/codec-combo
-	done
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-INHIBIT_PACKAGE_STRIP = "1"
diff --git a/recipes/ti/ti-codecs-dm6467_1.00.00.03.bb b/recipes/ti/ti-codecs-dm6467_1.00.00.03.bb
new file mode 100644
index 0000000000..1b51254072
--- /dev/null
+++ b/recipes/ti/ti-codecs-dm6467_1.00.00.03.bb
@@ -0,0 +1,87 @@
+DESCRIPTION = "TI Codecs (and Server Combo) for DM6467"
+HOMEPAGE = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent"
+SECTION = "multimedia"
+
+# TODO :: Move to common .inc (omap3 and omapl ready)
+
+PV = "1_00_00_03"
+
+SRC_URI[dm6467codecsbin.md5sum] = "c15085bd613a1df4f3634cc3ed0e04a5"
+SRC_URI[dm6467codecsbin.sha256sum] = "d10e221e53ca4420d72e13496ceabce9b2d0be8c08a5d622bee691ccfa98b8bd"
+
+PR = "r2"
+
+require ti-paths.inc
+require ti-staging.inc
+require ti-eula-unpack.inc
+
+PROVIDES += "ti-codecs-dm6467-server"
+
+S = "${WORKDIR}/dvsdk/dvsdk_3_10_00_11/cs2dm6467_1_00_00_03"
+
+SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_10/latest/exports/cs2dm6467_1_00_00_03_Setup.bin;name=dm6467codecsbin"
+
+BINFILE = "cs2dm6467_1_00_00_03_Setup.bin"
+TI_BIN_UNPK_CMDS = "Y: qY:workdir:Y"
+
+DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
+
+#generic codec
+DSPSUFFIX_dm6467 = "x64P"
+
+do_prepsources() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             clean
+}
+
+addtask prepsources after do_configure before do_compile
+
+do_compile() {
+
+	make \
+             CE_INSTALL_DIR=${CE_INSTALL_DIR} \
+             FC_INSTALL_DIR=${FC_INSTALL_DIR} \
+             LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \
+             CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \
+             LPM_INSTALL_DIR=${LPM_INSTALL_DIR} \
+             BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \
+             CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \
+             XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \
+             CODEC_INSTALL_DIR="${S}" \
+             XDCARGS="prod" \
+             all
+}
+
+do_install() {
+
+    install -d ${D}/${installdir}/ti-codecs-server
+    cd ${S}
+
+    # Install the DSP Server Binary 
+    for file in `find . -name *.${DSPSUFFIX}`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    # Install docs (codec qualiTI test reports, server config datasheet, etc)
+    for file in `find . -name *.html`; do
+        cp ${file} ${D}/${installdir}/ti-codecs-server
+    done
+
+    install -d ${D}${CODEC_INSTALL_DIR_RECIPE}
+    cp -pPrf ${S}/* ${D}${CODEC_INSTALL_DIR_RECIPE}
+}
+
+PACKAGES += "ti-codecs-dm6467-server"
+FILES_ti-codecs-dm6467-server = "${installdir}/ti-codecs-server/*"
+