sf-gst-omx: Upgrade to 1.22.0 to match core

Signed-off-by: Khem Raj <raj.khem@gmail.com>

recipes-multimedia/gstreamer/sf-gst-omx/0001-add-starfive-support.patch

@@ -1,5 +1,3 @@
-diff --git a/config/meson.build b/config/meson.build
-index 1068c6d..7f8abe9 100755
 --- a/config/meson.build
 +++ b/config/meson.build
 @@ -6,6 +6,8 @@ elif omx_target == 'zynqultrascaleplus'
@@ -11,9 +9,6 @@ index 1068c6d..7f8abe9 100755
  else
    # No config file defined for the 'generic' target
    sub = ''
-diff --git a/config/stf/gstomx.conf b/config/stf/gstomx.conf
-new file mode 100644
-index 0000000..b4cdebb
 --- /dev/null
 +++ b/config/stf/gstomx.conf
 @@ -0,0 +1,17 @@
@@ -34,19 +29,14 @@ index 0000000..b4cdebb
 +out-port-index=1
 +rank=1
 +hacks=pass-profile-to-decoder;pass-color-format-to-decoder;ensure-buffer-count-actual
-diff --git a/config/stf/meson.build b/config/stf/meson.build
-new file mode 100644
-index 0000000..dc99c08
 --- /dev/null
 +++ b/config/stf/meson.build
 @@ -0,0 +1 @@
 +install_data (['gstomx.conf'], install_dir : omx_conf_dir)
-diff --git a/meson.build b/meson.build
-index 32c7fa7..aeda56a 100755
 --- a/meson.build
 +++ b/meson.build
-@@ -216,6 +216,8 @@ elif omx_target == 'tizonia'
-   tizil_includedir = tizil_dep.get_pkgconfig_variable('includedir')
+@@ -227,6 +227,8 @@ elif omx_target == 'tizonia'
+   tizil_includedir = tizil_dep.get_variable('includedir')
    gst_omx_args += ['-I' + tizil_includedir + '/tizonia']
    omx_inc = []
 +elif omx_target == 'stf'
@@ -54,8 +44,6 @@ index 32c7fa7..aeda56a 100755
  else
    error ('Unsupported omx target specified. Use the -Dtarget option')
  endif
-diff --git a/meson_options.txt b/meson_options.txt
-index e18beb2..4fc6139 100755
 --- a/meson_options.txt
 +++ b/meson_options.txt
 @@ -1,7 +1,7 @@

recipes-multimedia/gstreamer/sf-gst-omx/0002-Fix-gst-omx-Enable-the-gst-omx-VPU-decoding-and-enco.patch

@@ -6,11 +6,9 @@ Subject: [PATCH] Fix(gst-omx): Enable the gst-omx VPU decoding and encoding
 
 ---
 
-diff --git a/meson.build b/meson.build
-index aeda56a..48121ab 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -217,6 +217,7 @@ elif omx_target == 'tizonia'
+@@ -228,6 +228,7 @@ elif omx_target == 'tizonia'
    gst_omx_args += ['-I' + tizil_includedir + '/tizonia']
    omx_inc = []
  elif omx_target == 'stf'
@@ -18,11 +16,9 @@ index aeda56a..48121ab 100644
    warning('stf selected')
  else
    error ('Unsupported omx target specified. Use the -Dtarget option')
-diff --git a/omx/gstomxh264enc.c b/omx/gstomxh264enc.c
-index 51d84a8..875f974 100644
 --- a/omx/gstomxh264enc.c
 +++ b/omx/gstomxh264enc.c
