summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2023-01-24 10:04:33 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2023-01-24 16:26:05 +0530
commitef2206bc8b9dedf94bc4d31c137d79018b69115b (patch)
tree17f0fedc94d381c29b196094cca9926a6d4e425a
parente78839b0aab6bbc0e389426c900e84486bd764a0 (diff)
libtheora.recipe: Do not require C11 for building
We still allow building with VS 2017, so we can't require this. Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1082>
-rw-r--r--recipes/libtheora/0001-Add-meson-build-system.patch3
-rw-r--r--recipes/libtheora/0001-theora-fix-library-so-versioning-and-add-darwin_vers.patch2
2 files changed, 2 insertions, 3 deletions
diff --git a/recipes/libtheora/0001-Add-meson-build-system.patch b/recipes/libtheora/0001-Add-meson-build-system.patch
index 6526bfa3..b3e4f447 100644
--- a/recipes/libtheora/0001-Add-meson-build-system.patch
+++ b/recipes/libtheora/0001-Add-meson-build-system.patch
@@ -677,7 +677,7 @@ new file mode 100644
index 0000000..a2d5248
--- /dev/null
+++ b/meson.build
-@@ -0,0 +1,227 @@
+@@ -0,0 +1,226 @@
+project(
+ 'theora',
+ 'c',
@@ -685,7 +685,6 @@ index 0000000..a2d5248
+ version: '1.1.1',
+ meson_version: '>= 0.49.0',
+ license: 'BSD-3-Clause',
-+ default_options: ['c_std=c11'],
+)
+
+conf = configuration_data()
diff --git a/recipes/libtheora/0001-theora-fix-library-so-versioning-and-add-darwin_vers.patch b/recipes/libtheora/0001-theora-fix-library-so-versioning-and-add-darwin_vers.patch
index 77e95012..f8812fa8 100644
--- a/recipes/libtheora/0001-theora-fix-library-so-versioning-and-add-darwin_vers.patch
+++ b/recipes/libtheora/0001-theora-fix-library-so-versioning-and-add-darwin_vers.patch
@@ -45,7 +45,7 @@ index a2d5248..d9a8627 100644
--- a/meson.build
+++ b/meson.build
@@ -8,6 +8,13 @@ project(
- default_options: ['c_std=c11'],
+ license: 'BSD-3-Clause',
)
+theora_libversion = '0.3.10'