From 17c027e2aede4fb92c82cf92f91fc38529789a7b Mon Sep 17 00:00:00 2001
From: Enrico Butera <ebutera@users.berlios.de>
Date: Sun, 7 Aug 2011 20:23:36 +0200
Subject: [PATCH] ti-codecs-omap3530: disable c6accel, build fix, add
 LIC_FILES_CHKSUM

c6accel build is still broken so disable it in codec server for now, at least
we have a buildable codec server.

Signed-off-by: Enrico Butera <ebutera@users.berlios.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 .../ti-codecs-omap3530/disable-c6accel.diff   | 47 +++++++++++++++++++
 .../ti-codecs-omap3530_4.00.00.00.bb          |  7 ++-
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 recipes-ti/codec-engine/ti-codecs-omap3530/disable-c6accel.diff

diff --git a/recipes-ti/codec-engine/ti-codecs-omap3530/disable-c6accel.diff b/recipes-ti/codec-engine/ti-codecs-omap3530/disable-c6accel.diff
new file mode 100644
index 00000000..6e2ed7e4
--- /dev/null
+++ b/recipes-ti/codec-engine/ti-codecs-omap3530/disable-c6accel.diff
@@ -0,0 +1,47 @@
+diff -ur a/packages/ti/sdo/server/cs/codec.cfg b/packages/ti/sdo/server/cs/codec.cfg
+--- a/packages/ti/sdo/server/cs/codec.cfg	2011-08-07 20:08:57.000000000 +0200
++++ b/packages/ti/sdo/server/cs/codec.cfg	2011-08-07 20:08:10.000000000 +0200
+@@ -7,7 +7,7 @@
+  *  which we'll use to initialize config params and add the codecs to
+  *  the Server.algs array.
+  */
+-    var C6ACCEL = xdc.useModule('ti.c6accel.ce.C6ACCEL');
++/*    var C6ACCEL = xdc.useModule('ti.c6accel.ce.C6ACCEL');
+ 
+         C6ACCEL.serverFxns = "UNIVERSAL_SKEL";
+         C6ACCEL.stubFxns = "UNIVERSAL_STUBS";
+@@ -17,7 +17,7 @@
+         C6ACCEL.alg.codeSection = codeSection;
+         C6ACCEL.alg.udataSection = udataSection;
+         C6ACCEL.alg.dataSection = dataSection;
+-
++*/
+     var AACHEDEC = xdc.useModule('ti.sdo.codecs.aachedec.ce.AACHEDEC');
+ 
+         AACHEDEC.serverFxns = "AUDDEC1_SKEL";
+@@ -151,11 +151,11 @@
+  * algorithms (e.g. stack sizes, priorities, etc.).
+  */
+ Server.algs = [ 
+-    {name: "c6accel", mod: C6ACCEL , threadAttrs: {
++/*    {name: "c6accel", mod: C6ACCEL , threadAttrs: {
+         stackMemId: 0, priority: Server.MINPRI + 3},
+         groupId : 2,
+     },
+-
++*/
+     {name: "aachedec", mod: AACHEDEC , threadAttrs: {
+         stackMemId: 0, priority: Server.MINPRI + 3},
+         groupId : 2,
+diff -ur a/packages/ti/sdo/server/cs/package.xs b/packages/ti/sdo/server/cs/package.xs
+--- a/packages/ti/sdo/server/cs/package.xs	2011-08-07 20:09:31.000000000 +0200
++++ b/packages/ti/sdo/server/cs/package.xs	2011-08-07 20:08:21.000000000 +0200
+@@ -7,7 +7,7 @@
+     // Each codec is validated with the following call:
+     //    validate_one_codec(<package name>, <module name>);
+ 
+-         validate_one_codec( "ti.c6accel", "C6ACCEL" );
++//         validate_one_codec( "ti.c6accel", "C6ACCEL" );
+          validate_one_codec( "ti.sdo.codecs.aachedec", "AACHEDEC" );
+          validate_one_codec( "ti.sdo.codecs.deinterlacer", "I2P" );
+          validate_one_codec( "ti.sdo.codecs.g711dec", "G711DEC" );
diff --git a/recipes-ti/codec-engine/ti-codecs-omap3530_4.00.00.00.bb b/recipes-ti/codec-engine/ti-codecs-omap3530_4.00.00.00.bb
index f0079794..0bacf91d 100644
--- a/recipes-ti/codec-engine/ti-codecs-omap3530_4.00.00.00.bb
+++ b/recipes-ti/codec-engine/ti-codecs-omap3530_4.00.00.00.bb
@@ -10,6 +10,8 @@ PR_append = "a"
 
 PV="4_00_00_00"
 
+LIC_FILES_CHKSUM = "file://packages/ti/sdo/server/cs/docs/cs1omap3530_software_manifest.pdf;md5=84444ba7c7abe117c30f9c960d1930ec"
+
 CODEC_SUITE_NAME="${WORKDIR}/${PN}_${PV}"
 
 SRCREV = "8393c892b09e0ac42b19ff1531e232478c3b1a6c"
@@ -27,7 +29,8 @@ SRC_URI="http://software-dl.ti.com/dsps/dsps_public_sw/codecs/OMAP35xx//OMAP35xx
     http://software-dl.ti.com/dsps/dsps_public_sw/codecs/C64XPlus_Speech//C64XPlus_Speech_latest/c64xplus_g711_1_12_00_000_production.bin;name=g711 \
     http://software-dl.ti.com/dsps/dsps_public_sw/sdo_tii/OMAP35xx_DM37xx_C64xPLUS_Algorithms/01_00_00_07//exports/c64xplus_deinterlacer_01_00_00_07_production.bin;name=i2p \
     git://arago-project.org/git/projects/codec-servers.git;protocol=git \
-
+    \
+    file://disable-c6accel.diff \
 "
 
 SRC_URI[h264enc.md5sum] = "4a7a4698b1db360fe103aae76127a4ec"
@@ -65,7 +68,7 @@ TI_BIN_UNPK_CMDS = "Y:workdir"
 
 S = "${CODEC_SUITE_NAME}"
 
-DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils ti-c6accel"
+DEPENDS = "ti-cgt6x ti-xdctools ti-dspbios ti-codec-engine ti-linuxutils"
 
 #generic codec
 DSPSUFFIX_omap3530 = "x64P"