[oe-commits] Diego Dompe : dmai 1.20: more fixes

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 182006f3a2f2cab885593285b1d08425957651e7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=182006f3a2f2cab885593285b1d08425957651e7

Author: Diego Dompe <diego.dompe at ridgerun.com>
Date:   Fri Feb 13 14:49:20 2009 -0600

dmai 1.20: more fixes
gstreamer-ti: adapt SRCREV to match dmai fixes

---

 packages/dsplink/dmai_1.20.bb                |    6 ++----
 packages/dsplink/files/update-cpu-name.patch |    8 ++++----
 packages/dsplink/gstreamer-ti_svn.bb         |    2 +-
 packages/dsplink/ti-paths.inc                |    5 +++++
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/dsplink/dmai_1.20.bb b/packages/dsplink/dmai_1.20.bb
index f4e6a4e..71e1d01 100644
--- a/packages/dsplink/dmai_1.20.bb
+++ b/packages/dsplink/dmai_1.20.bb
@@ -22,15 +22,13 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 TARGET = "all"
 TARGET_neuros-osd2 = " dm6446_al dm6446_db"
-TARGET_beagleboard = " o3530_al o3530_db"
-
-export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools"
+TARGET_beagleboard = " o3530_al"
 
 do_compile() {
 	cd packages/ti/sdo/dmai
 	oe_runmake clean
 	oe_runmake ${TARGET}
-	cd packages/ti/sdo/dmai/apps
+	cd apps
 	oe_runmake clean
 	oe_runmake ${TARGET}
 }
diff --git a/packages/dsplink/files/update-cpu-name.patch b/packages/dsplink/files/update-cpu-name.patch
index f9905f5..052a8e3 100644
--- a/packages/dsplink/files/update-cpu-name.patch
+++ b/packages/dsplink/files/update-cpu-name.patch
@@ -1,14 +1,14 @@
 Index: dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Cpu.c
 ===================================================================
---- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Cpu.c	2009-02-11 18:08:50.000000000 -0600
-+++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Cpu.c	2009-02-11 18:11:41.000000000 -0600
+--- dmai_1_20_00_06.orig/packages/ti/sdo/dmai/linux/Cpu.c	2009-02-12 09:34:22.000000000 -0600
++++ dmai_1_20_00_06/packages/ti/sdo/dmai/linux/Cpu.c	2009-02-12 09:34:51.000000000 -0600
 @@ -103,7 +103,10 @@
      else if (strcmp(valBuf, "DM357 EVM") == 0) { 
          *device = Cpu_Device_DM6446;
      }
 -    else if (strcmp(valBuf, "OMAP3EVM Board") == 0) {
-+    else if ((strcmp(valBuf, "OMAP3EVM Board") == 0)
-+	     (strcmp(valBuf, "OMAP3 EVM") == 0)
++    else if ((strcmp(valBuf, "OMAP3EVM Board") == 0) ||
++	     (strcmp(valBuf, "OMAP3 EVM") == 0) ||
 +	     (strcmp(valBuf, "OMAP3 Beagle Board") == 0)
 +	    ){
          *device = Cpu_Device_OMAP3530;
diff --git a/packages/dsplink/gstreamer-ti_svn.bb b/packages/dsplink/gstreamer-ti_svn.bb
index 9c22734..c4be68c 100644
--- a/packages/dsplink/gstreamer-ti_svn.bb
+++ b/packages/dsplink/gstreamer-ti_svn.bb
@@ -1,7 +1,7 @@
 DEPENDS = "codec-engine dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly libid3tag liboil libmad"
 
 SRC_URI = "svn://omapzoom.org/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https"
-SRCREV = "43"
+SRCREV = "87"
 
 # Again, no '.' in PWD allowed :(
 PV = "0+svnr${SRCREV}"
diff --git a/packages/dsplink/ti-paths.inc b/packages/dsplink/ti-paths.inc
index ca9a9e6..eec3602 100644
--- a/packages/dsplink/ti-paths.inc
+++ b/packages/dsplink/ti-paths.inc
@@ -22,6 +22,11 @@ export BIOS_INSTALL_DIR=${TITOOLSDIR}/${TIBIOSDIR}
 export CGTOOLS_V5T="${CROSS_DIR}"
 export CC_V5T="bin/${TARGET_PREFIX}gcc"
 export MVTOOL_PREFIX="${TARGET_PREFIX}"
+export CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/codecengine/cetools"
+export MVTOOL_DIR="${CROSS_DIR}"
+export CSTOOL_DIR="${CROSS_DIR}"
+export LINUXKERNEL_INSTALL_DIR=${STAGING_KERNEL_DIR}
+
 
 # This tells codec engine which targets to build
 DEVICES ?= "DM6446"