[gnome-build-meta/mcatanzaro/openh264-2.3.1: 3/3] Update to OpenH264 2.3.1

[Jordan Petridis <jpetridis src gnome org>]

commit 87b49cd73ee7a4391e1bf7f4949464f00e436e16
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Mon Oct 3 14:31:10 2022 -0500

    Update to OpenH264 2.3.1

 elements/freedesktop-sdk.bst                 |   2 +
 files/freedesktop-sdk/noopenh264-2.3.1.patch | 206 +++++++++++++++++++++++++++
 2 files changed, 208 insertions(+)
---
diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst
index 0d30a27f1..0e67e7c45 100644
--- a/elements/freedesktop-sdk.bst
+++ b/elements/freedesktop-sdk.bst
@@ -4,6 +4,8 @@ sources:
   url: gitlab:freedesktop-sdk/freedesktop-sdk.git
   track: master
   track-tags: true
+- kind: patch
+  path: files/freedesktop-sdk/noopenh264-2.3.1.patch
 config:
   options:
     target_arch: '%{arch}'
diff --git a/files/freedesktop-sdk/noopenh264-2.3.1.patch b/files/freedesktop-sdk/noopenh264-2.3.1.patch
new file mode 100644
index 000000000..dbb902c34
--- /dev/null
+++ b/files/freedesktop-sdk/noopenh264-2.3.1.patch
@@ -0,0 +1,206 @@
+From f1bf1ee677dc0b37a6ddc595ee756ac72393289c Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro redhat com>
+Date: Mon, 3 Oct 2022 14:17:59 -0500
+Subject: [PATCH] Update to noopenh264 2.3.1
+
+---
+ elements/components/noopenh264.bst |  5 --
+ include/repo_branches.yml          |  2 +-
+ patches/noopenh264/11.patch        | 81 ------------------------------
+ patches/noopenh264/2.3.1.patch     | 63 +++++++++++++++++++++++
+ 4 files changed, 64 insertions(+), 87 deletions(-)
+ delete mode 100644 patches/noopenh264/11.patch
+ create mode 100644 patches/noopenh264/2.3.1.patch
+
+diff --git a/elements/components/noopenh264.bst b/elements/components/noopenh264.bst
+index 90e2feaa6..83d1158b9 100644
+--- a/elements/components/noopenh264.bst
++++ b/elements/components/noopenh264.bst
+@@ -28,9 +28,6 @@ config:
+     - |
+       rm %{install-root}%{extlibdir}/libopenh264.a
+ 
+-    - |
+-      ln -srL %{install-root}%{libdir}/libopenh264.so %{install-root}%{libdir}/libopenh264.so.5 
+-
+ public:
+   bst:
+     split-rules:
+@@ -43,8 +40,6 @@ 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:
+diff --git a/include/repo_branches.yml b/include/repo_branches.yml
+index 487b52b76..f61394c32 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.2.0'
++openh264-version: '2.3.1'
+diff --git a/patches/noopenh264/11.patch b/patches/noopenh264/11.patch
+deleted file mode 100644
+index 1fe7bbeb2..000000000
+--- a/patches/noopenh264/11.patch
++++ /dev/null
+@@ -1,81 +0,0 @@
+-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
+diff --git a/patches/noopenh264/2.3.1.patch b/patches/noopenh264/2.3.1.patch
+new file mode 100644
+index 000000000..8fe7d8d21
+--- /dev/null
++++ b/patches/noopenh264/2.3.1.patch
+@@ -0,0 +1,63 @@
++From 6b9dda57494791167909e0e3738ab35bb13a84f4 Mon Sep 17 00:00:00 2001
++From: Michael Catanzaro <mcatanzaro redhat com>
++Date: Thu, 29 Sep 2022 16:26:43 -0500
++Subject: [PATCH] Update to OpenH264 2.3.1
++
++---
++ codec/api/svc/codec_app_def.h |  4 +++-
++ codec/api/svc/codec_ver.h     | 10 +++++-----
++ meson.build                   |  4 ++--
++ 3 files changed, 10 insertions(+), 8 deletions(-)
++
++diff --git a/codec/api/svc/codec_app_def.h b/codec/api/svc/codec_app_def.h
++index bb3c3d6..9b13c33 100644
++--- a/codec/api/svc/codec_app_def.h
+++++ b/codec/api/svc/codec_app_def.h
++@@ -589,7 +589,9 @@ typedef struct TagEncParamExt {
++   bool    bEnableFrameCroppingFlag;    ///< enable frame cropping flag: TRUE always in application
++   bool    bEnableSceneChangeDetect;
++ 
++-  bool    bIsLosslessLink;            ///<  LTR advanced setting
+++  bool    bIsLosslessLink;             ///< LTR advanced setting
+++  bool    bFixRCOverShoot;             ///< fix rate control overshooting
+++  int     iIdrBitrateRatio;            ///< the target bits of IDR is (idr_bitrate_ratio/100) * average 
target bit per frame.
++ } SEncParamExt;
++ 
++ /**
++diff --git a/codec/api/svc/codec_ver.h b/codec/api/svc/codec_ver.h
++index adc1c3e..1f3e89b 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, 2, 0, 2201};
++-static const char* const g_strCodecVer  = "OpenH264 version:2.2.0.2201";
+++static const OpenH264Version g_stCodecVersion  = {2, 3, 1, 2209};
+++static const char* const g_strCodecVer  = "OpenH264 version:2.3.1.2209";
++ 
++ #define OPENH264_MAJOR (2)
++-#define OPENH264_MINOR (2)
++-#define OPENH264_REVISION (0)
++-#define OPENH264_RESERVED (2201)
+++#define OPENH264_MINOR (3)
+++#define OPENH264_REVISION (1)
+++#define OPENH264_RESERVED (2209)
++ 
++ #endif  // CODEC_VER_H
++diff --git a/meson.build b/meson.build
++index 6996583..b4ac24c 100644
++--- a/meson.build
+++++ b/meson.build
++@@ -8,8 +8,8 @@ project('noopenh264', ['cpp'],
++   ],
++ )
++ 
++-major_version = '6'
++-matching_version = '2.2.0'
+++major_version = '7'
+++matching_version = '2.3.1'
++ 
++ pkgconfig = import('pkgconfig')
++ 
+-- 
+2.37.3
+