diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0001-ltmain.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0001-ltmain.patch deleted file mode 100644 index 6125d9026..000000000 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0001-ltmain.patch +++ /dev/null @@ -1,80 +0,0 @@ -From: Javier Viguera -Date: Mon, 12 Mar 2012 12:47:31 +0100 -Subject: [PATCH] ltmain - -Signed-off-by: Javier Viguera ---- - ltmain.sh | 32 +++++++++++++++++++++++--------- - 1 file changed, 23 insertions(+), 9 deletions(-) - -diff --git a/ltmain.sh b/ltmain.sh -index 0223495..7877159 100755 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -283,8 +283,9 @@ func_infer_tag () - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" -- $echo "$modename: specify a tag with \`--tag'" 1>&2 -- exit $EXIT_FAILURE -+ $echo "$modename: defaulting to \`CC'" -+ $echo "$modename: if this is not correct, specify a tag with \`--tag'" -+# exit $EXIT_FAILURE - # else - # $echo "$modename: using $tagname tagged configuration" - fi -@@ -2434,8 +2435,14 @@ EOF - absdir="$abs_ladir" - libdir="$abs_ladir" - else -- dir="$libdir" -- absdir="$libdir" -+ # Adding 'libdir' from the .la file to our library search paths -+ # breaks crosscompilation horribly. We cheat here and don't add -+ # it, instead adding the path where we found the .la. -CL -+ dir="$abs_ladir" -+ absdir="$abs_ladir" -+ libdir="$abs_ladir" -+ #dir="$libdir" -+ #absdir="$libdir" - fi - test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes - else -@@ -2574,7 +2581,7 @@ EOF - { test "$use_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -+ need_relink=no - fi - # This is a shared library - -@@ -5641,6 +5648,10 @@ fi\ - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do -+ # Replacing uninstalled with installed can easily break crosscompilation, -+ # since the installed path is generally the wrong architecture. -CL -+ newdependency_libs="$newdependency_libs $deplib" -+ continue - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` -@@ -5962,10 +5973,13 @@ relink_command=\"$relink_command\"" - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. -- if test "$inst_prefix_dir" = "$destdir"; then -- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -- exit $EXIT_FAILURE -- fi -+ # -+ # This breaks install into our staging area. -PB -+ # -+ # if test "$inst_prefix_dir" = "$destdir"; then -+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 -+ # exit $EXIT_FAILURE -+ # fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0002-gplay_fullscreen.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0001-gplay_fullscreen.patch similarity index 93% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0002-gplay_fullscreen.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0001-gplay_fullscreen.patch index 5ba38f06a..814756735 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0002-gplay_fullscreen.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0001-gplay_fullscreen.patch @@ -8,9 +8,9 @@ Subject: [PATCH] gplay_fullscreen Signed-off-by: Javier Viguera --- - src/misc/v4l_sink/src/mfw_gst_v4l.c | 4 ++-- - src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 2 +- - tools/gplay/mfw_gplay_core.c | 16 ++++++++++++++++ + src/misc/v4l_sink/src/mfw_gst_v4l.c | 4 ++-- + src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 2 +- + tools/gplay/mfw_gplay_core.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/misc/v4l_sink/src/mfw_gst_v4l.c b/src/misc/v4l_sink/src/mfw_gst_v4l.c @@ -32,7 +32,7 @@ index 8c2ed72..b85879a 100755 return ( mfw_gst_v4l2_set_crop(v4l_info, width, height) ); diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c -index c6a6b6c..b2c7b3d 100755 +index 20bf126..a3ba4a6 100755 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c @@ -976,7 +976,7 @@ mfw_gst_v4lsink_show_frame (GstBaseSink * basesink, GstBuffer * buf) @@ -45,7 +45,7 @@ index c6a6b6c..b2c7b3d 100755 return GST_FLOW_OK; } diff --git a/tools/gplay/mfw_gplay_core.c b/tools/gplay/mfw_gplay_core.c -index 4705cac..e5569fc 100755 +index 8361499..04be21b 100755 --- a/tools/gplay/mfw_gplay_core.c +++ b/tools/gplay/mfw_gplay_core.c @@ -1583,6 +1583,9 @@ fsl_player_ret_val fsl_player_resize(fsl_player_handle handle, fsl_player_displa diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0003-add-fb-dev.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0002-add-fb-dev.patch similarity index 88% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0003-add-fb-dev.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0002-add-fb-dev.patch index 96f0354eb..440f0663a 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0003-add-fb-dev.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0002-add-fb-dev.patch @@ -1,4 +1,3 @@ -From 1767c2d99895b682a79a0b874379811e83f6f147 Mon Sep 17 00:00:00 2001 From: Alejandro Gonzalez Date: Tue, 13 Mar 2012 19:20:02 +0100 Subject: [PATCH] add-fb-dev @@ -11,18 +10,18 @@ device to use as output. Signed-off-by: Javier Viguera --- - src/misc/v4l_sink/src/mfw_gst_fb.c | 15 +++++++++------ - src/misc/v4l_sink/src/mfw_gst_fb.h | 1 - - src/misc/v4l_sink/src/mfw_gst_v4l.c | 4 ++++ - src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 27 +++++++++++++++++++++++++-- - src/misc/v4l_sink/src/mfw_gst_v4lsink.h | 3 ++- + src/misc/v4l_sink/src/mfw_gst_fb.c | 15 +++++++++------ + src/misc/v4l_sink/src/mfw_gst_fb.h | 1 - + src/misc/v4l_sink/src/mfw_gst_v4l.c | 4 ++++ + src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 27 +++++++++++++++++++++++++-- + src/misc/v4l_sink/src/mfw_gst_v4lsink.h | 3 ++- 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/misc/v4l_sink/src/mfw_gst_fb.c b/src/misc/v4l_sink/src/mfw_gst_fb.c -index 8c251da..fb13489 100755 +index 18d4f7f..991bf24 100755 --- a/src/misc/v4l_sink/src/mfw_gst_fb.c +++ b/src/misc/v4l_sink/src/mfw_gst_fb.c -@@ -199,16 +199,19 @@ POST-CONDITIONS: None +@@ -200,16 +200,19 @@ POST-CONDITIONS: None IMPORTANT NOTES: None =============================================================================*/ @@ -76,7 +75,7 @@ index b85879a..d773f6a 100755 v4l_info->tv_mode = NV_MODE; diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c -index b2c7b3d..d7943c1 100755 +index a3ba4a6..526699e 100755 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c @@ -137,6 +137,7 @@ enum @@ -110,7 +109,7 @@ index b2c7b3d..d7943c1 100755 case SETPARA: g_value_set_int (value, v4l_info->setpara); break; -@@ -1497,6 +1507,12 @@ mfw_gst_v4lsink_finalize (GObject * object) +@@ -1493,6 +1503,12 @@ mfw_gst_v4lsink_finalize (GObject * object) } @@ -123,7 +122,7 @@ index b2c7b3d..d7943c1 100755 /*============================================================================= FUNCTION: mfw_gst_v4lsink_init -@@ -1541,6 +1557,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info, +@@ -1537,6 +1553,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info, v4l_info->dump_location = NULL; v4l_info->dumpfile = NULL; v4l_info->dump_length = 0; @@ -131,7 +130,7 @@ index b2c7b3d..d7943c1 100755 v4l_info->cr_left_bypixel_orig = 0; v4l_info->cr_right_bypixel_orig = 0; v4l_info->cr_top_bypixel_orig = 0; -@@ -1573,8 +1590,6 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info, +@@ -1569,8 +1586,6 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info, memset (&v4l_info->crop, 0, sizeof (struct v4l2_crop)); memset (&v4l_info->prevCrop, 0, sizeof (struct v4l2_crop)); @@ -140,7 +139,7 @@ index b2c7b3d..d7943c1 100755 v4l_info->chipcode = getChipCode(); v4l_info->v4l_id = -1; -@@ -1626,6 +1641,7 @@ mfw_gst_v4lsink_class_init (MFW_GST_V4LSINK_INFO_CLASS_T * klass) +@@ -1622,6 +1637,7 @@ mfw_gst_v4lsink_class_init (MFW_GST_V4LSINK_INFO_CLASS_T * klass) parent_class = g_type_class_peek_parent (klass); @@ -148,7 +147,7 @@ index b2c7b3d..d7943c1 100755 gobject_class->set_property = mfw_gst_v4lsink_set_property; gobject_class->get_property = mfw_gst_v4lsink_get_property; gobject_class->finalize = mfw_gst_v4lsink_finalize; -@@ -1730,6 +1746,13 @@ mfw_gst_v4lsink_class_init (MFW_GST_V4LSINK_INFO_CLASS_T * klass) +@@ -1726,6 +1742,13 @@ mfw_gst_v4lsink_class_init (MFW_GST_V4LSINK_INFO_CLASS_T * klass) NULL, G_PARAM_READWRITE)); diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0004-mfw_v4lsrc_uyvy.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0003-mfw_v4lsrc_uyvy.patch similarity index 96% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0004-mfw_v4lsrc_uyvy.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0003-mfw_v4lsrc_uyvy.patch index 372de5333..7814a8c3c 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0004-mfw_v4lsrc_uyvy.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0003-mfw_v4lsrc_uyvy.patch @@ -7,7 +7,7 @@ supported by the mt9v111 driver. Signed-off-by: Alex Gonzalez --- - src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 19 ++++--------------- + src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0005-mfw_v4lsec_def_sizes.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0004-mfw_v4lsec_def_sizes.patch similarity index 98% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0005-mfw_v4lsec_def_sizes.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0004-mfw_v4lsec_def_sizes.patch index f4b7894f0..19bf5eb4f 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0005-mfw_v4lsec_def_sizes.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0004-mfw_v4lsec_def_sizes.patch @@ -6,7 +6,7 @@ Change the default dimensions to the ones supported by the mt9v111 driver. Signed-off-by: Alex Gonzalez --- - src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 24 ++++++++++++------------ + src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0006-mfw_v4lsrc_create_segfault.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0005-mfw_v4lsrc_create_segfault.patch similarity index 94% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0006-mfw_v4lsrc_create_segfault.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0005-mfw_v4lsrc_create_segfault.patch index 51ece6006..53ef79dca 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0006-mfw_v4lsrc_create_segfault.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0005-mfw_v4lsrc_create_segfault.patch @@ -7,7 +7,7 @@ but the returned buffer is NULL. Signed-off-by: Alex Gonzalez --- - src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 2 ++ + src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0007-gplay_rotate.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0006-gplay_rotate.patch similarity index 90% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0007-gplay_rotate.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0006-gplay_rotate.patch index 4fb860342..030423fa5 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0007-gplay_rotate.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0006-gplay_rotate.patch @@ -6,9 +6,9 @@ Subject: [PATCH] gplay_rotate Signed-off-by: Javier Viguera --- - src/misc/v4l_sink/src/mfw_gst_v4l.c | 5 ++++- - src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 1 + - src/misc/v4l_sink/src/mfw_gst_v4lsink.h | 1 + + src/misc/v4l_sink/src/mfw_gst_v4l.c | 5 ++++- + src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 1 + + src/misc/v4l_sink/src/mfw_gst_v4lsink.h | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/misc/v4l_sink/src/mfw_gst_v4l.c b/src/misc/v4l_sink/src/mfw_gst_v4l.c @@ -42,10 +42,10 @@ index d773f6a..cb999d2 100755 if (ioctl (v4l_info->v4l_id, VIDIOC_S_CROP, crop) < 0) { GST_ERROR ("set crop failed"); diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c -index d7943c1..e4f6aa0 100755 +index 526699e..2227c3d 100755 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c -@@ -1540,6 +1540,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info, +@@ -1536,6 +1536,7 @@ mfw_gst_v4lsink_init (MFW_GST_V4LSINK_INFO_T * v4l_info, v4l_info->axis_left = 0; v4l_info->rotate = 0; v4l_info->prevRotate = 0; @@ -54,7 +54,7 @@ index d7943c1..e4f6aa0 100755 v4l_info->crop_top = 0; diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h -index 28cd6b7..159d3e7 100755 +index 4764868..4c9465d 100755 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.h +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.h @@ -255,6 +255,7 @@ typedef struct MFW_GST_V4LSINK_INFO_S diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0008-mfw_isink-set-defaults-if-no-vssconfig-found.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0007-mfw_isink-Set-defaults-if-no-vssconfig-found.patch similarity index 85% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0008-mfw_isink-set-defaults-if-no-vssconfig-found.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0007-mfw_isink-Set-defaults-if-no-vssconfig-found.patch index e8f96aa3c..c9bb6f8e9 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0008-mfw_isink-set-defaults-if-no-vssconfig-found.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0007-mfw_isink-Set-defaults-if-no-vssconfig-found.patch @@ -4,11 +4,11 @@ Subject: [PATCH] mfw_isink: Set defaults if no vssconfig found. Signed-off-by: Alex Gonzalez --- - libs/vss/vss_common.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) + libs/vss/vss_common.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c -index 757c2fc..c6ac428 100755 +index 2044051..52aa508 100755 --- a/libs/vss/vss_common.c +++ b/libs/vss/vss_common.c @@ -390,6 +390,22 @@ next: @@ -34,4 +34,3 @@ index 757c2fc..c6ac428 100755 sconf_free_cs(css); } - diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0009-mfw_isink-clear-framebuffer-of-spurious-content.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0008-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch similarity index 87% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0009-mfw_isink-clear-framebuffer-of-spurious-content.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0008-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch index 3eda6183e..992c60b7e 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0009-mfw_isink-clear-framebuffer-of-spurious-content.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0008-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch @@ -7,11 +7,11 @@ framebuffer which remains. The blank/unblank operation gets rid of it. Signed-off-by: Alex Gonzalez --- - libs/vss/vss_common.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + libs/vss/vss_common.c | 5 +++++ + 1 file changed, 5 insertions(+) diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c -index c6ac428..fb80f42 100755 +index 52aa508..ee74046 100755 --- a/libs/vss/vss_common.c +++ b/libs/vss/vss_common.c @@ -486,6 +486,11 @@ int _initVideoDevice(VideoDevice * vd, int mode_idx) @@ -26,4 +26,3 @@ index c6ac428..fb80f42 100755 if ((vd->resX==0) || (vd->resY==0)) goto error; - diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0010-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0009-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch similarity index 85% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0010-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0009-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch index 9510e5ac9..51be40222 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0010-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0009-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch @@ -13,14 +13,14 @@ that it won't perform a crop if the dimensions have not changed. Signed-off-by: Alex Gonzalez --- - src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + src/misc/v4l_sink/src/mfw_gst_v4lsink.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c -index e4f6aa0..b30f390 100755 +index 2227c3d..3ba9c78 100755 --- a/src/misc/v4l_sink/src/mfw_gst_v4lsink.c +++ b/src/misc/v4l_sink/src/mfw_gst_v4lsink.c -@@ -1852,6 +1852,7 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset, +@@ -1848,6 +1848,7 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset, gint frame_buffer_size; gint max_frames; gint hwbuffernumforcodec; @@ -28,7 +28,7 @@ index e4f6aa0..b30f390 100755 gboolean result = FALSE; -@@ -1990,7 +1991,6 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset, +@@ -1985,7 +1986,6 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset, return GST_FLOW_ERROR; } @@ -36,7 +36,7 @@ index e4f6aa0..b30f390 100755 /* Two cases: * 1. VPU will request buffer first, when pipeline enter running state, * every parameter is ready. -@@ -1999,13 +1999,15 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset, +@@ -1994,13 +1994,15 @@ mfw_gst_v4lsink_buffer_alloc (GstBaseSink * bsink, guint64 offset, */ if (element->current_state == GST_STATE_PLAYING) { @@ -54,4 +54,3 @@ index e4f6aa0..b30f390 100755 /* * The software H264 decoder need check the "num-buffers-required" - diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0010-gplay_next_file.patch similarity index 87% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0010-gplay_next_file.patch index a51399904..0671bcc98 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0010-gplay_next_file.patch @@ -11,14 +11,14 @@ CCORE_MX53_EXTENSIONS-142 Signed-off-by: Javier Viguera --- - tools/gplay/mfw_gplay.c | 1 + + tools/gplay/mfw_gplay.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gplay/mfw_gplay.c b/tools/gplay/mfw_gplay.c -index ee65100..de11e68 100755 +index 0bcd78c..45b49da 100755 --- a/tools/gplay/mfw_gplay.c +++ b/tools/gplay/mfw_gplay.c -@@ -876,6 +876,7 @@ int main(int argc,char *argv[]) +@@ -881,6 +881,7 @@ int main(int argc,char *argv[]) case '>': // Play next file printf("next\n"); if (playlist_next(pplayer, opt)==NULL){ diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0011-gplay_repeat.patch similarity index 95% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0011-gplay_repeat.patch index 943ce6781..77b0c53be 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0011-gplay_repeat.patch @@ -14,11 +14,11 @@ CCORE_MX53_EXTENSIONS-140 Signed-off-by: Javier Viguera --- - tools/gplay/mfw_gplay.c | 3 +++ + tools/gplay/mfw_gplay.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/gplay/mfw_gplay.c b/tools/gplay/mfw_gplay.c -index de11e68..5e5a6f1 100755 +index 45b49da..bc0bd7a 100755 --- a/tools/gplay/mfw_gplay.c +++ b/tools/gplay/mfw_gplay.c @@ -151,6 +151,7 @@ PlayItem * playlist_next(fsl_player_handle handle, options* opt) diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0012-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch similarity index 89% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0012-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch index f5c23a226..8416c8f21 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0012-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch @@ -1,16 +1,17 @@ From: Alex Gonzalez Date: Thu, 17 May 2012 10:46:39 +0200 -Subject: [PATCH] gst-fsl-plugin: Only call MXCFB_SET_OVERLAY_POS with overlay framebuffer. +Subject: [PATCH] gst-fsl-plugin: Only call MXCFB_SET_OVERLAY_POS with overlay + framebuffer. This is just to avoid the ioctl to return an error. Signed-off-by: Alex Gonzalez --- - libs/vss/vss_common.c | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) + libs/vss/vss_common.c | 22 ++++++++++++++-------- + 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c -index fb80f42..114b45b 100755 +index ee74046..7452274 100755 --- a/libs/vss/vss_common.c +++ b/libs/vss/vss_common.c @@ -686,10 +686,14 @@ _setDeviceConfig(VideoDevice * vd) @@ -49,4 +50,3 @@ index fb80f42..114b45b 100755 here2: VS_IOCTL(fd, FBIOBLANK, done, FB_BLANK_UNBLANK); - diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0013-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch similarity index 85% rename from meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch rename to meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0013-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch index d3cc51e6d..dd4767e89 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/files/gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin-2.0.3/0013-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch @@ -6,11 +6,11 @@ CCORE_MX53_EXTENSIONS-156 Signed-off-by: Alex Gonzalez --- - libs/vss/vss_common.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + libs/vss/vss_common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vss/vss_common.c b/libs/vss/vss_common.c -index 114b45b..8731da9 100755 +index 7452274..52cd126 100755 --- a/libs/vss/vss_common.c +++ b/libs/vss/vss_common.c @@ -744,7 +744,7 @@ _closeDevice(VideoDevice * vd) @@ -22,4 +22,3 @@ index 114b45b..8731da9 100755 close(fd); gFBDescs[vd->fbidx].fb_fd = 0; - diff --git a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend index a142af619..d21bc2f8a 100644 --- a/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend +++ b/meta-digi-del/recipes-multimedia/gst-fsl-plugin/gst-fsl-plugin_2.0.3.bbappend @@ -3,23 +3,22 @@ PRINC := "${@int(PRINC) + 1}" PR_append = "+${DISTRO}" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" SRC_URI += " \ - file://gst-fsl-plugin-2.0.3-0001-ltmain.patch \ - file://gst-fsl-plugin-2.0.3-0002-gplay_fullscreen.patch \ - file://gst-fsl-plugin-2.0.3-0003-add-fb-dev.patch \ - file://gst-fsl-plugin-2.0.3-0004-mfw_v4lsrc_uyvy.patch \ - file://gst-fsl-plugin-2.0.3-0005-mfw_v4lsec_def_sizes.patch \ - file://gst-fsl-plugin-2.0.3-0006-mfw_v4lsrc_create_segfault.patch \ - file://gst-fsl-plugin-2.0.3-0007-gplay_rotate.patch \ - file://gst-fsl-plugin-2.0.3-0008-mfw_isink-set-defaults-if-no-vssconfig-found.patch \ - file://gst-fsl-plugin-2.0.3-0009-mfw_isink-clear-framebuffer-of-spurious-content.patch \ - file://gst-fsl-plugin-2.0.3-0010-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch \ - file://gst-fsl-plugin-2.0.3-0011-gplay_next_file.patch \ - file://gst-fsl-plugin-2.0.3-0012-gplay_repeat.patch \ - file://gst-fsl-plugin-2.0.3-0013-Only-call-MXCFB_SET_OVERLAY_POS-with-overlay-framebuffer.patch \ - file://gst-fsl-plugin-2.0.3-0014-Do-not-blank-the-display-on-device-close.patch \ + file://0001-gplay_fullscreen.patch \ + file://0002-add-fb-dev.patch \ + file://0003-mfw_v4lsrc_uyvy.patch \ + file://0004-mfw_v4lsec_def_sizes.patch \ + file://0005-mfw_v4lsrc_create_segfault.patch \ + file://0006-gplay_rotate.patch \ + file://0007-mfw_isink-Set-defaults-if-no-vssconfig-found.patch \ + file://0008-gst-fsl-plugin-Clear-framebuffer-of-spurious-content.patch \ + file://0009-mfw_v4lsink-Do-not-ignore-cropping-dimensions.patch \ + file://0010-gplay_next_file.patch \ + file://0011-gplay_repeat.patch \ + file://0012-gst-fsl-plugin-Only-call-MXCFB_SET_OVERLAY_POS-with-.patch \ + file://0013-gst-fsl-plugin-Do-not-blank-the-display-on-device-cl.patch \ " do_install_append() {