From f1315f451d924fec0981e611c30292bcd5405ca5 Mon Sep 17 00:00:00 2001
From: Roger Monk <r-monk@ti.com>
Date: Mon, 30 Mar 2009 19:01:53 +0100
Subject: ti-codec-combos: Use DVSDK Codec Combos to be aligned with DVSDK

---
 recipes/dsplink/ti-codec-combos_3.16.bb | 19 +++----------------
 recipes/dsplink/ti-codec-engine_2.23.bb |  5 +++--
 2 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'recipes/dsplink')

diff --git a/recipes/dsplink/ti-codec-combos_3.16.bb b/recipes/dsplink/ti-codec-combos_3.16.bb
index dc1ef9f8b9..dd97a57bc5 100644
--- a/recipes/dsplink/ti-codec-combos_3.16.bb
+++ b/recipes/dsplink/ti-codec-combos_3.16.bb
@@ -4,7 +4,9 @@ LICENCE = "unknown"
 
 require ti-paths.inc
 
-SRC_URI = "http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin \
+
+# Tar-Up Codec Combos from the OMAP DVSDK (http://www.ti.com/dvevmupdates) and drop in files/
+SRC_URI = "file://omap3530_dvsdk_combos_3_16.tar.gz \
     "
 
 S = "${WORKDIR}/omap3530_dvsdk_combos_3_16"
@@ -20,21 +22,6 @@ export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/pa
 # Needed for now since makefile in latest package assumes this is set
 export CODEC_INSTALL_DIR="${S}"
 
-# Helper function to run the binary installer and unpack the tar.gz in the same place as it was before - this could be optimised later
-do_accept_license() {
-        export HOME="${WORKDIR}"
-	chmod +x ${WORKDIR}/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin
-        ${WORKDIR}/omap3530_dvsdk_combos_tspa-3_16-Linux-x86.bin --mode silent --prefix ${S}_install
-        cd "${S}_install"
-	tar -xzvf omap3530_dvsdk_combos_tspa_3_16.tar.gz
-	if [ -d ${S} ] ; then 
-            rm -rf ${S}
-        fi
-        mv omap3530_dvsdk_combos_tspa_3_16 ${S}
-}
-
-addtask accept_license after do_unpack before do_configure
-
 do_compile() {
 
         # For now, remove the reference to Rules.make and swap prod for eval, since this only has eval libs included
diff --git a/recipes/dsplink/ti-codec-engine_2.23.bb b/recipes/dsplink/ti-codec-engine_2.23.bb
index 78684f463e..a42c33bcdd 100644
--- a/recipes/dsplink/ti-codec-engine_2.23.bb
+++ b/recipes/dsplink/ti-codec-engine_2.23.bb
@@ -125,7 +125,7 @@ do_compile () {
       COMPILER="${KERNEL_CC}" \
       ARCHIVER="${KERNEL_AR}" \
       KERNEL_DIR="${STAGING_KERNEL_DIR}" \
-      clean default
+      clean all
 
     # Build the gpp samples
     cd ${DSPLINK}/gpp/src/samples
@@ -230,7 +230,8 @@ do_compile () {
           CGTOOLS_V5T="${CROSS_DIR}" \
           CGTOOLS_C64P="${TICGTOOLSDIR}" \ 
           -C ${S}/examples/ti/sdo/ce/examples/$i \
-         clean all
+         clean 
+#all
     done    
 }
 
-- 
cgit 1.2.3-korg