[oe-commits] Roger Monk : gstreamer-ti: various fixes
git version control
git at git.openembedded.org
Thu Sep 30 15:31:28 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 81162f4b07c7ccff4df0acf0a12128071d0e556f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=81162f4b07c7ccff4df0acf0a12128071d0e556f
Author: Roger Monk <r-monk at ti.com>
Date: Thu Sep 30 16:10:49 2010 +0100
gstreamer-ti: various fixes
* fix sed for initscript
* fix typos in recipe
* fix typos in initscript
* fix omapdmaifbsink missing symbols
Signed-off-by: Roger Monk <r-monk at ti.com>
Signed-off-by: Koen Kooi <k-kooi at ti.com>
---
recipes/ti/gstreamer-ti.inc | 8 ++++----
.../ti/gstreamer-ti/0001-add-omapdmaifbsink.patch | 2 +-
recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/recipes/ti/gstreamer-ti.inc b/recipes/ti/gstreamer-ti.inc
index 70b70d9..12da133 100644
--- a/recipes/ti/gstreamer-ti.inc
+++ b/recipes/ti/gstreamer-ti.inc
@@ -15,7 +15,7 @@ require ti-paths.inc
require ti-staging.inc
# Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc
-PR = "r72+${MACHINE_KERNEL_PR}"
+PR = "r75+${MACHINE_KERNEL_PR}"
DEPENDS = "ti-dmai gstreamer gst-plugins-base"
@@ -86,12 +86,12 @@ do_install_prepend () {
# copy gstreamer demo scripts
cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/shared ${D}/${installdir}/gst
- # If we have loadmodule.sh in WORKDIR then give preference to this over
+ # If we have loadmodules.sh in WORKDIR then give preference to this over
# the default gst-ti loadmdules.sh
if [ -f ${WORKDIR}/loadmodules.sh ]; then
cp ${WORKDIR}/loadmodules.sh ${D}/${installdir}/gst/${PLATFORM}
else
- cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst
+ cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst
fi
# delete .svn files
@@ -101,7 +101,7 @@ do_install_prepend () {
install -d ${D}${sysconfdir}/init.d/
install -m 0755 ${WORKDIR}/gstreamer-ti-rc.sh ${D}${sysconfdir}/init.d/gstti-init
- sed -i -e 's|\<platform\>|${PLATFORM}|g' ${D}${sysconfdir}/init.d/gstti-init
+ sed -i -e 's|<platform>|${PLATFORM}|g' ${D}${sysconfdir}/init.d/gstti-init
}
RRECOMMENDS_${PN}_append_dm6446 += "ti-codecs-dm6446-server ti-cmem-module ti-dsplink-module"
diff --git a/recipes/ti/gstreamer-ti/0001-add-omapdmaifbsink.patch b/recipes/ti/gstreamer-ti/0001-add-omapdmaifbsink.patch
index 026a01b..bcf0d90 100644
--- a/recipes/ti/gstreamer-ti/0001-add-omapdmaifbsink.patch
+++ b/recipes/ti/gstreamer-ti/0001-add-omapdmaifbsink.patch
@@ -42,7 +42,7 @@ diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am
# sources used to compile this plug-in
-libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec1.c gsttividdec2.c gsttiimgenc1.c gsttiimgdec1.c gsttidmaibuffertransport.c gsttidmaibuftab.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c $(C6ACCEL_SRC)
-+libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec1.c gsttividdec2.c gsttiimgenc1.c gsttiimgdec1.c gsttidmaibuffertransport.c gsttidmaibuftab.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c $(C6ACCEL_SRC) omapfb.c yuv
++libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec1.c gsttividdec2.c gsttiimgenc1.c gsttiimgdec1.c gsttidmaibuffertransport.c gsttidmaibuftab.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c $(C6ACCEL_SRC) omapfb.c yuv.S
# flags used to compile this plugin
# add other _CFLAGS and _LIBS as needed
diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh
index 788b18a..35bf781 100644
--- a/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh
+++ b/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh
@@ -5,8 +5,8 @@
load_module() {
echo
- echo -n "Running /usr/share/ti/gst/<platform>/loadmodule.sh"
- /usr/share/ti/gst/<platform>/loadmodule.sh
+ echo -n "Running /usr/share/ti/gst/<platform>/loadmodules.sh"
+ /usr/share/ti/gst/<platform>/loadmodules.sh
}
case "$1" in
More information about the Openembedded-commits
mailing list