diff options
| author | Luke Gox <luke@box0.(none)> | 2009-04-09 20:07:55 +0200 |
|---|---|---|
| committer | Luke Gox <luke@box0.(none)> | 2009-04-09 20:07:55 +0200 |
| commit | b2418f27304b215acd011f0b3e4f258329f21545 (patch) | |
| tree | 58361e035aa81827d57c3ee9f39dfcf0f105d5c4 /recipes/dsplink | |
| parent | 6255cd11b01d03599cb9c1e9391c8c5da1467af2 (diff) | |
| parent | cf68d88dc9a23665ac8cb8bf7599d4f210d52718 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/dsplink')
| -rw-r--r-- | recipes/dsplink/gstreamer-ti_svn.bb | 2 | ||||
| -rw-r--r-- | recipes/dsplink/ti-codec-engine_2.21.bb | 1 | ||||
| -rw-r--r-- | recipes/dsplink/ti-codec-engine_2.23.bb | 1 | ||||
| -rw-r--r-- | recipes/dsplink/ti-dmai_svn.bb | 7 |
4 files changed, 7 insertions, 4 deletions
diff --git a/recipes/dsplink/gstreamer-ti_svn.bb b/recipes/dsplink/gstreamer-ti_svn.bb index ab705f3622..6944ad59b8 100644 --- a/recipes/dsplink/gstreamer-ti_svn.bb +++ b/recipes/dsplink/gstreamer-ti_svn.bb @@ -4,7 +4,7 @@ SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto= " SRCREV = "160" -PR = "r7" +PR = "${MACHINE_KERNEL_PR}" # Again, no '.' in PWD allowed :( PV = "0+svnr${SRCREV}" diff --git a/recipes/dsplink/ti-codec-engine_2.21.bb b/recipes/dsplink/ti-codec-engine_2.21.bb index 5b1d5e0b6b..f0b0d7e1ce 100644 --- a/recipes/dsplink/ti-codec-engine_2.21.bb +++ b/recipes/dsplink/ti-codec-engine_2.21.bb @@ -8,7 +8,6 @@ RDEPENDS = "update-modules" inherit module # tconf from xdctools dislikes '.' in pwd :/ -PR = "r19" PV = "221" # Get CE tarball from TI website, place in sources and calculate diff --git a/recipes/dsplink/ti-codec-engine_2.23.bb b/recipes/dsplink/ti-codec-engine_2.23.bb index a42c33bcdd..bbf54d4ff9 100644 --- a/recipes/dsplink/ti-codec-engine_2.23.bb +++ b/recipes/dsplink/ti-codec-engine_2.23.bb @@ -9,7 +9,6 @@ inherit module DEFAULT_PREFERENCE = "-1" # tconf from xdctools dislikes '.' in pwd :/ -PR = "r0" PV = "223" # Get CE tarball from TI website, place in sources and calculate md5sum diff --git a/recipes/dsplink/ti-dmai_svn.bb b/recipes/dsplink/ti-dmai_svn.bb index bcbaea8f65..ed9cc01a50 100644 --- a/recipes/dsplink/ti-dmai_svn.bb +++ b/recipes/dsplink/ti-dmai_svn.bb @@ -2,6 +2,8 @@ DESCRIPTION = "Davinci (and OMAP) Multimedia Application Interface" DEPENDS = "virtual/kernel ti-codec-engine ti-codec-combos" LICENCE = "unknown" +inherit module-base + require ti-paths.inc SRC_URI = "svn://gforge.ti.com/svn/dmai/branches;module=BRIJESH_GIT_022309;proto=https;user=anonymous;pswd='' \ @@ -15,7 +17,6 @@ SRCREV = "36" S = "${WORKDIR}/BRIJESH_GIT_022309/davinci_multimedia_application_interface/dmai" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "120+svnr${SRCREV}" -PR = "r16" TARGET = "all" TARGET_neuros-osd2 = " dm6446_al dm6446_db" @@ -30,6 +31,10 @@ export FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/ce export CODEC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combos" do_compile() { + if [ $(echo ${KERNEL_VERSION} | cut -c5,6) -gt 28 ] ; then + sed -i -e s:mach/omapfb:linux/omapfb:g packages/ti/sdo/dmai/linux/Display_fbdev.c + fi + cd packages/ti/sdo/dmai oe_runmake clean oe_runmake ${TARGET} C_FLAGS="-O2 -I${STAGING_INCDIR}" |