[gnome-build-meta/alatiera/h264-2] Attempt n2 at fixing the openh264 plugin

[Marge Bot <marge-bot src gnome org>]

commit b464168227f2e92b9f57509b5806b89fe1d01d50
Author: Jordan Petridis <jordan centricular com>
Date:   Mon Sep 5 05:07:24 2022 +0300

    Attempt n2 at fixing the openh264 plugin
    
    Upstream MR: https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/merge_requests/9575
    
    Followup to c15d8dcc1ee1f46694a967fdf125bf5bbf1a3769
    
    See #507
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1749>

 elements/freedesktop-sdk.bst                     |   2 +-
 files/freedesktop-sdk/{9566.patch => 9576.patch} | 184 ++++++++++++++++-------
 2 files changed, 131 insertions(+), 55 deletions(-)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 9a92b706c..e774204a0 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -7,7 +7,7 @@ sources:
 - kind: patch
   path: files/freedesktop-sdk/9564.patch
 - kind: patch
-  path: files/freedesktop-sdk/9566.patch
+  path: files/freedesktop-sdk/9576.patch
 config:
   options:
     target_arch: '%{arch}'
diff --git a/files/freedesktop-sdk/9566.patch b/files/freedesktop-sdk/9576.patch
similarity index 60%
rename from files/freedesktop-sdk/9566.patch
rename to files/freedesktop-sdk/9576.patch
index 4eb2d92f4..9db7a32b3 100644
--- a/files/freedesktop-sdk/9566.patch
+++ b/files/freedesktop-sdk/9576.patch
@@ -1,33 +1,146 @@
-From 0ec8df2339232ea4417d4302273d7f3659840d28 Mon Sep 17 00:00:00 2001
+From a65ffd61a46631711553ee9d29cc745e8a58cf2d Mon Sep 17 00:00:00 2001
 From: Jordan Petridis <jordan centricular com>
-Date: Sat, 3 Sep 2022 23:57:27 +0300
-Subject: [PATCH] gstreamer: Backport patch for the openh264 plugin
-
-Also backport patch to sync the noh264 headers
+Date: Mon, 5 Sep 2022 04:55:48 +0300
+Subject: [PATCH 1/2] Revert "Update to openh264 2.3.0"
 
-Upstream patches:
+Upstream PR: https://github.com/endlessm/noopenh264/pull/11
 
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2918
-
-https://github.com/endlessm/noopenh264/pull/10
+This reverts commit 37fc51936111c14779c5c8b77ddbfa7ae2583ccb.
 ---
- elements/components/noopenh264.bst |  2 +
- patches/gstreamer/2924.patch       | 84 ++++++++++++++++++++++++++++++
- patches/noopenh264/10.patch        | 31 +++++++++++
- 3 files changed, 117 insertions(+)
- create mode 100644 patches/gstreamer/2924.patch
- create mode 100644 patches/noopenh264/10.patch
+ elements/components/noopenh264.bst |  5 ++
+ include/repo_branches.yml          |  2 +-
+ patches/noopenh264/11.patch        | 81 ++++++++++++++++++++++++++++++
+ 3 files changed, 87 insertions(+), 1 deletion(-)
+ create mode 100644 patches/noopenh264/11.patch
 
 diff --git a/elements/components/noopenh264.bst b/elements/components/noopenh264.bst
-index b66046fe6e..b7c4f770e0 100644
+index b66046fe6e..90e2feaa64 100644
 --- a/elements/components/noopenh264.bst
 +++ b/elements/components/noopenh264.bst
-@@ -46,3 +46,5 @@ sources:
+@@ -43,6 +43,11 @@ sources:
+ - kind: git_tag
+   url: github:endlessm/noopenh264.git
+   track: master
++  # There is no tag for 2.2.0
++  # This is a tag for 2.3.0 but the patches revert the version back to 2.2.0
++  track-tags: false
    ref: Version_2.3.0-0-g750147f1e5af5cd9f47ffabef996c335b1ba0481
    exclude:
    - Release*
 +- kind: patch_queue
 +  path: patches/noopenh264
