mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
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>
This commit is contained in:
Thibault Saunier 2021-10-16 09:29:28 -03:00
parent d0c86365d2
commit a75382eaff
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subprojects/gst-plugins-bad/ext/fdkaac/meson.build
View file

@ -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 = []

2
subprojects/gst-plugins-base/ext/ogg/meson.build
View file

@ -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()

6
subprojects/gst-plugins-base/ext/vorbis/meson.build
View file

@ -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]

2
subprojects/vorbis.wrap
View file

@ -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