openh264: update to 2.1.0

5 files changed, 54 insertions, 64 deletions

diff --git a/recipes/openh264.recipe b/recipes/openh264.recipe
index aacb9b2a..057fd81c 100644
--- a/recipes/openh264.recipe
+++ b/recipes/openh264.recipe
@@ -4,20 +4,20 @@ from cerbero.tools.libtool import LibtoolLibrary
 
 class Recipe(recipe.Recipe):
     name = 'openh264'
-    version = '2.0.0'
+    version = '2.1.0'
     url = 'https://github.com/cisco/%(name)s/archive/v%(version)s.tar.gz'
-    tarball_checksum = '73c35f80cc487560d11ecabb6d31ad828bd2f59d412f9cd726cc26bfaf4561fd'
+    tarball_checksum = '27f185d478066bad0c8837f4554cd8d69cca1d55d5f3dc6a43a8cef1fe6c005f'
     stype = SourceType.TARBALL
     btype = BuildType.MESON
     licenses = [{License.BSD: ['LICENSE']}]
     files_libs = ['libopenh264']
     files_devel = ['include/wels', 'lib/pkgconfig/openh264.pc']
     patches = [
-                # https://github.com/cisco/openh264/commit/d4518b3f184d538c03c3c15d3b64b5a41ebfa529
-                name + "/0001-meson-build-Bump-soname-version-to-5.patch",
                 # 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",
                ]
 
     def post_install(self):
diff --git a/recipes/openh264/0001-meson-add-support-for-android-ios-macos.patch b/recipes/openh264/0001-meson-add-support-for-android-ios-macos.patch
index 8140e5b0..8c22e259 100644
--- a/recipes/openh264/0001-meson-add-support-for-android-ios-macos.patch
+++ b/recipes/openh264/0001-meson-add-support-for-android-ios-macos.patch
@@ -1,4 +1,4 @@
-From 06a37c4b2ab6b0ba8084d574104f401c66601180 Mon Sep 17 00:00:00 2001
+From b302338291c762bfde28ba0085af59709c46ccc3 Mon Sep 17 00:00:00 2001
 From: Matthew Waters <matthew@centricular.com>
 Date: Tue, 10 Mar 2020 12:06:56 +1100
 Subject: [PATCH 1/2] meson: add support for android, ios, macos
@@ -74,11 +74,11 @@ index d7d15a6..7f8acb6 100644
 +  include_directories: [inc, casm_inc],
    dependencies: deps)
 diff --git a/codec/decoder/meson.build b/codec/decoder/meson.build
-index f93837e..2991df6 100644
+index e4d123c..1131022 100644
 --- a/codec/decoder/meson.build
 +++ b/codec/decoder/meson.build
-@@ -21,13 +21,27 @@ cpp_sources = [
-   'plus/src/welsDecoderExt.cpp',
+@@ -22,13 +22,27 @@ cpp_sources = [
+   'core/src/wels_decoder_thread.cpp',
  ]
  
 -asm_sources = [
@@ -231,7 +231,7 @@ index b7560e3..d38dfb1 100644
 +  include_directories: [inc, processing_inc, casm_inc],
    dependencies: deps)
 diff --git a/meson.build b/meson.build
-index 72a36a4..1afb712 100644
+index dc677ef..d6231b8 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -36,8 +36,6 @@ encoder_inc = include_directories([
@@ -337,9 +337,9 @@ index 72a36a4..1afb712 100644
  
  api_headers = []
  api_header_deps = []
-@@ -126,18 +155,21 @@ foreach t : ['', '-static']
-   pkgconf = configuration_data()
+@@ -127,18 +156,21 @@ foreach t : ['', '-static']
    pkgconf.set('prefix', join_paths(get_option('prefix')))
+   pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir')))
    pkgconf.set('VERSION', meson.project_version())
 +  pkglibs = cpp_lib
 +  if libm_dep.found()
@@ -366,5 +366,5 @@ index 72a36a4..1afb712 100644
      input: 'openh264.pc.in',
      output: 'openh264@0@.pc'.format(t),
 -- 
-2.25.1
+2.25.2
 
diff --git a/recipes/openh264/0001-meson-build-Bump-soname-version-to-5.patch b/recipes/openh264/0001-meson-build-Bump-soname-version-to-5.patch
deleted file mode 100644
index afd132b7..00000000
--- a/recipes/openh264/0001-meson-build-Bump-soname-version-to-5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d4518b3f184d538c03c3c15d3b64b5a41ebfa529 Mon Sep 17 00:00:00 2001
-From: Thomas Coldrick <othko97@gmail.com>
-Date: Thu, 29 Aug 2019 15:09:50 +0100
-Subject: [PATCH] meson.build: Bump soname version to 5
-
----
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 8813deb8a..72a36a4cc 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1,10 +1,10 @@
- project('openh264', ['c', 'cpp'],
--  version : '1.8.0',
-+  version : '2.0.0',
-   meson_version : '>= 0.43',
-   default_options : [ 'warning_level=1',
-                       'buildtype=debugoptimized' ])
- 
--major_version = '4'
-+major_version = '5'
- 
- cpp = meson.get_compiler('cpp')
- 
diff --git a/recipes/openh264/0001-meson-disable-tests-automatically-it-gtest-is-not-fo.patch b/recipes/openh264/0001-meson-disable-tests-automatically-it-gtest-is-not-fo.patch
new file mode 100644
index 00000000..668f2aa3
--- /dev/null
+++ b/recipes/openh264/0001-meson-disable-tests-automatically-it-gtest-is-not-fo.patch
@@ -0,0 +1,42 @@
+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
+
diff --git a/recipes/openh264/0001-meson-libm-is-not-always-available.patch b/recipes/openh264/0001-meson-libm-is-not-always-available.patch
deleted file mode 100644
index f2cac972..00000000
--- a/recipes/openh264/0001-meson-libm-is-not-always-available.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8531f3c14ab60a7260d708ba6cad5fd0b1bea224 Mon Sep 17 00:00:00 2001
-From: Matthew Waters <matthew@centricular.com>
-Date: Tue, 10 Mar 2020 14:27:24 +1100
-Subject: [PATCH] meson: libm is not always available
-
-It may be inside libc
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 330b561..ab35cd8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -88,7 +88,7 @@ if ['linux', 'android', 'ios', 'darwin'].contains(system)
-     error ('FIXME: unhandled CPU family @0@ for @1@'.format(cpu_family, system))
-   endif
- 
--  deps += [cpp.find_library('libm')]
-+  deps += [cpp.find_library('libm', required : false)]
- elif system == 'windows'
-   if cpu_family == 'x86'
-     asm_format = 'win32'
--- 
-2.25.1
-