meson: Mark newly fdkaac/ogg/vorbis as allow fallback

This way when the dep is `auto` we will fallback if the system
dependency is not available.

And use https to get libvorbis

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1171>

diff --git a/subprojects/gst-plugins-bad/ext/fdkaac/meson.build b/subprojects/gst-plugins-bad/ext/fdkaac/meson.build
index d69c9b3..c9ef2bc 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/fdkaac/meson.build
+++ b/subprojects/gst-plugins-bad/ext/fdkaac/meson.build
@@ -1,4 +1,4 @@
-fdkaac_dep = dependency('fdk-aac', required : get_option('fdkaac'))
+fdkaac_dep = dependency('fdk-aac', allow_fallback: true, required : get_option('fdkaac'))
 
 if fdkaac_dep.found()
   fdkaac_defines = []

diff --git a/subprojects/gst-plugins-base/ext/ogg/meson.build b/subprojects/gst-plugins-base/ext/ogg/meson.build
index 4ff7b6b..d6b133b 100644 (file)
--- a/subprojects/gst-plugins-base/ext/ogg/meson.build
+++ b/subprojects/gst-plugins-base/ext/ogg/meson.build
@@ -10,7 +10,7 @@ ogg_sources = [
   'vorbis_parse.c',
 ]
 
-ogg_dep = dependency('ogg', version : '>=1.0', required : get_option('ogg'))
+ogg_dep = dependency('ogg', allow_fallback: true, version : '>=1.0', required : get_option('ogg'))
 core_conf.set('HAVE_OGG', ogg_dep.found())
 
 if ogg_dep.found()

diff --git a/subprojects/gst-plugins-base/ext/vorbis/meson.build b/subprojects/gst-plugins-base/ext/vorbis/meson.build
index a55249a..23fdf37 100644 (file)
--- a/subprojects/gst-plugins-base/ext/vorbis/meson.build
+++ b/subprojects/gst-plugins-base/ext/vorbis/meson.build
@@ -17,9 +17,9 @@ vorbisidec_sources = [
   'gstvorbiscommon.c',
 ]
 
-vorbis_dep = dependency('vorbis', version : '>= 1.3.1', required : get_option('vorbis'))
-vorbisenc_dep = dependency('vorbisenc', version : '>= 1.3.1', required : get_option('vorbis'))
-vorbisidec_dep = dependency('vorbisidec', required : get_option('tremor'))
+vorbis_dep = dependency('vorbis', version : '>= 1.3.1', allow_fallback: true, required : get_option('vorbis'))
+vorbisenc_dep = dependency('vorbisenc', version : '>= 1.3.1', allow_fallback: true, required : get_option('vorbis'))
+vorbisidec_dep = dependency('vorbisidec', allow_fallback: true, required : get_option('tremor'))
 
 if vorbis_dep.found()
   vorbis_deps = [vorbis_dep]

diff --git a/subprojects/vorbis.wrap b/subprojects/vorbis.wrap
index b6cae32..00d1c72 100644 (file)
--- a/subprojects/vorbis.wrap
+++ b/subprojects/vorbis.wrap
@@ -1,6 +1,6 @@
 [wrap-file]
 directory = libvorbis-1.3.5
-source_url = http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz
+source_url = https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz
 source_filename = libvorbis-1.3.5.tar.xz
 source_hash = 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1
 patch_filename = vorbis_1.3.5-8_patch.zip