From 37c82bc04e2547439ee7d27d27503ed1c20ae4f6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 8 Feb 2024 20:40:31 +0100 Subject: [PATCH] Update for openh264 2.4.0 --- .gitignore | 1 + 0001-Fix-the-build.patch | 27 +++++++++++++++++++++++++++ noopenh264.spec | 7 +++++-- sources | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 0001-Fix-the-build.patch diff --git a/.gitignore b/.gitignore index f0bec5b..5e03996 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /noopenh264-6be12bafe243b6b848f5f32103a3cdcfd20ceb34.tar.bz2 /noopenh264-openh264-2.3.1.tar.bz2 +/noopenh264-v2.4.0.tar.bz2 diff --git a/0001-Fix-the-build.patch b/0001-Fix-the-build.patch new file mode 100644 index 0000000..894bc16 --- /dev/null +++ b/0001-Fix-the-build.patch @@ -0,0 +1,27 @@ +From 1b4ace18e696d7f191941dbfd5ab4251e7b94b16 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 8 Feb 2024 20:30:06 +0100 +Subject: [PATCH] Fix the build + +Update meson.build to match the directory layout changes from commit +7a1ee6907e4ae8f3cdd2a4c87df3e5a98b48a7ea. +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index bc4b7c9..306c99a 100644 +--- a/meson.build ++++ b/meson.build +@@ -20,7 +20,7 @@ includedir = join_paths(prefix, get_option('includedir')) + cpp = meson.get_compiler('cpp') + + inc = include_directories([ +- join_paths('codec', 'api', 'svc'), ++ join_paths('codec', 'api', 'wels'), + ]) + + api_headers = [] +-- +2.43.0 + diff --git a/noopenh264.spec b/noopenh264.spec index 6b76967..dc8e5c6 100644 --- a/noopenh264.spec +++ b/noopenh264.spec @@ -1,4 +1,4 @@ -%global openh264_version 2.3.1 +%global openh264_version 2.4.0 %global openh264_soversion 7 Name: noopenh264 @@ -12,9 +12,12 @@ Summary: Fake implementation of the OpenH264 library License: BSD-2-Clause and LGPL-2.1-or-later URL: https://gitlab.com/freedesktop-sdk/noopenh264 -%global tag openh264-%{openh264_version} +%global tag v%{openh264_version} Source: %{url}/-/archive/%{tag}/noopenh264-%{tag}.tar.bz2 +# https://gitlab.com/freedesktop-sdk/noopenh264/-/merge_requests/6 +Patch: 0001-Fix-the-build.patch + BuildRequires: gcc-c++ BuildRequires: meson diff --git a/sources b/sources index 054bf08..6c3a482 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (noopenh264-openh264-2.3.1.tar.bz2) = 5f5c0d18e37a76287d68d87156b9ec1fc677afb1a9f3a0dd2d2090116e392b4cccc501c6451685fca40d35e044fdc897920241f34e4b9b2940edb1e24a715944 +SHA512 (noopenh264-v2.4.0.tar.bz2) = 39adf3c2e5b9a0b8b81905f0b2c37f1f6277b8a578ebc92aaf401b80d7c8a1b08d6c3f387a7217f66245b1bdcb824b6e167e844da7d4c24e34e35892ec35942e