-@@ -824,6 +824,11 @@ gst_omx_h264_enc_get_caps (GstOMXVideoEnc * enc, GstOMXPort * port,
+@@ -824,6 +824,11 @@ gst_omx_h264_enc_get_caps (GstOMXVideoEn
        case OMX_VIDEO_AVCLevel51:
          level = "5.1";
          break;
@@ -34,19 +30,17 @@ index 51d84a8..875f974 100644
  #ifdef USE_OMX_TARGET_ZYNQ_USCALE_PLUS
        case OMX_ALG_VIDEO_AVCLevel52:
          level = "5.2";
-@@ -837,6 +842,7 @@ gst_omx_h264_enc_get_caps (GstOMXVideoEnc * enc, GstOMXPort * port,
-       case OMX_ALG_VIDEO_AVCLevel62:
+@@ -838,6 +843,7 @@ gst_omx_h264_enc_get_caps (GstOMXVideoEn
          level = "6.2";
          break;
-+#endif
  #endif
++#endif
        default:
          g_assert_not_reached ();
-diff --git a/omx/gstomxh264utils.c b/omx/gstomxh264utils.c
-index ba29211..a6e95e3 100644
+         gst_caps_unref (caps);
 --- a/omx/gstomxh264utils.c
 +++ b/omx/gstomxh264utils.c
-@@ -115,6 +115,10 @@ gst_omx_h264_utils_get_level_from_str (const gchar * level)
+@@ -115,6 +115,10 @@ gst_omx_h264_utils_get_level_from_str (c
      return OMX_VIDEO_AVCLevel5;
    } else if (g_str_equal (level, "5.1")) {
      return OMX_VIDEO_AVCLevel51;
@@ -57,14 +51,11 @@ index ba29211..a6e95e3 100644
  #ifdef USE_OMX_TARGET_ZYNQ_USCALE_PLUS
    } else if (g_str_equal (level, "5.2")) {
      return (OMX_VIDEO_AVCLEVELTYPE) OMX_ALG_VIDEO_AVCLevel52;
-@@ -124,6 +128,7 @@ gst_omx_h264_utils_get_level_from_str (const gchar * level)
-     return (OMX_VIDEO_AVCLEVELTYPE) OMX_ALG_VIDEO_AVCLevel61;
+@@ -125,6 +129,7 @@ gst_omx_h264_utils_get_level_from_str (c
    } else if (g_str_equal (level, "6.2")) {
      return (OMX_VIDEO_AVCLEVELTYPE) OMX_ALG_VIDEO_AVCLevel62;
-+#endif
  #endif
++#endif
    }
-
--- 
-2.17.1
-
+ 
+   return OMX_VIDEO_AVCLevelMax;

recipes-multimedia/gstreamer/sf-gst-omx/0012-combine-sps-pps-header-to-idr.patch

@@ -2,10 +2,9 @@ Combine SPS/PPS header to IDR frame.
 
 Signed-off-by: Windsome Zeng <windsome.zeng@starfivetech.com>
 
-diff -purN a/meson.build b/meson.build
---- a/meson.build	2022-05-13 11:31:02.725614796 +0800
-+++ b/meson.build	2022-05-13 11:32:26.213975419 +0800
-@@ -218,6 +218,7 @@ elif omx_target == 'tizonia'
+--- a/meson.build
++++ b/meson.build
+@@ -229,6 +229,7 @@ elif omx_target == 'tizonia'
    omx_inc = []
  elif omx_target == 'stf'
    cdata.set('USE_OMX_TARGET_STARFIVE', 1)
@@ -13,9 +12,8 @@ diff -purN a/meson.build b/meson.build
    warning('stf selected')
  else
    error ('Unsupported omx target specified. Use the -Dtarget option')
-diff -purN a/omx/gstomx.c b/omx/gstomx.c
---- a/omx/gstomx.c	2022-05-13 11:31:02.725614796 +0800
-+++ b/omx/gstomx.c	2022-05-13 11:33:15.461950978 +0800
+--- a/omx/gstomx.c
++++ b/omx/gstomx.c
 @@ -70,6 +70,11 @@ static GHashTable *core_handles;
  G_LOCK_DEFINE_STATIC (buffer_flags_str);
  static GHashTable *buffer_flags_str;

recipes-multimedia/gstreamer/sf-gst-omx_1.22.0.bb

@@ -11,8 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
 SRC_URI = " \
     https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-${PV}.tar.xz \
 "
-
-SRC_URI[sha256sum] = "2cd457c1e8deb1a9b39608048fb36a44f6c9a864a6b6115b1453a32e7be93b42"
+SRC_URI[sha256sum] = "dbc951a99af532380e599aa8acd9e1385fdb299b46b5868cd2be4230ad888341"
 
 S = "${WORKDIR}/gst-omx-${PV}"