Skip to content
Permalink
Browse files

Switch from old speex to new speex and speexdsp

The speex library has been split into a codec part
(speex) and a dsp part (speex-dsp). As we still need
the codec for compatibility with 3rd party clients
only sending speex but still want the updates that
went into the dsp and codec since then this patch
modifies our build to enable that. To achieve that
we combined the two libraries back together. Doing
it this way might brittle but is only a temporary
solution until we can actually drop the codec part.
  • Loading branch information...
hacst committed May 5, 2015
1 parent 263a292 commit 2c0d37f9ef089032850e873e341b1399acbf5aad
@@ -22,3 +22,6 @@
[submodule "3rdparty/mach-override-src"]
path = 3rdparty/mach-override-src
url = https://github.com/mumble-voip/mach_override.git
[submodule "3rdparty/speexdsp-src"]
path = 3rdparty/speexdsp-src
url = https://git.xiph.org/speexdsp.git
@@ -1,13 +1,13 @@
include(../../compiler.pri)

!exists(../speex-src/COPYING) {
message("The speex/ directory was not found. You need to do one of the following:")
!exists(../speex-src/COPYING) | !exists(../speexdsp-src/COPYING) {
message("The speex-src/ or speexdsp-src/ directories were not found. You need to do one of the following:")
message("")
message("Option 1: Use Speex Git:")
message("git submodule init")
message("git submodule update")
message("")
message("Option 2: Use system speex (only if it's a bleeding edge version):")
message("Option 2: Use system speex and speex-dsp (v 1.2 or later):")
message("qmake CONFIG+=no-bundled-speex -recursive")
message("")
error("Aborting configuration")
@@ -28,10 +28,10 @@ CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
CONFIG += no_include_pwd
VPATH = ../speex-src/libspeex
VPATH = ../speex-src/libspeex ../speexdsp-src/libspeexdsp
TARGET = speex
DEFINES += NDEBUG HAVE_CONFIG_H
INCLUDEPATH = ../speex-src/include ../speex-src/libspeex
INCLUDEPATH = ../speex-src/include ../speex-src/libspeex ../speexdsp-src/include ../speexdsp-src/libspeexdsp

win32 {
INCLUDEPATH += ../speex-build/win32
File renamed without changes.
@@ -0,0 +1,11 @@
#ifndef __SPEEX_TYPES_H__
#define __SPEEX_TYPES_H__

/* these are filled in by configure */
typedef short spx_int16_t;
typedef unsigned short spx_uint16_t;
typedef int spx_int32_t;
typedef unsigned int spx_uint32_t;

#endif

Submodule speex-src updated from a6d05e to ecc63b
Submodule speexdsp-src added at a2133f
@@ -2,7 +2,7 @@ TEMPLATE = subdirs
CONFIG *= ordered debug_and_release

!CONFIG(no-client) {
unix:!CONFIG(bundled-speex):system(pkg-config --atleast-version=1.2 speexdsp) {
unix:!CONFIG(bundled-speex):system(pkg-config --atleast-version=1.2 speexdsp):system(pkg-config --atleast-version=1.2 speex) {
CONFIG *= no-bundled-speex
}
!CONFIG(no-bundled-speex) {
@@ -243,7 +243,7 @@ isEmpty(QMAKE_LRELEASE) {
}
}

unix:!CONFIG(bundled-speex):system(pkg-config --atleast-version=1.2 speexdsp) {
unix:!CONFIG(bundled-speex):system(pkg-config --atleast-version=1.2 speexdsp):system(pkg-config --atleast-version=1.2 speex) {
CONFIG *= no-bundled-speex
}

@@ -265,7 +265,7 @@ CONFIG(no-bundled-speex) {
}

!CONFIG(no-bundled-speex) {
INCLUDEPATH *= ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build
INCLUDEPATH *= ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build ../../3rdparty/speexdsp-src/include ../../3rdparty/speexdsp-src/libspeexdsp
LIBS *= -lspeex
}

0 comments on commit 2c0d37f

Please sign in to comment.
You can’t perform that action at this time.