+diff --git a/include/repo_branches.yml b/include/repo_branches.yml
+index d2cc2d5150..487b52b76b 100644
+--- a/include/repo_branches.yml
++++ b/include/repo_branches.yml
+@@ -3,4 +3,4 @@
+ #
+ freedesktop-sdk-flatpak-branch: '22.08'
+ freedesktop-sdk-snap-branch: '2208'
+-openh264-version: '2.3.0'
++openh264-version: '2.2.0'
+diff --git a/patches/noopenh264/11.patch b/patches/noopenh264/11.patch
+new file mode 100644
+index 0000000000..1fe7bbeb2e
+--- /dev/null
++++ b/patches/noopenh264/11.patch
+@@ -0,0 +1,81 @@
++From a5435aabdeb4516f249db95b399d6d97f4084d31 Mon Sep 17 00:00:00 2001
++From: Jordan Petridis <jordan centricular com>
++Date: Mon, 5 Sep 2022 04:42:55 +0300
++Subject: [PATCH 1/3] Revert "Merge pull request #9 from nanonyme/2.3.0"
++
++This reverts commit 7fbabfb3ccd5170e0d02e4c84bbe3ff694ba23e3, reversing
++changes made to dfe5e4ecc78c4b13b31b8f8c611373a769fe838c.
++---
++ meson.build | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/meson.build b/meson.build
++index 3a7dc05..6996583 100644
++--- a/meson.build
+++++ b/meson.build
++@@ -9,7 +9,7 @@ project('noopenh264', ['cpp'],
++ )
++ 
++ major_version = '6'
++-matching_version = '2.3.0'
+++matching_version = '2.2.0'
++ 
++ pkgconfig = import('pkgconfig')
++ 
++
++From eee5ae5d4f0c841a057ddefb6c1e22c6b05f68bd Mon Sep 17 00:00:00 2001
++From: Jordan Petridis <jordan centricular com>
++Date: Mon, 5 Sep 2022 04:42:29 +0300
++Subject: [PATCH 2/3] Revert "Bump package version to 2.3.0"
++
++This reverts commit 750147f1e5af5cd9f47ffabef996c335b1ba0481.
++---
++ debian/changelog | 6 ------
++ 1 file changed, 6 deletions(-)
++
++diff --git a/debian/changelog b/debian/changelog
++index 13c2c80..14e427b 100644
++--- a/debian/changelog
+++++ b/debian/changelog
++@@ -1,9 +1,3 @@
++-noopenh264 (2.3.0) eos; urgency=medium
++-
++-  * Update to match new upstream version.
++-
++- -- Will Thompson <wjt endlessos org>  Mon, 01 Aug 2022 18:07:27 +0100
++-
++ noopenh264 (2.1.1-2) eos; urgency=medium
++ 
++   * Revert changes to add plumbing to openh264 flatpak runtime, this is
++
++From d8c760615f2eaff6f592ae786b4b7f64a2b39c41 Mon Sep 17 00:00:00 2001
++From: Jordan Petridis <jordan centricular com>
++Date: Mon, 5 Sep 2022 04:43:35 +0300
++Subject: [PATCH 3/3] codec_ver.h: Sync version header for 2.2.0
++
++---
++ codec/api/svc/codec_ver.h | 10 +++++-----
++ 1 file changed, 5 insertions(+), 5 deletions(-)
++
++diff --git a/codec/api/svc/codec_ver.h b/codec/api/svc/codec_ver.h
++index f45ab3f..adc1c3e 100644
++--- a/codec/api/svc/codec_ver.h
+++++ b/codec/api/svc/codec_ver.h
++@@ -4,12 +4,12 @@
++ 
++ #include "codec_app_def.h"
++ 
++-static const OpenH264Version g_stCodecVersion  = {2, 1, 1, 2005};
++-static const char* const g_strCodecVer  = "OpenH264 version:2.1.1.2005";
+++static const OpenH264Version g_stCodecVersion  = {2, 2, 0, 2201};
+++static const char* const g_strCodecVer  = "OpenH264 version:2.2.0.2201";
++ 
++ #define OPENH264_MAJOR (2)
++-#define OPENH264_MINOR (1)
++-#define OPENH264_REVISION (1)
++-#define OPENH264_RESERVED (2005)
+++#define OPENH264_MINOR (2)
+++#define OPENH264_REVISION (0)
+++#define OPENH264_RESERVED (2201)
++ 
++ #endif  // CODEC_VER_H
+-- 
+GitLab
+
+
+From 5a3c18086ed9c3196641c066d2f16dfc0854d7d0 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jordan centricular com>
+Date: Sat, 3 Sep 2022 23:57:27 +0300
+Subject: [PATCH 2/2] gstreamer: Backport patch for the openh264 plugin
+
+https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2918
+---
+ patches/gstreamer/2924.patch | 84 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 84 insertions(+)
+ create mode 100644 patches/gstreamer/2924.patch
+
 diff --git a/patches/gstreamer/2924.patch b/patches/gstreamer/2924.patch
 new file mode 100644
 index 0000000000..e39650619b
@@ -118,43 +231,6 @@ index 0000000000..e39650619b
 +-- 
 +GitLab
 +
-diff --git a/patches/noopenh264/10.patch b/patches/noopenh264/10.patch
-new file mode 100644
-index 0000000000..ef04bc69f6
---- /dev/null
-+++ b/patches/noopenh264/10.patch
-@@ -0,0 +1,31 @@
-+From c0c59756f78c46953484cf5de9af1e2e24d64002 Mon Sep 17 00:00:00 2001
-+From: Jordan Petridis <jordan centricular com>
-+Date: Sat, 3 Sep 2022 23:44:33 +0300
-+Subject: [PATCH] codec_ver.h: Sync for 2.3.0
-+
-+---
-+ codec/api/svc/codec_ver.h | 10 +++++-----
-+ 1 file changed, 5 insertions(+), 5 deletions(-)
-+
-+diff --git a/codec/api/svc/codec_ver.h b/codec/api/svc/codec_ver.h
-+index f45ab3f..0944109 100644
-+--- a/codec/api/svc/codec_ver.h
-++++ b/codec/api/svc/codec_ver.h
-+@@ -4,12 +4,12 @@
-+ 
-+ #include "codec_app_def.h"
-+ 
-+-static const OpenH264Version g_stCodecVersion  = {2, 1, 1, 2005};
-+-static const char* const g_strCodecVer  = "OpenH264 version:2.1.1.2005";
-++static const OpenH264Version g_stCodecVersion  = {2, 3, 0, 2206};
-++static const char* const g_strCodecVer  = "OpenH264 version:2.3.0.2206";
-+ 
-+ #define OPENH264_MAJOR (2)
-+-#define OPENH264_MINOR (1)
-+-#define OPENH264_REVISION (1)
-+-#define OPENH264_RESERVED (2005)
-++#define OPENH264_MINOR (3)
-++#define OPENH264_REVISION (0)
-++#define OPENH264_RESERVED (2206)
-+ 
-+ #endif  // CODEC_VER_H
 -- 
 GitLab