Commit 35b3275d authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠
Browse files

openh264: update to v2.1.1

Part-of: <gstreamer/cerbero!493>
parent b1aaed69
......@@ -4,11 +4,12 @@ from cerbero.tools.libtool import LibtoolLibrary
class Recipe(recipe.Recipe):
name = 'openh264'
version = '2.1.0'
version = '2.1.1'
url = 'https://github.com/cisco/%(name)s/archive/v%(version)s.tar.gz'
tarball_checksum = '27f185d478066bad0c8837f4554cd8d69cca1d55d5f3dc6a43a8cef1fe6c005f'
tarball_checksum = 'af173e90fce65f80722fa894e1af0d6b07572292e76de7b65273df4c0a8be678'
stype = SourceType.TARBALL
btype = BuildType.MESON
meson_options = {'tests': 'disabled'}
licenses = [{License.BSD: ['LICENSE']}]
files_libs = ['libopenh264']
files_devel = ['include/wels', 'lib/pkgconfig/openh264.pc']
......@@ -16,12 +17,6 @@ class Recipe(recipe.Recipe):
# https://github.com/cisco/openh264/pull/3247
name + "/0001-meson-add-support-for-android-ios-macos.patch",
name + "/0001-depend-on-gnustl-for-android.patch",
# https://github.com/cisco/openh264/pull/3256
name + "/0001-meson-disable-tests-automatically-it-gtest-is-not-fo.patch",
# https://github.com/cisco/openh264/pull/3265
name + '/0001-Bump-ABI-to-version-6.patch',
# https://github.com/cisco/openh264/pull/3263
name + '/0001-Update-version-number-in-meson.build.patch',
]
def post_install(self):
......
From d644364cd0d7d69959e44a958499052b24acbed7 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Tue, 7 Apr 2020 15:24:54 -0500
Subject: [PATCH] Bump ABI to version 6
bbcc2cb changed the size of SBufferInfo, so we need to bump from ABI
version 5 to version 6.
Fixes #3264
---
Makefile | 2 +-
meson.build | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index bf398d79..5a1666b2 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,7 @@ CCASFLAGS=$(CFLAGS)
STATIC_LDFLAGS=-lstdc++
STRIP ?= strip
-SHAREDLIB_MAJORVERSION=5
+SHAREDLIB_MAJORVERSION=6
FULL_VERSION := 2.1.0
ifeq (,$(wildcard $(SRC_PATH)gmp-api))
diff --git a/meson.build b/meson.build
index dc677ef2..4cd3baa2 100644
--- a/meson.build
+++ b/meson.build
@@ -4,7 +4,7 @@ project('openh264', ['c', 'cpp'],
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
-major_version = '5'
+major_version = '6'
cpp = meson.get_compiler('cpp')
--
2.26.1.windows.1
From 4a51b79bf680b77687dc374ab4f992c0104e19fb Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Mon, 6 Apr 2020 19:20:30 -0500
Subject: [PATCH] Update version number in meson.build
This was forgotten before the 2.1.0 release.
It seems the 2.1.0 release tarballs were not generated with 'meson dist'. Using 'meson dist' to build and validate the tarball would allow immediately noticing such issues.
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index dc677ef2..f15251b3 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
project('openh264', ['c', 'cpp'],
- version : '2.0.0',
+ version : '2.1.0',
meson_version : '>= 0.47',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
--
2.26.1.windows.1
From 155a641c3fc4787d381ba15692f99d61e3bd9b53 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Thu, 26 Mar 2020 11:00:14 +1100
Subject: [PATCH] meson: disable tests automatically it gtest is not found
---
test/meson.build | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/test/meson.build b/test/meson.build
index 4cda986..5be8eda 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,17 +1,19 @@
-if not get_option('tests').disabled()
- gtest_main_dep = dependency('gtest', main : true, fallback: ['gtest', 'gtest_main_dep'], required: true)
- gtest_dep = dependency('gtest', fallback: ['gtest', 'gtest_dep'], required: true)
+build_tests = get_option('tests')
+
+if not build_tests.disabled()
+ gtest_main_dep = dependency('gtest', main : true, fallback: ['gtest', 'gtest_main_dep'], required: build_tests)
+ gtest_dep = dependency('gtest', fallback: ['gtest', 'gtest_dep'], required: build_tests)
test_inc = include_directories('.')
test_data_generator_sources = files('api/DataGenerator.cpp')
test_base_encoder_sources = files('api/BaseEncoderTest.cpp')
- if gtest_dep.found()
+ if gtest_dep.found() and gtest_main_dep.found()
subdir('api')
subdir('common')
subdir('decoder')
subdir('encoder')
subdir('processing')
endif
-endif
\ No newline at end of file
+endif
--
2.25.2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment