mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 00:36:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

build/android: remove all references to gnustl

Browse source 
Not needed anymore with NDK R25.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4747>
This commit is contained in:
Matthew Waters 2023-05-30 15:31:47 +10:00 committed by GStreamer Marge Bot
parent 93699123b4
commit c3af29db1e
4 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
subprojects/gst-plugins-bad/ext/soundtouch/meson.build
View file

@ -9,10 +9,6 @@ if get_option('soundtouch').disabled()
subdir_done() subdir_done()
endif endif
if not gnustl_dep.found() and get_option('soundtouch').enabled()
error('soundtouch plugin enabled but could not find gnustl dep for Android c++ support')
endif
soundtouch_dep = dependency('soundtouch', required : false) soundtouch_dep = dependency('soundtouch', required : false)
if soundtouch_dep.found() if soundtouch_dep.found()
soundtouch_cargs += ['-DHAVE_SOUNDTOUCH_1_4'] soundtouch_cargs += ['-DHAVE_SOUNDTOUCH_1_4']
@ -36,7 +32,7 @@ if soundtouch_dep.found()
c_args : gst_plugins_bad_args + soundtouch_cargs, c_args : gst_plugins_bad_args + soundtouch_cargs,
cpp_args : gst_plugins_bad_args + soundtouch_cargs, cpp_args : gst_plugins_bad_args + soundtouch_cargs,
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstaudio_dep, soundtouch_dep, gnustl_dep], dependencies : [gstaudio_dep, soundtouch_dep],
install : true, install : true,
install_dir : plugins_install_dir) install_dir : plugins_install_dir)
plugins += [gstsoundtouch] plugins += [gstsoundtouch]

8
subprojects/gst-plugins-bad/ext/webrtcdsp/meson.build
View file

@ -7,17 +7,13 @@ webrtc_sources = [
webrtc_dep = dependency('webrtc-audio-processing-1', version : ['>= 1.0'], webrtc_dep = dependency('webrtc-audio-processing-1', version : ['>= 1.0'],
required : get_option('webrtcdsp')) required : get_option('webrtcdsp'))
if not gnustl_dep.found() and get_option('webrtcdsp').enabled() if webrtc_dep.found()
error('webrtcdsp plugin enabled but could not find gnustl dep for Android c++ support')
endif
if webrtc_dep.found() and gnustl_dep.found()
gstwebrtcdsp = library('gstwebrtcdsp', gstwebrtcdsp = library('gstwebrtcdsp',
webrtc_sources, webrtc_sources,
cpp_args : gst_plugins_bad_args, cpp_args : gst_plugins_bad_args,
link_args : noseh_link_args, link_args : noseh_link_args,
include_directories : [configinc], include_directories : [configinc],
dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep, gnustl_dep], dependencies : [gstbase_dep, gstaudio_dep, gstbadaudio_dep, webrtc_dep],
install : true, install : true,
install_dir : plugins_install_dir, install_dir : plugins_install_dir,
override_options : ['cpp_std=c++17'], override_options : ['cpp_std=c++17'],

5
subprojects/gst-plugins-bad/meson.build
View file

@ -471,11 +471,6 @@ else
endif endif
cdata.set('GST_ENABLE_EXTRA_CHECKS', not get_option('extra-checks').disabled()) cdata.set('GST_ENABLE_EXTRA_CHECKS', not get_option('extra-checks').disabled())
gnustl_dep = declare_dependency()
if host_system == 'android'
gnustl_dep = dependency('gnustl', required : false)
endif
# Disable compiler warnings for unused variables and args if gst debug system is disabled # Disable compiler warnings for unused variables and args if gst debug system is disabled
if gst_dep.type_name() == 'internal' if gst_dep.type_name() == 'internal'
gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug') gst_debug_disabled = not subproject('gstreamer').get_variable('gst_debug')

3
subprojects/gst-plugins-good/ext/qt/meson.build
View file

@ -135,9 +135,6 @@ if host_system == 'android'
optional_deps += [qt5androidextras, glesv2_dep] optional_deps += [qt5androidextras, glesv2_dep]
qt_defines += ['-DHAVE_QT_ANDROID'] qt_defines += ['-DHAVE_QT_ANDROID']
have_qt_windowing = true have_qt_windowing = true
# Needed for C++11 support in Cerbero. People building with Android
# in some other way need to add the necessary bits themselves.
optional_deps += dependency('gnustl', required : false)
endif endif
endif endif
endif endif