From 572bf3a1535ae85b9b8502d29979615725dc7f4b Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 12 Jun 2009 13:49:22 +0900 Subject: preferred-xorg-versions-X11R7.4.inc: pin xextproto-native and xtrans-native * xextproto-native: 7.0.3 * xtrans: 1.2.1 --- conf/distro/include/preferred-xorg-versions-X11R7.4.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc index 46fa8d496a..21f9758f0e 100644 --- a/conf/distro/include/preferred-xorg-versions-X11R7.4.inc +++ b/conf/distro/include/preferred-xorg-versions-X11R7.4.inc @@ -195,6 +195,7 @@ PREFERRED_VERSION_xtrans ?= "1.2.1" # This should be here but is needed until bitbake can do # versioned depends PREFERRED_VERSION_mesa ?= "7.2" +PREFERRED_VERSION_xtrans-native ?= "1.2.1" # proto PREFERRED_VERSION_applewmproto ?= "1.0.3" @@ -218,6 +219,7 @@ PREFERRED_VERSION_videoproto ?= "2.2.2" PREFERRED_VERSION_windowswmproto ?= "1.0.3" PREFERRED_VERSION_xmiscproto ?= "1.1.2" PREFERRED_VERSION_xextproto ?= "7.0.3" +PREFERRED_VERSION_xextproto-native ?= "7.0.3" PREFERRED_VERSION_xf86dgaproto ?= "2.0.3" PREFERRED_VERSION_xf86driproto ?= "2.0.4" PREFERRED_VERSION_xf86miscproto ?= "0.9.2" -- cgit v1.2.3 From f73c64e7295be1e1065f898b49f50a02e812161c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 23 Aug 2009 19:24:57 -0700 Subject: base.bbclass: Replace os.system with subprocess call. Often gzip is reporting broken pipe errors with do_unpack of tar.gz files. If you use the commands described above to extract a tar.gz file, gzip sometimes emits a Broken pipe error message. This can safely be ignored if tar extracted all files without any other error message. We do not let python install its SIGPIPE handler and use subprocess call to invoke the command. This is based on the following python bug report. http://bugs.python.org/issue1652 Signed-off-by: Khem Raj --- classes/base.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 598a7bb77f..4e9b65c285 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -728,9 +728,14 @@ base_do_buildall() { : } +def subprocess_setup(): + import signal, subprocess + # Python installs a SIGPIPE handler by default. This is usually not what + # non-Python subprocesses expect. + signal.signal(signal.SIGPIPE, signal.SIG_DFL) def oe_unpack_file(file, data, url = None): - import bb, os + import bb, os, signal, subprocess if not url: url = "file://%s" % file dots = file.split(".") @@ -799,7 +804,7 @@ def oe_unpack_file(file, data, url = None): cmd = "PATH=\"%s\" %s" % (bb.data.getVar('PATH', data, 1), cmd) bb.note("Unpacking %s to %s/" % (base_path_out(file, data), base_path_out(os.getcwd(), data))) - ret = os.system(cmd) + ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True) os.chdir(save_cwd) -- cgit v1.2.3 From 40cc71035c6149e0e36d9486ec9d6b7933619660 Mon Sep 17 00:00:00 2001 From: Evan Doiron Date: Tue, 25 Aug 2009 12:24:08 -0400 Subject: rsync: add v3.0.6 Signed-off-by: Evan Doiron Signed-off-by: Michael Smith Acked-by: Khem Raj --- conf/checksums.ini | 4 ++++ recipes/rsync/rsync_3.0.6.bb | 10 ++++++++++ 2 files changed, 14 insertions(+) create mode 100644 recipes/rsync/rsync_3.0.6.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index ab8b320cb5..46ac3884cc 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -21722,6 +21722,10 @@ sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169 md5=2122d460b4119749c6e5993938a9b501 sha256=17697db5bb9de399b71f7927070f60b3554b70b0ecc0419b50455d56560ea169 +[http://rsync.samba.org/ftp/rsync/src/rsync-3.0.6.tar.gz] +md5=e9865d093a18e4668b9d31b635dc8e99 +sha256=33cc969364cb66b3e345fa7db2c651a8e07de0e58743ec03899c4ba86953e1b3 + [http://downloads.sourceforge.net/nogravity/rt-nogravity-data.zip] md5=c7536e907363ea1da63430b49e42931d sha256=d7d5a3d17f492049fceb2b9ea22c4c2af7243506219d83f7005b77ae410add29 diff --git a/recipes/rsync/rsync_3.0.6.bb b/recipes/rsync/rsync_3.0.6.bb new file mode 100644 index 0000000000..f2a8eee3fb --- /dev/null +++ b/recipes/rsync/rsync_3.0.6.bb @@ -0,0 +1,10 @@ +require rsync.inc + +SRC_URI += "\ + file://m4.patch;patch=1 \ + file://rsyncd.conf \ +" +# The source tarball from 3.0.6 seems to need this +do_configure_append(){ + oe_runmake reconfigure +} -- cgit v1.2.3 From 482e70f47fed52f27c83cc41e6bdeeb8ad36c779 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 26 Aug 2009 03:58:03 -0700 Subject: package_ipk.bbclass: don't choke on empty SRC_URI. Signed-off-by: Chris Larson --- classes/package_ipk.bbclass | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index e3a7522619..e5561082fd 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -266,10 +266,9 @@ python do_package_ipk () { ctrlfile.write("Replaces: %s\n" % ", ".join(rreplaces)) if rconflicts: ctrlfile.write("Conflicts: %s\n" % ", ".join(rconflicts)) - src_uri = bb.data.getVar("SRC_URI", localdata, 1) - if src_uri: - src_uri = re.sub("\s+", " ", src_uri) - ctrlfile.write("Source: %s\n" % " ".join(src_uri.split())) + src_uri = bb.data.getVar("SRC_URI", localdata, 1) or d.getVar("FILE", True) + src_uri = re.sub("\s+", " ", src_uri) + ctrlfile.write("Source: %s\n" % " ".join(src_uri.split())) ctrlfile.close() for script in ["preinst", "postinst", "prerm", "postrm"]: -- cgit v1.2.3 From 4dc61b382a9e13b3271c69ff6fcbf69432273172 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 26 Aug 2009 03:58:24 -0700 Subject: srctree.bbclass: add initial version. This enables operation inside of an existing source tree for a project, rather than using the fetch/unpack/patch idiom. By default, it expects that you're keeping the recipe(s) inside the aforementioned source tree, but you could override S to point at an external directory and place the recipes in a normal collection/overlay, if you so chose. It also provides some convenience python functions for assembling your do_clean, if you want to leverage things like 'git clean' to simplify the operation. Signed-off-by: Chris Larson --- classes/srctree.bbclass | 141 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 classes/srctree.bbclass diff --git a/classes/srctree.bbclass b/classes/srctree.bbclass new file mode 100644 index 0000000000..2a324cf1be --- /dev/null +++ b/classes/srctree.bbclass @@ -0,0 +1,141 @@ +# Copyright (C) 2009 Chris Larson +# Released under the MIT license (see COPYING.MIT for the terms) +# +# srctree.bbclass enables operation inside of an existing source tree for a +# project, rather than using the fetch/unpack/patch idiom. +# +# By default, it expects that you're keeping the recipe(s) inside the +# aforementioned source tree, but you could override S to point at an external +# directory and place the recipes in a normal collection/overlay, if you so +# chose. +# +# It also provides some convenience python functions for assembling your +# do_clean, if you want to leverage things like 'git clean' to simplify the +# operation. + + +S = "${FILE_DIRNAME}" +SRC_URI = "" + +#TYPE = "${@'${PN}'.replace('${BPN}', '').strip()}" +#WORKDIR = "${S}/tmp${TYPE}.${MULTIMACH_HOST_SYS}" +#STAMP = "${WORKDIR}/tasks/stamp" +#WORKDIR_LOCAL = "${S}/tmp${TYPE}.${MULTIMACH_HOST_SYS}" +#T = "${WORKDIR_LOCAL}/bitbake-tasks" + +# Hack, so things don't explode in builds that don't inherit package +do_package ?= " pass" +do_package[func] = "1" +do_package[python] = "1" + +# Ensure that do_package depends on populate_staging, rather than install +addtask package after do_populate_staging + +# This stuff is needed to facilitate variants (normal, native, cross, sdk) +# that share a ${S}. It's ugly as hell. Only really necessary for recipes +# that can't use a ${B}, and which have variants like native. Not sure what +# the best solution is long term. +# +# We merge configure+compile+install into the populate_staging task, uses a +# lock file. This ensures that none of the tasks which access ${S} can +# interleave amongst the recipes that share that ${S}. + +def variant_hack(d): + from itertools import chain + + # Kill dependencies on the fromtasks + fromtasks = ["do_configure", "do_compile", "do_install"] + for key in d.keys(): + task = d.getVarFlag(key, "task") + if task: + deps = d.getVarFlag(key, "deps") + for task_ in fromtasks: + if task_ in deps: + deps.remove(task_) + # if not key in fromtasks + ["do_populate_staging"]: + # deps.append("do_populate_staging") + d.setVarFlag(key, "deps", deps) + + # Pull the task deps from fromtasks over to the new task, minus deltasks + deltasks = ("do_patch", "do_unpack", "do_fetch") + deps = set(chain(*[(d.getVarFlag(old, "deps")) for old in fromtasks + ["do_populate_staging"]])) + d.setVarFlag("do_populate_staging", "deps", deps.difference(deltasks)) + + # Pull cross recipe task deps over + d.setVarFlag("do_populate_staging", "depends", " ".join((d.getVarFlag(old, "depends") or "" for old in fromtasks))) + +python () { + variant_hack(d) +} + +python do_populate_staging () { + from bb.build import exec_task, exec_func + + exec_task("do_configure", d) + exec_task("do_compile", d) + exec_task("do_install", d) + exec_func("do_stage", d) +} +do_populate_staging[lockfiles] += "${S}/.lock" + +make_do_clean () { + oe_runmake clean +} + +def clean_builddir(d): + from shutil import rmtree + + builddir = d.getVar("B", True) + srcdir = d.getVar("S", True) + if builddir != srcdir: + rmtree(builddir, ignore_errors=True) + +def clean_stamps(d): + from glob import glob + from bb import note + from bb.data import expand + from os import unlink + + note("Removing stamps") + for stamp in glob(expand('${STAMP}.*', d)): + try: + unlink(stamp) + except OSError: + pass + +def clean_workdir(d): + from shutil import rmtree + from bb import note + + workdir = d.getVar("WORKDIR", 1) + note("Removing %s" % workdir) + rmtree(workdir, ignore_errors=True) + +def clean_git(d): + from subprocess import call + + call(["git", "clean", "-d", "-f", "-X"], cwd=d.getVar("S", True)) + +def clean_make(d): + import bb + + bb.note("Running make clean") + try: + bb.build.exec_func("make_do_clean", d) + except bb.build.FuncFailed: + pass + +python do_clean () { + from os.path import exists + from bb.build import FuncFailed + from bb.data import expand + + clean_stamps(d) + clean_workdir(d) + if exists(expand("${S}/.git", d)) and \ + exists(expand("${S}/.gitignore", d)): + clean_git(d) + else: + clean_builddir(d) + clean_make(d) +} -- cgit v1.2.3 From e5b751653cb17d60665a648c8f9aaeda028aa122 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 26 Aug 2009 03:59:25 -0700 Subject: gitver.bbclass: add initial version. This provides a GITVER variable which is a (fairly) sane version, for use in ${PV}, extracted from the ${S} git checkout, assuming it is one. This is most useful in concert with srctree.bbclass. Signed-off-by: Chris Larson --- classes/gitver.bbclass | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 classes/gitver.bbclass diff --git a/classes/gitver.bbclass b/classes/gitver.bbclass new file mode 100644 index 0000000000..92c053ae24 --- /dev/null +++ b/classes/gitver.bbclass @@ -0,0 +1,54 @@ +# Copyright (C) 2009 Chris Larson +# Released under the MIT license (see COPYING.MIT for the terms) +# +# gitver.bbclass provides a GITVER variable which is a (fairly) sane version, +# for use in ${PV}, extracted from the ${S} git checkout, assuming it is one. +# This is most useful in concert with srctree.bbclass. + + +GITVER = "${@get_git_pv('${S}', d)}" + +def gitver_mark_dependency(d): + from bb.data import expand + from bb.parse import mark_dependency + from os.path import abspath + + fn = abspath(expand("${S}/.git/HEAD", d)) + mark_dependency(d, fn) + +def get_git_pv(path, d, tagadjust=None): + from subprocess import Popen, PIPE + from os.path import join + from bb import error + + env = {"GIT_DIR": join(d.getVar("S", True), ".git")} + + def popen(cmd, **kwargs): + kwargs["stderr"] = PIPE + kwargs["stdout"] = PIPE + kwargs["env"] = env + try: + pipe = Popen(cmd, **kwargs) + except OSError, e: + #error("Execution of %s failed: %s" % (cmd, e)) + return + + (stdout, stderr) = pipe.communicate(None) + if pipe.returncode != 0: + #error("Execution of %s failed: %s" % (cmd, stderr)) + return + return stdout.rstrip() + + gitver_mark_dependency(d) + + ver = popen(["git", "describe", "--tags"], cwd=path) + if not ver: + ver = popen(["git", "rev-parse", "--short", "HEAD"], cwd=path) + if ver: + return "0.0-%s" % ver + else: + return "0.0" + else: + if tagadjust: + ver = tagadjust(ver) + return ver -- cgit v1.2.3 From af56cd467bcc76f5499199fb1f14252abe1e1e2a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 26 Aug 2009 00:38:30 -0700 Subject: base.bbclass: Remove redundant import of subprocess and signal. Signed-off-by: Khem Raj --- classes/base.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 4e9b65c285..a350b38850 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -729,13 +729,13 @@ base_do_buildall() { } def subprocess_setup(): - import signal, subprocess + import signal # Python installs a SIGPIPE handler by default. This is usually not what # non-Python subprocesses expect. signal.signal(signal.SIGPIPE, signal.SIG_DFL) def oe_unpack_file(file, data, url = None): - import bb, os, signal, subprocess + import bb, os, subprocess if not url: url = "file://%s" % file dots = file.split(".") -- cgit v1.2.3 From bac5eef9c8a73672ee114926011addabb36610eb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 26 Aug 2009 11:34:23 +0200 Subject: dvsdk: merge in new versions from arago and clean them up a bit --- conf/checksums.ini | 28 +++++ recipes/dvsdk/README | 30 +++++ .../files/cmem-remove-show-pte-function.patch | 56 +++++++++ recipes/dvsdk/files/dvsdk-rules/Makefile | 119 ++++++-------------- recipes/dvsdk/files/gstreamer-ti-tracker-824.patch | 125 +++++++++++++++++++++ .../gstreamer-ti/codec_combo_directory_fix.patch | 12 +- recipes/dvsdk/gstreamer-ti_svn.bb | 46 ++------ recipes/dvsdk/readme.txt | 5 - recipes/dvsdk/ti-cgt6x-native_6.0.21.bb | 4 +- recipes/dvsdk/ti-cgt6x-native_6.1.9.bb | 22 ++++ recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb | 26 ----- recipes/dvsdk/ti-cmem-module_2.23.1.bb | 7 +- recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb | 34 ------ recipes/dvsdk/ti-codec-combo-dm355_1.13.bb | 15 +-- recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb | 31 ----- recipes/dvsdk/ti-codec-combo-dm6446.inc | 39 +++++++ recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb | 38 ++++--- .../dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb | 35 ------ recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb | 40 +++---- recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb | 23 ++++ recipes/dvsdk/ti-codec-combos_3.16.bb | 1 - recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb | 50 --------- recipes/dvsdk/ti-codec-engine_2.23.1.bb | 2 + recipes/dvsdk/ti-codec-engine_2.24.01.bb | 94 ++++++++++++++++ recipes/dvsdk/ti-cs1-omap3530.inc | 41 +++++++ recipes/dvsdk/ti-cs1-omap3530_1.0.1.bb | 53 +++++++++ recipes/dvsdk/ti-dm355mm-module_1.13.bb | 5 +- recipes/dvsdk/ti-dmai-sdk_svn.bb | 21 ---- recipes/dvsdk/ti-dmai.inc | 8 +- recipes/dvsdk/ti-dmai_svn.bb | 57 +++++----- recipes/dvsdk/ti-dspbios-native_5.33.02.bb | 6 +- recipes/dvsdk/ti-dspbios-native_5.33.04.bb | 22 ++++ recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb | 26 ----- recipes/dvsdk/ti-dsplink-module_1.61.3.bb | 50 +++++---- recipes/dvsdk/ti-lpm-module_2.23.1.bb | 4 +- recipes/dvsdk/ti-paths.inc | 72 ++++-------- recipes/dvsdk/ti-rules-make-sdk.bb | 63 ----------- recipes/dvsdk/ti-sdma-module_2.23.1.bb | 5 +- recipes/dvsdk/ti-xdctools-native_3.10.03.bb | 2 + recipes/dvsdk/ti-xdctools-native_3.15.01.59.bb | 22 ++++ recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb | 25 ----- 41 files changed, 756 insertions(+), 608 deletions(-) create mode 100644 recipes/dvsdk/README create mode 100644 recipes/dvsdk/files/cmem-remove-show-pte-function.patch create mode 100644 recipes/dvsdk/files/gstreamer-ti-tracker-824.patch delete mode 100644 recipes/dvsdk/readme.txt create mode 100644 recipes/dvsdk/ti-cgt6x-native_6.1.9.bb delete mode 100644 recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb delete mode 100644 recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb delete mode 100644 recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb create mode 100644 recipes/dvsdk/ti-codec-combo-dm6446.inc delete mode 100644 recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb create mode 100644 recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb delete mode 100644 recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb create mode 100644 recipes/dvsdk/ti-codec-engine_2.24.01.bb create mode 100644 recipes/dvsdk/ti-cs1-omap3530.inc create mode 100644 recipes/dvsdk/ti-cs1-omap3530_1.0.1.bb delete mode 100644 recipes/dvsdk/ti-dmai-sdk_svn.bb create mode 100644 recipes/dvsdk/ti-dspbios-native_5.33.04.bb delete mode 100644 recipes/dvsdk/ti-dspbios-sdk_5.33.02.bb delete mode 100644 recipes/dvsdk/ti-rules-make-sdk.bb create mode 100644 recipes/dvsdk/ti-xdctools-native_3.15.01.59.bb delete mode 100644 recipes/dvsdk/ti-xdctools-sdk_3.10.03.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 46ac3884cc..4fd52bbef2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2730,6 +2730,10 @@ sha256=18f72b922a9a346f6c43b20fd86eba76cfd27a8d118ea32fa879050ddebe0267 md5=64f61b08d091625c0912cb9de33242af sha256=506e07715028811b8d945c85c54ae07bc33bdd8afff1611cbb30d154ba86d04e +[http://install.source.dir.com/bios_setuplinux_5_33_04.bin] +md5=fcffe1618f20024fd6580f47cdc0059b +sha256=2c1e7feec569a19d3093b136da6aa03574f94052810fe7a78cc81eb37adda24b + [ftp://ftp.gnu.org/gnu/bison/bison-2.0.tar.gz] md5=c17f964fd5504b88b07a183420de25e3 sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1 @@ -4282,6 +4286,10 @@ sha256=8b718c344cf19417447cbc16867d2e04434654c13b330598b96720ead146b961 md5=0aa2f94c39123f1a0352983e5366179c sha256=4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4 +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/latest//exports/cs1omap3530_setuplinux_1_00_01.bin] +md5=779415872c771b580e4c6d10346b3a79 +sha256=0903c37aaa9ced2c12a9e7d4a418b7d57d5a92a0f1451afd29f70bd0da240bc8 + [http://downloads.sourceforge.net/cscope/cscope-15.5.tar.gz] md5=beb6032a301bb11524aec74bfb5e4840 sha256=be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 @@ -4978,6 +4986,10 @@ sha256=39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4 md5=f6221188bea76b7aaf0c45e9bcf26329 sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61 +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin] +md5=2ce99015bb1ed1df0491403c5e8d99fb +sha256=6467ea4854abbff3cbc224df1f163d01c7fb387f15483129a40a1f68e6742b62 + [http://dmalloc.com/releases/dmalloc-5.5.2.tgz] md5=f92e5606c23a8092f3d5694e8d1c932e sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a @@ -5214,6 +5226,10 @@ sha256=15dd793e32fc9aba1266c2ccb8e98856c61be2e9de214285aa09152a47da1836 md5=2b53c067c683266379dddbb38e65cb45 sha256=b1a0508444241c61585321eaadc32f476ef441f267636fbd0fb2f0c7ebf0fcbb +[http://install.source.dir.com/dsplink_1_61_03.tar.gz] +md5=9df12389c8b955b5f8cfefe6df20b1d6 +sha256=1037b9cb872590356d055dbf8006e25d68370721e0e5b4518529495db6de70d9 + [http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/dt/dt-source.tar.gz] md5=5776233a2d301a50b314306538257a45 sha256=2f27fda643093e07161d128a9cc23cf30c0387f87cd911b904d84217f60a9a2a @@ -21978,6 +21994,10 @@ sha256=e8890518a8818e72d44daa1448246df8a6b5958215835f4c72abc833077d1f68 md5=86a847f3128a43a9cf23b7029a656f50 sha256=0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732 +[http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2] +md5=ceef10579a75c92483171f3bd7f77df2 +sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7 + [http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2] md5=ceef10579a75c92483171f3bd7f77df2 sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7 @@ -23762,6 +23782,10 @@ sha256=6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f md5=5bfeaacb628b56005a8865a177af01e4 sha256=fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a +[http://install.source.dir.com/ti_cgt_c6000_6.1.9_setup_linux_x86.bin] +md5=8354845032c0ce8e3da3f250505d0e21 +sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0 + [http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz] md5=5a085296b1147fe970a256a9b2d0f91f sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34 @@ -25634,6 +25658,10 @@ sha256=4511dc4df6ebb320a4a516b3b712c86f6924e5ee9832618f58ebba06c64712ea md5=8f0f8af016b97fb612ec11afaaf5a9e7 sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15//exports/xdctools_setuplinux_3_15_01_59.bin] +md5=c7cd094cdc49459018b6f0e1eb95af30 +sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23 + [http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2] md5=b3884eaec59a63691f66bc29ce57a56d sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22 diff --git a/recipes/dvsdk/README b/recipes/dvsdk/README new file mode 100644 index 0000000000..fa1b481f68 --- /dev/null +++ b/recipes/dvsdk/README @@ -0,0 +1,30 @@ +Depending on platform you need to download one or more components from the external URL and put in downloads directory. + +DM355 +----- + - Code Engine 2.24 + +OMAP3530/DM6446 +------ + - Code Engine 2.24 + - DSP/BIOS Link for Linux 1.61.03 + - DSP/BIOS 5.33.04 + - C6000 Code Generation Tools v6.1.9 Linux + +URL's: +------ +* CE 2.24 (codec_engine_2_24.tar.gz) + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/CE/ce_2_24/index.html + +* DSP/BIOS 5.33.04 (bios_setuplinux_5_33_04.bin) + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/bios/bios_5_33/bios_5_33_04/index_external.html + +* DSP/BIOS Link for Linux 1.61.03 (dsplink_1_61_03.tar.gz) + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/link/link_1_60/index.html + +* C6000 Code Generation Tools v6.1.9 Linux (ti_cgt_c6000_6.1.9_setup_linux_x86.bin) + https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm + +* Generic download URI + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/ + diff --git a/recipes/dvsdk/files/cmem-remove-show-pte-function.patch b/recipes/dvsdk/files/cmem-remove-show-pte-function.patch new file mode 100644 index 0000000000..2d0fe672ef --- /dev/null +++ b/recipes/dvsdk/files/cmem-remove-show-pte-function.patch @@ -0,0 +1,56 @@ +--- codec_engine_2_23_01/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.c 2009-04-20 14:43:31.000000000 -0400 ++++ codec_engine_2_23_01.new/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.c 2009-07-28 10:48:38.000000000 -0400 +@@ -1018,53 +1018,6 @@ + } + + +-/* +- * This is useful to dump out the page tables associated with +- * 'addr' in mm 'mm'. +- */ +-void show_pte(struct mm_struct *mm, unsigned long addr) +-{ +- pgd_t *pgd; +- +- if (!mm) +- mm = &init_mm; +- +- printk(KERN_ALERT "pgd = %p\n", mm->pgd); +- pgd = pgd_offset(mm, addr); +- printk(KERN_ALERT "[%08lx] *pgd=%08lx", addr, pgd_val(*pgd)); +- +- do { +- pmd_t *pmd; +- pte_t *pte; +- +- if (pgd_none(*pgd)) +- break; +- +- if (pgd_bad(*pgd)) { +- printk("(bad)"); +- break; +- } +- +- pmd = pmd_offset(pgd, addr); +- +- if (pmd_none(*pmd)) +- break; +- +- if (pmd_bad(*pmd)) { +- printk("(bad)"); +- break; +- } +- +- /* We must not map this if we have highmem enabled */ +- pte = pte_offset_map(pmd, addr); +- printk(", *pte=%08lx", pte_val(*pte)); +- printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE])); +- pte_unmap(pte); +- } while(0); +- +- printk("\n"); +-} +- + static int set_noncached(struct vm_area_struct *vma) + { + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); diff --git a/recipes/dvsdk/files/dvsdk-rules/Makefile b/recipes/dvsdk/files/dvsdk-rules/Makefile index edb74e0999..bc1eabf249 100644 --- a/recipes/dvsdk/files/dvsdk-rules/Makefile +++ b/recipes/dvsdk/files/dvsdk-rules/Makefile @@ -6,20 +6,20 @@ REPOSITORIES:=$(addsuffix /packages, $(COMPONENTS)) CHECKLIST:=$(REPOSITORIES) $(CODEGEN_INSTALL_DIR)/bin/cl6x $(MVTOOL_PREFIX)gcc $(LINUXKERNEL_INSTALL_DIR)/Documentation $(DEMO_INSTALL_DIR)/$(PLATFORM) $(PSP_INSTALL_DIR)/docs -.PHONY: all clean everything clobber help cmem cmem_clean dmai dmai_clean demos demos_clean examples examples_clean dvtb dvtb_clean dm355mm dm355mm_clean dsplink dsplink_arm dsplink_dsp dsplink_samples dsplink_clean codecs codecs_clean linux linux_clean psp_examples psp_clean info check install +.PHONY: all clean everything clobber help cmem cmem_clean dmai dmai_clean dm355mm dm355mm_clean dsplink dsplink_arm dsplink_dsp dsplink_samples dsplink_clean codecs codecs_clean linux linux_clean info check install #============================================================================== # Set up platform dependent variables. #============================================================================== ifeq ($(PLATFORM),dm6446) -LINUXKERNEL_CONFIG=davinci_dm644x_defconfig +LINUXKERNEL_CONFIG=davinci_all_defconfig LINUXSAMPLES_PLATFORM=dm644x DSPLINK_CONFIG=--platform=DAVINCI --nodsp=1 --dspcfg_0=DM6446GEMSHMEM --dspos_0=DSPBIOS5XX --gppos=MVL5G --comps=ponslrm DSPLINK_MODULE=$(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/DAVINCI/RELEASE/dsplinkk.ko DMAI_PLATFORM=dm6446_al else ifeq ($(PLATFORM),dm6467) -LINUXKERNEL_CONFIG=davinci_dm6467_defconfig +LINUXKERNEL_CONFIG=davinci_all_defconfig LINUXSAMPLES_PLATFORM=dm646x DSPLINK_CONFIG=--platform=DAVINCIHD --nodsp=1 --dspcfg_0=DM6467GEMSHMEM --dspos_0=DSPBIOS5XX --gppos=MVL5G --comps=ponslrm DSPLINK_MODULE=$(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/DAVINCIHD/RELEASE/dsplinkk.ko @@ -38,22 +38,22 @@ endif #============================================================================== # The default build target. #============================================================================== -all: check cmem dm355mm dmai demos examples dvtb +all: check cmem dm355mm dmai #============================================================================== # Clean up the targets built by 'make all'. #============================================================================== -clean: cmem_clean dm355mm_clean dmai_clean demos_clean examples_clean dvtb_clean +clean: cmem_clean dm355mm_clean dmai_clean #============================================================================== # Build everything rebuildable. #============================================================================== -everything: check codecs linux dsplink psp_examples all +everything: check codecs linux dsplink all #============================================================================== # Clean up all targets. #============================================================================== -clobber: clean dsplink_clean linux_clean codecs_clean psp_clean +clobber: clean dsplink_clean linux_clean codecs_clean #============================================================================== # A help message target. @@ -63,48 +63,36 @@ help: @echo "Available build targets are:" @echo @echo " check : Make sure Rules.make is set up properly" - @echo " info : List versions of DVSDK components" + @echo " info : List versions of DVSDK components" @echo @echo " all : Build the components below" @echo " clean : Remove files generated by the 'all' target" @echo - @echo " cmem : Build the CMEM kernel module for $(PLATFORM)" - @echo " cmem_clean : Remove generated cmem files." + @echo " cmem : Build the CMEM kernel module for $(PLATFORM)" + @echo " cmem_clean : Remove generated cmem files." @echo - @echo " dmai : Build DMAI for $(PLATFORM)_al" - @echo " dmai_clean : Remove generated DMAI files." - @echo - @echo " demos : Build the DVSDK demos for $(PLATFORM)" - @echo " demos_clean : Remove generated DVSDK demo files." - @echo - @echo " examples : Build examples for $(PLATFORM)" - @echo " examples_clean : Build examples for $(PLATFORM)" - @echo - @echo " dvtb : Build DVTB for $(PLATFORM)" - @echo " dvtb_clean : Remove generated DVTB files" + @echo " dmai : Build DMAI for $(PLATFORM)_al" + @echo " dmai_clean : Remove generated DMAI files." @echo @echo " dm355mm : Build the dm355mm kernel module" - @echo " dm355mm_clean : Remove generated dm355mm files" + @echo " dm355mm_clean : Remove generated dm355mm files" @echo @echo "The following targets have to be explicitly built and cleaned:" @echo - @echo " everything : Rebuild everything including below targets" + @echo " everything : Rebuild everything including below targets" @echo " clobber : Remove all generated files" @echo @echo " dsplink : Configure and build DSP Link for $(PLATFORM) ARM and DSP" - @echo " dsplink_arm : Configure and build DSP Link for $(PLATFORM) ARM" - @echo " dsplink_dsp : Configure and build DSP Link for $(PLATFORM) DSP" - @echo " dsplink_samples : Build DSP Link ARM and DSP sample applications for $(PLATFORM)" - @echo " dsplink_clean : Remove generated DSP Link files" + @echo " dsplink_arm : Configure and build DSP Link for $(PLATFORM) ARM" + @echo " dsplink_dsp : Configure and build DSP Link for $(PLATFORM) DSP" + @echo " dsplink_samples : Build DSP Link ARM and DSP sample applications " + @echo " dsplink_clean : Remove generated DSP Link files" @echo @echo " codecs : Build codec servers for $(PLATFORM)" - @echo " codecs_clean : Remove generated codec server files" + @echo " codecs_clean : Remove generated codec server files" @echo @echo " linux : Build Linux kernel uImage for $(PLATFORM)" - @echo " linux_clean : Remove generated Linux kernel files" - @echo - @echo " psp_examples : Build Linux examples for $(PLATFORM)" - @echo " psp_clean : Build Linux examples for $(PLATFORM)" + @echo " linux_clean : Remove generated Linux kernel files" @echo @echo " install : Install binaries to $(EXEC_DIR)" @echo @@ -121,28 +109,6 @@ info: check check: @CHECKLIST="$(CHECKLIST)" $(DVSDK_INSTALL_DIR)/bin/check.sh -#============================================================================== -# Build the dvsdk demos for the configured platform. Also, an explicit cleanup -# target is defined. -#============================================================================== -demos: - $(MAKE) -C $(DEMO_INSTALL_DIR)/$(PLATFORM) - -demos_clean: - $(MAKE) -C $(DEMO_INSTALL_DIR)/$(PLATFORM) clean - -#============================================================================== -# Build the Digital Video Test Bench for the configured platform. Also, an -# explicit cleanup target is defined. -#============================================================================== -dvtb: - $(MAKE) -C $(DVTB_INSTALL_DIR) $(PLATFORM) - @echo - @echo "dvtb can be found under $(DVTB_INSTALL_DIR)/packages/ti/sdo/dvtb/$(PLATFORM)/bin" - -dvtb_clean: - $(MAKE) -C $(DVTB_INSTALL_DIR) clean - #============================================================================== # Build the Linux kernel. Also, an explicit cleanup target is defined. #============================================================================== @@ -155,17 +121,6 @@ linux: linux_clean: $(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) CROSS_COMPILE=$(MVTOOL_PREFIX) clean -#============================================================================== -# Build the PSP Linux examples. Also, an explicit cleanup target is defined. -#============================================================================== -psp_examples: - $(MAKE) -C $(PSP_INSTALL_DIR)/examples PLATFORM=$(LINUXSAMPLES_PLATFORM) LINUXKERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) CROSS_COMPILE=$(MVTOOL_PREFIX) - @echo - @echo "PSP examples can be found under $(PSP_INSTALL_DIR)/examples/$(LINUXSAMPLES_PLATFORM)" - -psp_clean: - $(MAKE) -C $(PSP_INSTALL_DIR)/examples PLATFORM=$(LINUXSAMPLES_PLATFORM) LINUXKERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) clean - #============================================================================== # Build the CMEM kernel module for the configured platform, and make sure the # kernel_binaries directory is kept in sync. Also, an explicit cleanup target @@ -215,16 +170,6 @@ ifeq ($(PLATFORM),dm355) $(MAKE) -C $(CODEC_INSTALL_DIR)/dm355mm/module KERNEL_DIR=$(LINUXKERNEL_INSTALL_DIR) clean endif -#============================================================================== -# Build the DVSDK examples for the configured platform. Also, an explicit -# cleanup target is defined. -#============================================================================== -examples: - $(MAKE) -C examples/$(PLATFORM) - -examples_clean: - $(MAKE) -C examples/$(PLATFORM) clean - #============================================================================== # Build the Davinci Multimedia Application Interface for the configured # platform. Also, an explicit cleanup target is defined. @@ -232,18 +177,18 @@ examples_clean: dmai: @$(MAKE) -C $(DMAI_INSTALL_DIR) PLATFORM=${DMAI_PLATFORM} \ CE_INSTALL_DIR_${DMAI_PLATFORM}=$(CE_INSTALL_DIR) \ - CODEC_INSTALL_DIR_${DMAI_PLATFORM}=$(CODEC_INSTALL_DIR) \ - LINK_INSTALL_DIR_${DMAI_PLATFORM}=$(LINK_INSTALL_DIR) \ - CMEM_INSTALL_DIR_${DMAI_PLATFORM}=$(CMEM_INSTALL_DIR) \ - FC_INSTALL_DIR_${DMAI_PLATFORM}=$(FC_INSTALL_DIR) \ - LPM_INSTALL_DIR_${DMAI_PLATFORM}=$(LPM_INSTALL_DIR) \ - XDAIS_INSTALL_DIR_${DMAI_PLATFORM}=$(XDAIS_INSTALL_DIR) \ - BIOS_INSTALL_DIR_${DMAI_PLATFORM}=$(BIOS_INSTALL_DIR) \ - LINUXLIBS_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXLIBS_INSTALL_DIR)\ - LINUXKERNEL_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXKERNEL_INSTALL_DIR) \ - CROSS_COMPILE_${DMAI_PLATFORM}=$(CSTOOL_PREFIX) \ - XDC_INSTALL_DIR_${DMAI_PLATFORM}=$(XDC_INSTALL_DIR) \ - EXEC_DIR_${DMAI_PLATFORM}=$(EXEC_DIR) all + CODEC_INSTALL_DIR_${DMAI_PLATFORM}=$(CODEC_INSTALL_DIR) \ + LINK_INSTALL_DIR_${DMAI_PLATFORM}=$(LINK_INSTALL_DIR) \ + CMEM_INSTALL_DIR_${DMAI_PLATFORM}=$(CMEM_INSTALL_DIR) \ + FC_INSTALL_DIR_${DMAI_PLATFORM}=$(FC_INSTALL_DIR) \ + LPM_INSTALL_DIR_${DMAI_PLATFORM}=$(LPM_INSTALL_DIR) \ + XDAIS_INSTALL_DIR_${DMAI_PLATFORM}=$(XDAIS_INSTALL_DIR) \ + BIOS_INSTALL_DIR_${DMAI_PLATFORM}=$(BIOS_INSTALL_DIR) \ + LINUXLIBS_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXLIBS_INSTALL_DIR)\ + LINUXKERNEL_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXKERNEL_INSTALL_DIR) \ + CROSS_COMPILE_${DMAI_PLATFORM}=$(CSTOOL_PREFIX) \ + XDC_INSTALL_DIR_${DMAI_PLATFORM}=$(XDC_INSTALL_DIR) \ + EXEC_DIR_${DMAI_PLATFORM}=$(EXEC_DIR) all @echo @echo "DMAI applications can be found under $(DMAI_INSTALL_DIR)/packages/ti/sdo/dmai/apps" diff --git a/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch b/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch new file mode 100644 index 0000000000..852e60adbc --- /dev/null +++ b/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch @@ -0,0 +1,125 @@ +diff -uNr ticodecplugin/src/gstticodecplugin_omap3530.cfg ticodecplugin.new/src/gstticodecplugin_omap3530.cfg +--- ticodecplugin/src/gstticodecplugin_omap3530.cfg 2009-06-10 17:29:59.000000000 -0500 ++++ ticodecplugin.new/src/gstticodecplugin_omap3530.cfg 2009-08-07 16:17:24.000000000 -0500 +@@ -12,8 +12,6 @@ + * + */ + +-prog.build.platform = "ti.platforms.evm3530"; +- + /* Load the Codec Engine 'Operating System Abstraction Layer' */ + var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); + +@@ -27,21 +25,15 @@ + /* + * ======== Engine Configuration ======== + */ +-var Engine = xdc.useModule('ti.sdo.ce.Engine'); +-var encEngine = Engine.createFromServer( +- "encode", +- "./encodeCombo.x64P", +- "ti.sdo.servers.encode" +- ); +-var decEngine = Engine.createFromServer( +- "decode", +- "./decodeCombo.x64P", +- "ti.sdo.servers.decode" ++var Engine = xdc.useModule('ti.sdo.ce.Engine'); ++var demoEngine = Engine.createFromServer( ++ "codecServer", ++ "./bin/cs.x64P", ++ "ti.sdo.server.cs" + ); + + /* Load support for the DMAI module */ + var DMAI = xdc.loadPackage('ti.sdo.dmai'); + +-/* Load support for user space DMA */ +-var SCPY = xdc.useModule("ti.sdo.fc.scpy.SCPY"); +-var SDMA = xdc.useModule("ti.sdo.linuxutils.sdma.SDMA"); ++var SCPY = xdc.useModule('ti.sdo.fc.scpy.SCPY'); ++var SDMA = xdc.useModule('ti.sdo.linuxutils.sdma.SDMA'); +diff -uNr ticodecplugin/src/gstticodecs_omap3530.c ticodecplugin.new/src/gstticodecs_omap3530.c +--- ticodecplugin/src/gstticodecs_omap3530.c 2009-06-10 17:29:59.000000000 -0500 ++++ ticodecplugin.new/src/gstticodecs_omap3530.c 2009-08-07 16:17:24.000000000 -0500 +@@ -22,8 +22,7 @@ + #include "gstticodecs.h" + + /* Declaration of the production engine and decoders shipped with the DVSDK */ +-static Char decodeEngine[] = "decode"; +-static Char encodeEngine[] = "encode"; ++static Char codecServer[] = "codecServer"; + + /* NULL terminated list of speech decoders in the engine to use in the demo */ + GstTICodec gst_ticodec_codecs[] = { +@@ -32,59 +31,55 @@ + { + "AAC Audio Decoder", /* String name of codec used by plugin */ + "aachedec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "MPEG1L2 Audio Decoder", /* String name of codec used by plugin */ + "mp3dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "MPEG1L3 Audio Decoder", /* String name of codec used by plugin */ + "mp3dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ +- }, { +- "WMA Audio Decoder", /* String name of codec used by plugin */ +- "wmadec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, +- ++ + /* Video Decoders */ + { + "H.264 Video Decoder", /* String name of codec used by plugin */ + "h264dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "MPEG4 Video Decoder", /* String name of codec used by plugin */ + "mpeg4dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "MPEG2 Video Decoder", /* String name of codec used by plugin */ + "mpeg2dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + /* Image Decoders */ + { + "JPEG Image Decoder", /* String name of codec used by plugin */ + "jpegdec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + /* Video Encoders */ + { + "H.264 Video Encoder", /* String name of codec used by plugin */ + "h264enc", /* String name of codec used by CE */ +- encodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "MPEG4 Video Encoder", /* String name of codec used by plugin */ + "mpeg4enc", /* String name of codec used by CE */ +- encodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + /* Image Encoders */ + { + "JPEG Image Encoder", /* String name of codec used by plugin */ + "jpegenc", /* String name of codec used by CE */ +- encodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + { NULL } diff --git a/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch b/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch index 72a0ab319f..7c03641707 100644 --- a/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch +++ b/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch @@ -21,8 +21,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6446.cfg ticodecplugin/src/ "./encodeCombo.x64P", "ti.sdo.servers.encode" ); -+encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; -+decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; ++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P"; ++ /* Load support for the 'Davinci Multimedia Application Interface' modules */ var DMAI = xdc.loadPackage('ti.sdo.dmai'); @@ -33,8 +33,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6467.cfg ticodecplugin/src/ "./encodeCombo.x64P", "ti.sdo.servers.encode" ); -+encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; -+decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; ++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P"; ++ /* Load support for the 'Davinci Multimedia Application Interface' modules */ var DMAI = xdc.loadPackage('ti.sdo.dmai'); @@ -45,8 +45,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_omap3530.cfg ticodecplugin/sr "./decodeCombo.x64P", "ti.sdo.servers.decode" ); -+encEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; -+decEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; ++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P"; ++ /* Load support for the DMAI module */ var DMAI = xdc.loadPackage('ti.sdo.dmai'); diff --git a/recipes/dvsdk/gstreamer-ti_svn.bb b/recipes/dvsdk/gstreamer-ti_svn.bb index e1c4c1e2e9..7d13c7186a 100644 --- a/recipes/dvsdk/gstreamer-ti_svn.bb +++ b/recipes/dvsdk/gstreamer-ti_svn.bb @@ -1,47 +1,27 @@ DESCRIPTION = "Gstreamer plugin for TI Davinci and OMAP processors" +require ti-paths.inc + inherit autotools DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly" # Fetch source from svn repo -SRCREV = "308" +SRCREV = "285" SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ -file://codec_combo_directory_fix.patch;patch=1 \ - " + file://gstreamer-ti-tracker-824.patch;patch=1 \ +" # Again, no '.' in PWD allowed :( -PR = "r24" +PR = "r28" PV = "svnr${SRCREV}" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" -installdir = "${datadir}/ti" - -META_SDK_PATH ?= "${CROSS_DIR}" - -DMAI_INSTALL_DIR = "${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-dmai" -CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine" -FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" -CODEC_INSTALL_DIR_dm355-evm="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-dm355" -CODEC_INSTALL_DIR_dm6446-evm="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-dm6446" -CODEC_INSTALL_DIR_omap3evm="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530" -CODEC_INSTALL_DIR_beagleboard="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-combo-omap3530" -XDC_INSTALL_DIR="${STAGING_DIR}/${BUILD_SYS}/ti-xdctools-native" -CODEGEN_INSTALL_DIR="${STAGING_DIR}/${BUILD_SYS}/ti-cgt6x-native" - -export DMAI_INSTALL_DIR -export CE_INSTALL_DIR -export FC_INSTALL_DIR -export CODEC_INSTALL_DIR -export XDC_INSTALL_DIR -export CODEGEN_INSTALL_DIR - XDC_TARGET = gnu.targets.arm.GCArmv5T XDC_PLATFORM_dm355-evm = ti.platforms.evmDM355 XDC_PLATFORM_dm6446-evm = ti.platforms.evmDM6446 -XDC_PLATFORM_omap3evm = ti.platforms.evm3530 -XDC_PLATFORM_beagleboard = ti.platforms.evm3530 +XDC_PLATFORM_da830-omapl137-evm = ti.platforms.omapl137 PLATFORM_XDC = ${XDC_PLATFORM} export XDC_TARGET @@ -50,17 +30,7 @@ export PLATFORM_XDC PLATFORM_dm355-evm = "dm355" PLATFORM_dm6446-evm = "dm6446" -PLATFORM_omap3evm = "omap3530" -PLATFORM_beagleboard = "omap3530" - -export PLATFORM - -CROSS_COMPILE=${META_SDK_PATH}/bin/${TARGET_PREFIX} -CSTOOL_DIR=${META_SDK_PATH} -MVTOOL_DIR=${META_SDK_PATH} -export CROSS_COMPILE -export CSTOOL_DIR -export MVTOOL_DIR +PLATFORM_da830-omapl137-evm = "ol137" CPPFLAGS_append = " -DPlatform_${PLATFORM}" diff --git a/recipes/dvsdk/readme.txt b/recipes/dvsdk/readme.txt deleted file mode 100644 index daf7bf6be5..0000000000 --- a/recipes/dvsdk/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ - -The software needed can be downloaded from: -* http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/ -* https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm - diff --git a/recipes/dvsdk/ti-cgt6x-native_6.0.21.bb b/recipes/dvsdk/ti-cgt6x-native_6.0.21.bb index d980f46c16..e030b81f43 100644 --- a/recipes/dvsdk/ti-cgt6x-native_6.0.21.bb +++ b/recipes/dvsdk/ti-cgt6x-native_6.0.21.bb @@ -1,6 +1,8 @@ require ti-cgt6x.inc inherit native +# download ti_cgt_c6000_6.0.21_setup_linux_x86.bin from https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm and copy in Arago (or OE) download directory. + SRC_URI = "http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin" BINFILE="ti_cgt_c6000_6.0.21_setup_linux_x86.bin" @@ -16,5 +18,5 @@ do_stage() { cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ } -AUTOTOOLS_NATIVE_STAGE_INSTALL="1" +AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" diff --git a/recipes/dvsdk/ti-cgt6x-native_6.1.9.bb b/recipes/dvsdk/ti-cgt6x-native_6.1.9.bb new file mode 100644 index 0000000000..55c1b6ca06 --- /dev/null +++ b/recipes/dvsdk/ti-cgt6x-native_6.1.9.bb @@ -0,0 +1,22 @@ +require ti-cgt6x.inc +inherit native + +# download ti_cgt_c6000_6.1.9_setup_linux_x86.bin from https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm and copy in Arago (or OE) download directory. + +SRC_URI = "http://install.source.dir.com/ti_cgt_c6000_6.1.9_setup_linux_x86.bin" + +BINFILE = "ti_cgt_c6000_6.1.9_setup_linux_x86.bin" + +S = "${WORKDIR}/cgt" + +# Yes, the xdc stuff still breaks with a '.' in PWD +PV = "6190" +PR = "r1" + +do_stage() { + install -d ${STAGING_DIR_NATIVE}/${PN} + cp -pPrf ${S}/* ${STAGING_DIR_NATIVE}/${PN}/ +} + +AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" + diff --git a/recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb b/recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb deleted file mode 100644 index f0ad126ac4..0000000000 --- a/recipes/dvsdk/ti-cgt6x-sdk_6.0.21.bb +++ /dev/null @@ -1,26 +0,0 @@ -require ti-cgt6x.inc -inherit sdk - -SRC_URI = "http://install.source.dir.com/ti_cgt_c6000_6.0.21_setup_linux_x86.bin" - -S = "${WORKDIR}/cgt" - -# Yes, the xdc stuff still breaks with a '.' in PWD -PV = "6021" -PR = "r3" - -do_install() { - install -d ${D}/${prefix}/dvsdk/cg6x_6_0_21 - cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/cg6x_6_0_21 - - # Creates rules.make file - mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules - echo "# Where the TI C6x codegen tool is installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make - echo "CODEGEN_INSTALL_DIR=${prefix}/dvsdk/cg6x_6_0_21" >> ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make - echo "" >> ${STAGING_DIR_HOST}/ti-sdk-rules/cgt6x.Rules.make -} - -INHIBIT_PACKAGE_STRIP = "1" -FILES_${PN} = "${prefix}/dvsdk/cg6x_6_0_21" -INSANE_SKIP_${PN} = True - diff --git a/recipes/dvsdk/ti-cmem-module_2.23.1.bb b/recipes/dvsdk/ti-cmem-module_2.23.1.bb index f02383d980..0704993033 100644 --- a/recipes/dvsdk/ti-cmem-module_2.23.1.bb +++ b/recipes/dvsdk/ti-cmem-module_2.23.1.bb @@ -5,16 +5,17 @@ inherit module DEPENDS = "virtual/kernel perl-native" RDEPENDS = "update-modules" -# Download codec_engine_2_23_01.tar.gz from -# https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html +# Download codec_engine_2_23_01.tar.gz from https://www-a.ti.com/downloads/sds_support/targetcontent/CE/ce_2_23/index.html and copy in Arago (or OE) download directory. -SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz" +SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz \ + file://cmem-remove-show-pte-function.patch;patch=1 " # Set the source directory S = "${WORKDIR}/codec_engine_2_23_01" #This is a kernel module, don't set PR directly MACHINE_KERNEL_PR_append = "a" + PV = "2231" do_compile() { diff --git a/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb b/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb deleted file mode 100644 index 05952d2a6a..0000000000 --- a/recipes/dvsdk/ti-codec-combo-dm355-sdk_1.13.bb +++ /dev/null @@ -1,34 +0,0 @@ -DESCRIPTION = "DM355 Codec Combo 1.13" - -inherit sdk -require ti-codec-combo-dm355.inc - -SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin\ - file://dm355mm_1_30.patch;patch=1 \ - " - -S = "${WORKDIR}/dm355_codecs_1_13_000" -BINFILE="dm355_codecs_setuplinux_1_13_000.bin" - -# Yes, the xdc stuff still breaks with a '.' in PWD -PV = "113" -PR = "r16" - -do_compile() { - echo "Do nothing" -} - -do_install() { - install -d ${D}/${prefix}/dvsdk/dm355_codecs_1_13_000 - cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/dm355_codecs_1_13_000 - - # Creates rules.make file - mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules - echo "# Where the codec servers are installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make - echo "CODEC_INSTALL_DIR=${prefix}/dvsdk/dm355_codecs_1_13_000" >> ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make -} - -INHIBIT_PACKAGE_STRIP = "1" -INSANE_SKIP_${PN} = True -FILES_${PN} = "${prefix}/dvsdk/dm355_codecs_1_13_000/*" - diff --git a/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb b/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb index cfc1c9005a..2db0720c6a 100644 --- a/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb +++ b/recipes/dvsdk/ti-codec-combo-dm355_1.13.bb @@ -1,13 +1,13 @@ -DESCRIPTION = "DM355 Codec Combo 1.13" - +require ti-codec.inc require ti-codec-combo-dm355.inc + SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/codecs/dm355_codecs_setuplinux_1_13_000.bin \ file://mapdmaq \ " +BINFILE = "dm355_codecs_setuplinux_1_13_000.bin" + S = "${WORKDIR}/dm355_codecs_1_13_000" -BINFILE="dm355_codecs_setuplinux_1_13_000.bin" -installdir = "${datadir}/ti" # Yes, the xdc stuff still breaks with a '.' in PWD PV = "113" @@ -23,13 +23,6 @@ do_install () { install -m 0755 ${WORKDIR}/mapdmaq ${D}/${installdir}/codec-combo } -do_stage() { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN} - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_PACKAGE_STRIP = "1" INSANE_SKIP_${PN} = True -FILES_${PN} = "${installdir}/codec-combo/mapdmaq" diff --git a/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb b/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb deleted file mode 100644 index f02d49a048..0000000000 --- a/recipes/dvsdk/ti-codec-combo-dm6446-sdk_2.05.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "DM6446 Codec Combo 2.05" -inherit sdk - -# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation. -SRC_URI = "ftp://install.source.dir.com/dm6446_dvsdk_combos_2_05.tar.gz" - -S = "${WORKDIR}/dm6446_dvsdk_combos_2_05" - -# Yes, the xdc stuff still breaks with a '.' in PWD -PV = "205" -PR = "r10" - -# DM6446 combo has Makefile. We don't want to rebuild anything here. -do_compile() { - echo "do nothing" -} - -do_install() { - install -d ${D}/${prefix}/dvsdk/dm6446_dvsdk_combos_2_05 - cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/dm6446_dvsdk_combos_2_05 - - # Creates rules.make file - mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules - echo "# Where the codec servers are installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make - echo "CODEC_INSTALL_DIR=${prefix}/dvsdk/dm6446_dvsdk_combos_2_05" >> ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make -} - -INHIBIT_PACKAGE_STRIP = "1" -INSANE_SKIP_${PN} = True -FILES_${PN} = "${prefix}/dvsdk/dm6446_dvsdk_combos_2_05/*" - diff --git a/recipes/dvsdk/ti-codec-combo-dm6446.inc b/recipes/dvsdk/ti-codec-combo-dm6446.inc new file mode 100644 index 0000000000..44508bf49e --- /dev/null +++ b/recipes/dvsdk/ti-codec-combo-dm6446.inc @@ -0,0 +1,39 @@ +# This file defines function used for extracting .bin file + +python do_unpack () { + bb.build.exec_func('base_do_unpack', d) + bb.build.exec_func('ti_bin_do_unpack', d) +} + +python ti_bin_do_unpack() { + + import os + + localdata = bb.data.createCopy(d) + bb.data.update_data(localdata) + + binfile = bb.data.getVar('BINFILE', localdata) + + # Change to the working directory + save_cwd = os.getcwd() + workdir = bb.data.getVar('WORKDIR', localdata) + workdir = bb.data.expand(workdir, localdata) + os.chdir(workdir) + + # Make the InstallJammer binary executable so we can run it + os.chmod(binfile, 0755) + + # Run the InstallJammer binary and accept the EULA + filename = "HOME=%s ./%s" % (workdir, binfile) + f = os.popen(filename,'w') + print >>f, "Y\n" + print >>f, "Y\n" + print >>f, " \n" + print >>f, " qY\n" + print >>f, "%s\n" % workdir + f.close() + + # Return to the previous directory + os.chdir(save_cwd) +} + diff --git a/recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb b/recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb index 04f946bc19..07d9dffe6b 100644 --- a/recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb +++ b/recipes/dvsdk/ti-codec-combo-dm6446_2.05.bb @@ -1,17 +1,33 @@ -DESCRIPTION = "DM6446 Codec Combo 2.05" +DEPENDS="ti-codec-engine ti-dsplink-module" -# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation. -SRC_URI = "http://install.source.dir.com/dm6446_dvsdk_combos_2_05.tar.gz" +require ti-codec.inc +require ti-codec-combo-dm6446.inc -S = "${WORKDIR}/dm6446_dvsdk_combos_2_05" +SRC_URI = "http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin" + +S = "${WORKDIR}/dvsdk_2_00_00_22/dm6446_dvsdk_combos_2_05" +BINFILE = "dm6446_codecs_setuplinux_2_00_00_22.bin" + +export ${CODEGEN_INSTALL_DIR} # Yes, the xdc stuff still breaks with a '.' in PWD PV = "205" -PR = "r11" +PR = "r15" + +do_configure () { + find . -name *.x64P | xargs rm -rf {} +} -installdir = "${datadir}/ti" do_compile() { - echo "do nothing" + make BIOS_INSTALL_DIR=${BIOS_INSTALL_DIR} \ + XDC_INSTALL_DIR=${XDC_INSTALL_DIR} \ + CE_INSTALL_DIR=${CE_INSTALL_DIR} \ + FC_INSTALL_DIR=${FC_INSTALL_DIR} \ + CMEM_INSTALL_DIR=${CMEM_INSTALL_DIR} \ + XDAIS_INSTALL_DIR=${XDAIS_INSTALL_DIR} \ + LINK_INSTALL_DIR=${LINK_INSTALL_DIR} \ + CODEGEN_INSTALL_DIR=${CODEGEN_INSTALL_DIR} \ + XDCARGS=\"eval\" } do_install () { @@ -22,11 +38,3 @@ do_install () { done } -do_stage() { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN} - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "/${installdir}/codec-combo/*" - diff --git a/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb b/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb deleted file mode 100644 index 966e568af9..0000000000 --- a/recipes/dvsdk/ti-codec-combo-omap3530-sdk_3.16.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "OMAP3530 Codec Combo 3.16.01" -require ti-codec-combo-omap3530.inc - -inherit sdk - -SRC_URI = "http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin" - -# Specify names of the InstallJammer binary file and the tarball it extracts -BINFILE = "omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin" -TARFILE = "omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa_3_16_01.tar.gz" - -S = "${WORKDIR}/omap3530_dvsdk_combos_tspa_3_16_01" - -# Yes, the xdc stuff still breaks with a '.' in PWD -PV = "316" -PR = "r10" - -do_compile () { - echo "No nothing" -} - -do_install() { - install -d ${D}/${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01 - cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01 - - # Creates rules.make file - mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules - echo "# Where the codec servers are installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make - echo "CODEC_INSTALL_DIR=${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01" >> ${STAGING_DIR_HOST}/ti-sdk-rules/codec.Rules.make -} - -INHIBIT_PACKAGE_STRIP = "1" -FILES_${PN} = "${prefix}/dvsdk/omap3530_dvsdk_combos_3_16_01/*" -INSANE_SKIP_${PN} = True - diff --git a/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb b/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb index 76ebb46818..3a9efdd60d 100644 --- a/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb +++ b/recipes/dvsdk/ti-codec-combo-omap3530_3.16.1.bb @@ -1,5 +1,4 @@ -DESCRIPTION = "OMAP3530 TSPA codec combo 3.16.01" - +require ti-codec.inc require ti-codec-combo-omap3530.inc SRC_URI = "http://software-dl.ti.com/sdo/sdo_apps_public_sw/omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa-3_16_01-Linux-x86.bin" @@ -10,24 +9,15 @@ TARFILE = "omap3530_dvsdk_combos_tspa/omap3530_dvsdk_combos_tspa_3_16_01.tar.gz" S = "${WORKDIR}/omap3530_dvsdk_combos_tspa_3_16_01" -DEPENDS="ti-codec-engine" +DEPENDS="ti-codec-engine ti-dsplink-module" -CE_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine" -FC_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" -LINK_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" -CMEM_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" -LPM_INSTALL_DIR="${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/ti-codec-engine/cetools" -BIOS_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-dspbios-native" -CODEGEN_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-cgt6x-native" -XDC_INSTALL_DIR="${STAGING_DIR_NATIVE}/ti-xdctools-native" +CODEC_INSTALL_DIR = "${S}" -export ${CODEGEN_INSTALL_DIR} +export CODEGEN_INSTALL_DIR # Yes, the xdc stuff still breaks with a '.' in PWD PV = "3161" -PR = "r12" -installdir = "${datadir}/ti" - +PR = "r17" do_compile() { make CE_INSTALL_DIR=${CE_INSTALL_DIR} \ FC_INSTALL_DIR=${FC_INSTALL_DIR} \ @@ -36,7 +26,18 @@ do_compile() { 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=${CODEC_INSTALL_DIR} \ + XDC_INSTALL_DIR=${XDC_INSTALL_DIR} clean + + 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} \ + CODEC_INSTALL_DIR=${CODEC_INSTALL_DIR} \ + XDC_INSTALL_DIR=${XDC_INSTALL_DIR} } do_install () { @@ -47,11 +48,4 @@ do_install () { done } -do_stage() { - install -d ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN} - cp -pPrf ${S}/* ${STAGING_DIR}/${MULTIMACH_TARGET_SYS}/${PN}/ -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" -FILES_${PN} = "${installdir}/codec-combo/*" diff --git a/recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb b/recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb new file mode 100644 index 0000000000..6ffefc7e48 --- /dev/null +++ b/recipes/dvsdk/ti-codec-combo-omapl137_1.0.bb @@ -0,0 +1,23 @@ +require ti-codec.inc + +# Should be replaced with real http URL, but for now create codec combo tar from DVSDK installation. +SRC_URI = "http://install.source.dir.com/omapl137_dvsdk_combos_1_0.tar.gz" + +S = "${WORKDIR}/omapl137_dvsdk_combos_1_0" + +# Yes, the xdc stuff still breaks with a '.' in PWD +PV = "100" +PR = "r1" + +do_compile() { + echo "do nothing" +} + +do_install () { + install -d ${D}/${installdir}/codec-combo + cd ${S} + for file in `find . -name *.x64P`; do + cp ${file} ${D}/${installdir}/codec-combo + done +} + diff --git a/recipes/dvsdk/ti-codec-combos_3.16.bb b/recipes/dvsdk/ti-codec-combos_3.16.bb index 6bab35a0d5..5d8faca30f 100644 --- a/recipes/dvsdk/ti-codec-combos_3.16.bb +++ b/recipes/dvsdk/ti-codec-combos_3.16.bb @@ -4,7 +4,6 @@ LICENCE = "unknown" require ti-paths.inc - # 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 \ " diff --git a/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb b/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb deleted file mode 100644 index 4f9f6b9bf1..0000000000 --- a/recipes/dvsdk/ti-codec-engine-sdk_2.23.1.bb +++ /dev/null @@ -1,50 +0,0 @@ -DESCRIPTION = "Codec Engine 2.23.01 for TI ARM/DSP processors" -inherit sdk - -# tconf from xdctools dislikes '.' in pwd :/ -PR = "r17" -PV = "2231" - -SRC_URI = "http://install.source.dir.com/codec_engine_2_23_01.tar.gz " - -# Set the source directory -S = "${WORKDIR}/codec_engine_2_23_01" - -do_compile () { - echo "nothing to build" -} - -do_install() { - # Update cmem and sdma Rules.make to point correct location of main - # Rules.make. - sed -i -e s:Rules.make:../Rules.make:g \ - ${S}/cetools/packages/ti/sdo/linuxutils/cmem/Rules.make - sed -i -e s:Rules.make:../Rules.make:g \ - ${S}/cetools/packages/ti/sdo/linuxutils/sdma/Rules.make - - install -d ${D}/${prefix}/dvsdk/codec_engine_2_23_01 - cp -pPrf ${S}/* ${D}/${prefix}/dvsdk/codec_engine_2_23_01 - - # Creates rules.make file - - mkdir -p ${STAGING_DIR_HOST}/ti-sdk-rules - echo "# Where the Codec Engine package is installed." > ${STAGING_DIR_HOST}/ti-sdk-rules/ce.Rules.make - echo "CE