diff options
| author | Enrico Butera <ebutera@users.berlios.de> | 2011-08-09 17:20:45 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-08-16 09:46:08 +0200 |
| commit | 9e85b31e35bb6dadc7c6997c7e0c8fb23b38249b (patch) | |
| tree | 4d397ad176c6a5c58570600214e5fa6ac37d3e5f /recipes-ti/gstreamer-ti | |
| parent | 8ae4464e9f1cba501b99c90141c154cee98fce64 (diff) | |
| download | meta-ti-9e85b31e35bb6dadc7c6997c7e0c8fb23b38249b.tar.gz | |
gstreamer-ti: bump srcrev to fix runtime error, build fix
Bumped srcrev to fix a runtime error and added a build fix (include
linux/videodev.h was removed from kernel).
Signed-off-by: Enrico Butera <ebutera@users.berlios.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-ti/gstreamer-ti')
| -rw-r--r-- | recipes-ti/gstreamer-ti/gstreamer-ti.inc | 2 | ||||
| -rw-r--r-- | recipes-ti/gstreamer-ti/gstreamer-ti/r962-remove-include-videodev.diff | 22 | ||||
| -rw-r--r-- | recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb | 15 |
3 files changed, 25 insertions, 14 deletions
diff --git a/recipes-ti/gstreamer-ti/gstreamer-ti.inc b/recipes-ti/gstreamer-ti/gstreamer-ti.inc index ba1c1a2e..ded16ce8 100644 --- a/recipes-ti/gstreamer-ti/gstreamer-ti.inc +++ b/recipes-ti/gstreamer-ti/gstreamer-ti.inc | |||
| @@ -15,7 +15,7 @@ require recipes-ti/includes/ti-paths.inc | |||
| 15 | require recipes-ti/includes/ti-staging.inc | 15 | require recipes-ti/includes/ti-staging.inc |
| 16 | 16 | ||
| 17 | # Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc | 17 | # Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc |
| 18 | PR = "r83+${MACHINE_KERNEL_PR}" | 18 | PR = "r84+${MACHINE_KERNEL_PR}" |
| 19 | 19 | ||
| 20 | DEPENDS = "ti-dmai gstreamer gst-plugins-base" | 20 | DEPENDS = "ti-dmai gstreamer gst-plugins-base" |
| 21 | 21 | ||
diff --git a/recipes-ti/gstreamer-ti/gstreamer-ti/r962-remove-include-videodev.diff b/recipes-ti/gstreamer-ti/gstreamer-ti/r962-remove-include-videodev.diff new file mode 100644 index 00000000..cb106fc4 --- /dev/null +++ b/recipes-ti/gstreamer-ti/gstreamer-ti/r962-remove-include-videodev.diff | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | diff -ur ticodecplugin_orig/src/gstticapturesrc.c ticodecplugin/src/gstticapturesrc.c | ||
| 2 | --- ticodecplugin_orig/src/gstticapturesrc.c 2011-08-09 17:03:39.201308305 +0200 | ||
| 3 | +++ ticodecplugin/src/gstticapturesrc.c 2011-08-09 17:02:35.177308274 +0200 | ||
| 4 | @@ -25,7 +25,6 @@ | ||
| 5 | #include <gst/gst.h> | ||
| 6 | #include <string.h> | ||
| 7 | #include <gst/gstmarshal.h> | ||
| 8 | -#include <linux/videodev.h> | ||
| 9 | #include <linux/videodev2.h> | ||
| 10 | #include <sys/ioctl.h> | ||
| 11 | |||
| 12 | diff -ur ticodecplugin_orig/src/gsttidisplaysink2.c ticodecplugin/src/gsttidisplaysink2.c | ||
| 13 | --- ticodecplugin_orig/src/gsttidisplaysink2.c 2011-08-09 17:03:53.329308312 +0200 | ||
| 14 | +++ ticodecplugin/src/gsttidisplaysink2.c 2011-08-09 17:03:11.337308292 +0200 | ||
| 15 | @@ -28,7 +28,6 @@ | ||
| 16 | #include <gst/video/video.h> | ||
| 17 | #include <string.h> | ||
| 18 | #include <gst/gstmarshal.h> | ||
| 19 | -#include <linux/videodev.h> | ||
| 20 | #include <linux/videodev2.h> | ||
| 21 | #include <sys/ioctl.h> | ||
| 22 | |||
diff --git a/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb b/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb index b4964ea9..9284eab6 100644 --- a/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb +++ b/recipes-ti/gstreamer-ti/gstreamer-ti_svn.bb | |||
| @@ -6,21 +6,14 @@ PV = "svnr${SRCREV}" | |||
| 6 | 6 | ||
| 7 | S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" | 7 | S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" |
| 8 | 8 | ||
| 9 | SRCREV = "822" | 9 | SRCREV = "962" |
| 10 | 10 | ||
| 11 | # apply patches from tracker 1208 to get zero copy support. | 11 | # apply patches from tracker 1208 to get zero copy support. |
| 12 | # https://gstreamer.ti.com/gf/project/gstreamer_ti/tracker/?action=TrackerItemEdit&tracker_item_id=1208&start=175 | 12 | # https://gstreamer.ti.com/gf/project/gstreamer_ti/tracker/?action=TrackerItemEdit&tracker_item_id=1208&start=175 |
| 13 | 13 | ||
| 14 | SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ | 14 | SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ |
| 15 | file://gstreamer-ti-rc.sh \ | 15 | file://gstreamer-ti-rc.sh \ |
| 16 | file://0003-Support-setting-the-display-framerate-directly-when-.patch;striplevel=4 \ | 16 | file://r962-remove-include-videodev.diff \ |
| 17 | file://0004-Cosmetic-cleanup-clarify-some-comments.patch;striplevel=4 \ | ||
| 18 | file://0005-Enable-setting-the-framerate-directly-on-DM365.patch;striplevel=4 \ | ||
| 19 | file://0006-Remove-the-repeat_with_refresh-feature.patch;striplevel=4 \ | ||
| 20 | file://0007-Add-support-for-pad-allocated-buffers-in-TIDmaiVideo.patch;striplevel=4 \ | ||
| 21 | file://0008-Add-support-for-pad-allocated-buffers-in-TIViddec2.patch;striplevel=4 \ | ||
| 22 | file://0009-update-dm365-cfg-to-work-with-platinum-codecs.patch \ | ||
| 23 | file://0010-replace-omap3530_dv400-platform-support-with-omap353.patch \ | ||
| 24 | " | 17 | " |
| 25 | 18 | ||
| 26 | # use local loadmodules.sh for these platform | 19 | # use local loadmodules.sh for these platform |
| @@ -30,7 +23,3 @@ SRC_URI_append_omapl137 = " file://loadmodules.sh" | |||
| 30 | SRC_URI_append_omapl138 = " file://loadmodules.sh " | 23 | SRC_URI_append_omapl138 = " file://loadmodules.sh " |
| 31 | SRC_URI_append_omap3 = " file://loadmodules.sh " | 24 | SRC_URI_append_omap3 = " file://loadmodules.sh " |
| 32 | 25 | ||
| 33 | # apply omapdmaifbsink patch on omap3 platform | ||
| 34 | # NOTE: this patch need's X11 header/libs | ||
| 35 | SRC_URI_append_omap3 = " file://0001-add-omapdmaifbsink.patch" | ||
| 36 | |||
