diff mbox series

[meta-arago,master] gstreamer1.0-plugins-good: upgrade 1.24.x -> 1.26.x

Message ID 20250406183343.19797-1-reatmon@ti.com
State New
Headers show
Series [meta-arago,master] gstreamer1.0-plugins-good: upgrade 1.24.x -> 1.26.x | expand

Commit Message

Ryan Eatmon April 6, 2025, 6:33 p.m. UTC 
oe-core upgraded the version [1], so we need to match it.

[1] https://git.openembedded.org/openembedded-core/commit/?id=3bed80c1266ddca5d83357a18164598082e3a4fa

Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
 ...-for-bayer-formats-with-IR-component.patch | 32 +++++++++----------
 .../gstreamer1.0-plugins-good_1.24.%.bbappend |  4 ---
 ... gstreamer1.0-plugins-good_1.26-arago.inc} |  0
 .../gstreamer1.0-plugins-good_1.26.%.bbappend |  4 +++
 4 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.%.bbappend
 rename meta-arago-extras/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.24-arago.inc => gstreamer1.0-plugins-good_1.26-arago.inc} (100%)
 create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.%.bbappend
diff mbox series

Patch

diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch
index fc828d4d..933de895 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0002-Adding-support-for-bayer-formats-with-IR-component.patch
@@ -39,24 +39,24 @@  diff --git a/sys/v4l2/gstv4l2object.c b/sys/v4l2/gstv4l2object.c
 index 472a24ef55..9fe5dcc528 100644
 --- a/sys/v4l2/gstv4l2object.c
 +++ b/sys/v4l2/gstv4l2object.c
-@@ -195,6 +195,16 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
-   {MAP_FMT (SGRBG16, ENCODED),  GST_V4L2_BAYER},
-   {MAP_FMT (SRGGB16, ENCODED),  GST_V4L2_BAYER},
+@@ -215,6 +215,16 @@ static const GstV4L2FormatDesc gst_v4l2_formats[] = {
+   {MAP_ENC_FMT (SGRBG16, ENCODED),  GST_V4L2_BAYER},
+   {MAP_ENC_FMT (SRGGB16, ENCODED),  GST_V4L2_BAYER},
  
 +  /* Bayer formats - with IR component */
-+  {MAP_FMT (SRGGI10, ENCODED),  GST_V4L2_BAYER},
-+  {MAP_FMT (SGRIG10, ENCODED),  GST_V4L2_BAYER},
-+  {MAP_FMT (SBGGI10, ENCODED),  GST_V4L2_BAYER},
-+  {MAP_FMT (SGBIG10, ENCODED),  GST_V4L2_BAYER},
-+  {MAP_FMT (SGIRG10, ENCODED),  GST_V4L2_BAYER},
-+  {MAP_FMT (SIGGR10, ENCODED),  GST_V4L2_BAYER},
-+  {MAP_FMT (SGIBG10, ENCODED),  GST_V4L2_BAYER},
-+  {MAP_FMT (SIGGB10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SRGGI10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SGRIG10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SBGGI10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SGBIG10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SGIRG10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SIGGR10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SGIBG10, ENCODED),  GST_V4L2_BAYER},
++  {MAP_ENC_FMT (SIGGB10, ENCODED),  GST_V4L2_BAYER},
 +
    /* compressed formats */
-   {MAP_FMT (MJPEG, ENCODED),        GST_V4L2_CODEC},
-   {MAP_FMT (JPEG, ENCODED),         GST_V4L2_CODEC},
-@@ -1194,6 +1204,14 @@ gst_v4l2_object_format_get_rank (const struct v4l2_fmtdesc *fmt)
+   {MAP_ENC_FMT (MJPEG, ENCODED),        GST_V4L2_CODEC},
+   {MAP_ENC_FMT (JPEG, ENCODED),         GST_V4L2_CODEC},
+@@ -1215,6 +1225,14 @@ gst_v4l2_object_format_get_rank (const struct v4l2_fmtdesc *fmt)
      case V4L2_PIX_FMT_SGBRG16:
      case V4L2_PIX_FMT_SGRBG16:
      case V4L2_PIX_FMT_SRGGB16:
@@ -71,7 +71,7 @@  index 472a24ef55..9fe5dcc528 100644
        rank = BAYER_BASE_RANK;
        break;
  
-@@ -1574,6 +1592,24 @@ gst_v4l2_object_v4l2fourcc_to_bare_struct (guint32 fourcc)
+@@ -1642,6 +1660,24 @@ gst_v4l2_object_v4l2fourcc_to_bare_struct (guint32 fourcc)
      case V4L2_PIX_FMT_SRGGB16:
        bayer_format = "rggb16le";
        break;
@@ -96,7 +96,7 @@  index 472a24ef55..9fe5dcc528 100644
      case V4L2_PIX_FMT_SN9C10X:
        structure = gst_structure_new_empty ("video/x-sonix");
        break;
-@@ -1952,6 +1988,22 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps,
+@@ -2063,6 +2099,22 @@ gst_v4l2_object_get_caps_info (GstV4l2Object * v4l2object, GstCaps * caps,
          fourcc = V4L2_PIX_FMT_SGRBG16;
        else if (!g_ascii_strcasecmp (format, "rggb16le"))
          fourcc = V4L2_PIX_FMT_SRGGB16;
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.%.bbappend
deleted file mode 100644
index e2e8b043..00000000
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24.%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@ 
-GSTREAMER1p0_PLUGINS_GOOD_1p24_ARAGO = ""
-GSTREAMER1p0_PLUGINS_GOOD_1p24_ARAGO:arago = "gstreamer1.0-plugins-good_1.24-arago.inc"
-
-require ${GSTREAMER1p0_PLUGINS_GOOD_1p24_ARAGO}
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24-arago.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26-arago.inc
similarity index 100%
rename from meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.24-arago.inc
rename to meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26-arago.inc
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.%.bbappend b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.%.bbappend
new file mode 100644
index 00000000..0ceb558c
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.26.%.bbappend
@@ -0,0 +1,4 @@ 
+GSTREAMER1p0_PLUGINS_GOOD_1p26_ARAGO = ""
+GSTREAMER1p0_PLUGINS_GOOD_1p26_ARAGO:arago = "gstreamer1.0-plugins-good_1.26-arago.inc"
+
+require ${GSTREAMER1p0_PLUGINS_GOOD_1p26_ARAGO}