wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 943159 - Remove MOZ_SPEEX_RESAMPLER/MOZ_SOUNDTOUCH defines since we don't support building without them anyway. r=doublec,gps

Browse Source
This commit is contained in:
Matthew Gregan 2013-11-28 17:06:59 +13:00
parent 2cef76c5d2
commit c9c44e81a3
3 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config/external/moz.build vendored
View File

@ -33,18 +33,16 @@ if CONFIG['MOZ_VP8'] and not CONFIG['MOZ_NATIVE_LIBVPX']:
if CONFIG['MOZ_OGG']:
external_dirs += ['media/libogg', 'media/libtheora']
if CONFIG['MOZ_SPEEX_RESAMPLER']:
external_dirs += ['media/libspeex_resampler']
if CONFIG['MOZ_SOUNDTOUCH']:
external_dirs += ['media/libsoundtouch']
if CONFIG['MOZ_CUBEB']:
external_dirs += ['media/libcubeb']
if not CONFIG['MOZ_NATIVE_PNG']:
external_dirs += ['media/libpng']
external_dirs += ['media/kiss_fft']
external_dirs += [
'media/kiss_fft',
'media/libspeex_resampler',
'media/libsoundtouch',
]
PARALLEL_DIRS += ['../../' + i for i in external_dirs]

12
configure.in
View File

@ -3938,8 +3938,6 @@ MOZ_JSDEBUGGER=1
MOZ_AUTH_EXTENSION=1
MOZ_OGG=1
MOZ_RAW=
MOZ_SPEEX_RESAMPLER=1
MOZ_SOUNDTOUCH=1
MOZ_CUBEB=
MOZ_VORBIS=
MOZ_TREMOR=
@ -5521,14 +5519,6 @@ dnl ========================================================
dnl = Handle dependent CUBEB and MEDIA defines
dnl ========================================================
if test -n "$MOZ_SPEEX_RESAMPLER"; then
AC_DEFINE(MOZ_SPEEX_RESAMPLER)
fi
if test -n "$MOZ_SOUNDTOUCH"; then
AC_DEFINE(MOZ_SOUNDTOUCH)
fi
if test -n "$MOZ_CUBEB"; then
AC_DEFINE(MOZ_CUBEB)
fi
@ -8665,8 +8655,6 @@ AC_SUBST(MOZ_NSS_PATCH)
AC_SUBST(MOZ_APP_COMPONENT_LIBS)
AC_SUBST(MOZ_APP_EXTRA_LIBS)
AC_SUBST(MOZ_SPEEX_RESAMPLER)
AC_SUBST(MOZ_SOUNDTOUCH)
AC_SUBST(MOZ_CUBEB)
AC_SUBST(MOZ_WAVE)
AC_SUBST(MOZ_VORBIS)

2
layout/media/symbols.def.in
View File

@ -95,7 +95,6 @@ vorbis_synthesis_pcmout
vorbis_synthesis_read
vorbis_synthesis_restart
#endif
#ifdef MOZ_SPEEX_RESAMPLER
speex_resampler_init
speex_resampler_init_frac
speex_resampler_destroy
@ -118,7 +117,6 @@ speex_resampler_get_output_latency
speex_resampler_skip_zeros
speex_resampler_reset_mem
speex_resampler_strerror
#endif
#ifdef MOZ_CUBEB
cubeb_destroy
cubeb_init