Skip to content
Permalink
Browse files

Move speex, celt-0.7.0, celt-0.11.0, opus and sbcelt to the 3rdparty …

…directory.
  • Loading branch information...
mkrautz committed Jan 5, 2015
1 parent ec3120c commit faa67303bd2db4d7c6d3c21f935d81453c2c64d2
Showing with 68 additions and 68 deletions.
  1. +5 −5 .gitmodules
  2. +4 −4 { → 3rdparty}/celt-0.11.0-build/celt-0.11.0-build.pro
  3. 0 { → 3rdparty}/celt-0.11.0-build/celt-0.11.0.rc
  4. 0 { → 3rdparty}/celt-0.11.0-build/config.h
  5. 0 { → 3rdparty}/celt-0.11.0-build/win32/config.h
  6. 0 { → 3rdparty}/celt-0.11.0-src
  7. +4 −4 { → 3rdparty}/celt-0.7.0-build/celt-0.7.0-build.pro
  8. 0 { → 3rdparty}/celt-0.7.0-build/celt-0.7.0.rc
  9. 0 { → 3rdparty}/celt-0.7.0-build/config.h
  10. 0 { → 3rdparty}/celt-0.7.0-build/win32/config.h
  11. 0 { → 3rdparty}/celt-0.7.0-src
  12. 0 { → 3rdparty}/opus-build/Win32/config.h
  13. 0 { → 3rdparty}/opus-build/Win32/version.h
  14. 0 { → 3rdparty}/opus-build/config.h
  15. +4 −4 { → 3rdparty}/opus-build/opus-build.pro
  16. 0 { → 3rdparty}/opus-src
  17. +4 −4 { → 3rdparty}/sbcelt-helper-build/sbcelt-helper-build.pro
  18. +4 −4 { → 3rdparty}/sbcelt-lib-build/sbcelt-lib-build.pro
  19. 0 { → 3rdparty}/sbcelt-src
  20. 0 {speexbuild → 3rdparty/speex-build}/AGC.cpp
  21. +3 −3 {speexbuild → 3rdparty/speex-build}/AGC.pro
  22. 0 {speexbuild → 3rdparty/speex-build}/ResampMark.cpp
  23. +3 −3 {speexbuild → 3rdparty/speex-build}/ResampMark.pro
  24. 0 {speexbuild → 3rdparty/speex-build}/SpeexMark.cpp
  25. +3 −3 {speexbuild → 3rdparty/speex-build}/SpeexMark.pro
  26. 0 {speexbuild → 3rdparty/speex-build}/config.h
  27. 0 {speexbuild → 3rdparty/speex-build}/mumble_speex_init.c
  28. +8 −8 speexbuild/speexbuild.pro → 3rdparty/speex-build/speex-build.pro
  29. 0 {speexbuild → 3rdparty/speex-build}/speex.def
  30. 0 {speexbuild → 3rdparty/speex-build}/speex/speex_config_types.h
  31. 0 {speexbuild → 3rdparty/speex-build}/win32/config.h
  32. 0 speex → 3rdparty/speex-src
  33. +4 −4 main.pro
  34. +3 −3 scripts/mklic.pl
  35. +9 −9 scripts/release.pl
  36. +8 −8 src/mumble/mumble.pro
  37. +1 −1 src/tests/OverlayTest.pro
  38. +1 −1 src/tests/Resample.pro
@@ -1,17 +1,17 @@
[submodule "speex"]
path = speex
path = 3rdparty/speex-src
url = git://git.xiph.org/speex.git/
[submodule "celt-0.7.0-src"]
path = celt-0.7.0-src
path = 3rdparty/celt-0.7.0-src
url = https://github.com/mumble-voip/celt-0.7.0.git
[submodule "celt-0.11.0-src"]
path = celt-0.11.0-src
path = 3rdparty/celt-0.11.0-src
url = git://git.xiph.org/celt.git/
[submodule "opus-src"]
path = opus-src
path = 3rdparty/opus-src
url = https://github.com/mumble-voip/opus.git
[submodule "sbcelt-src"]
path = sbcelt-src
path = 3rdparty/sbcelt-src
url = git://github.com/mumble-voip/sbcelt.git
[submodule "3rdparty/fx11-src"]
path = 3rdparty/fx11-src
@@ -1,4 +1,4 @@
include(../compiler.pri)
include(../../compiler.pri)

BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@@ -50,11 +50,11 @@ SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c

CONFIG(debug, debug|release) {
CONFIG += console
DESTDIR = ../debug
DESTDIR = ../../debug
}

CONFIG(release, debug|release) {
DESTDIR = ../release
DESTDIR = ../../release
}

include(../symbols.pri)
include(../../symbols.pri)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
include(../compiler.pri)
include(../../compiler.pri)

BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@@ -55,11 +55,11 @@ SOURCES *= bands.c celt.c cwrs.c entcode.c entdec.c entenc.c header.c kiss_fft.c

CONFIG(debug, debug|release) {
CONFIG += console
DESTDIR = ../debug
DESTDIR = ../../debug
}

CONFIG(release, debug|release) {
DESTDIR = ../release
DESTDIR = ../../release
}

include(../symbols.pri)
include(../../symbols.pri)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,4 +1,4 @@
include(../compiler.pri)
include(../../compiler.pri)

BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-build,-src)
@@ -209,11 +209,11 @@ src/mlp_data.c

CONFIG(debug, debug|release) {
CONFIG += console
DESTDIR = ../debug
DESTDIR = ../../debug
}

CONFIG(release, debug|release) {
DESTDIR = ../release
DESTDIR = ../../release
}

macx:!CONFIG(static) {
@@ -225,4 +225,4 @@ macx:!CONFIG(static) {
ALL_DEPS += libname
}

include(../symbols.pri)
include(../../symbols.pri)
File renamed without changes.
@@ -1,4 +1,4 @@
include (../compiler.pri)
include (../../compiler.pri)

BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-helper-build,-src)
@@ -68,12 +68,12 @@ macx {
}

CONFIG(release, debug|release) {
DESTDIR = ../release
DESTDIR = ../../release
}

CONFIG(debug, debug|release) {
DEFINES *= USE_LOGFILE
DESTDIR = ../debug/
DESTDIR = ../../debug/
}

include(../symbols.pri)
include(../../symbols.pri)
@@ -1,4 +1,4 @@
include(../compiler.pri)
include(../../compiler.pri)

BUILDDIR=$$basename(PWD)
SOURCEDIR=$$replace(BUILDDIR,-lib-build,-src)
@@ -54,11 +54,11 @@ macx {

CONFIG(debug, debug|release) {
CONFIG += console
DESTDIR = ../debug
DESTDIR = ../../debug
}

CONFIG(release, debug|release) {
DESTDIR = ../release
DESTDIR = ../../release
}

include(../symbols.pri)
include(../../symbols.pri)
File renamed without changes.
File renamed without changes.
@@ -1,11 +1,11 @@
include(../compiler.pri)
include(../../compiler.pri)

TEMPLATE =app
CONFIG += qt warn_on release console
QT -= gui
TARGET = AGC
SOURCES = AGC.cpp
HEADERS = Timer.h
INCLUDEPATH = ../src ../speex/include
INCLUDEPATH = ../src ../speex-src/include
LIBS += -lspeex
LIBPATH += ../release
LIBPATH += ../../release
File renamed without changes.
@@ -1,11 +1,11 @@
include(../compiler.pri)
include(../../compiler.pri)

TEMPLATE =app
CONFIG += qt warn_on release console
QT -= gui
TARGET = ResampMark
SOURCES = ResampMark.cpp
HEADERS = Timer.h
INCLUDEPATH = ../src ../speex/include
INCLUDEPATH = ../../src ../speex-src/include
LIBS += -lspeex
LIBPATH += ../release
LIBPATH += ../../release
File renamed without changes.
@@ -1,11 +1,11 @@
include(../compiler.pri)
include(../../compiler.pri)

TEMPLATE =app
CONFIG += qt warn_on release console
QT -= gui
TARGET = SpeexMark
SOURCES = SpeexMark.cpp
HEADERS = Timer.h
INCLUDEPATH = ../src ../speex/include
INCLUDEPATH = ../src ../speex-src/include
LIBS += -lspeex
LIBPATH += ../release
LIBPATH += ../../release
File renamed without changes.
File renamed without changes.
@@ -1,6 +1,6 @@
include(../compiler.pri)
include(../../compiler.pri)

!exists(../speex/COPYING) {
!exists(../speex-src/COPYING) {
message("The speex/ directory was not found. You need to do one of the following:")
message("")
message("Option 1: Use Speex Git:")
@@ -15,25 +15,25 @@ include(../compiler.pri)

CONFIG(debug, debug|release) {
CONFIG += console
DESTDIR = ../debug
DESTDIR = ../../debug
}

CONFIG(release, debug|release) {
DESTDIR = ../release
DESTDIR = ../../release
}

TEMPLATE = lib
CONFIG -= qt
CONFIG += debug_and_release
CONFIG -= warn_on
CONFIG += warn_off
VPATH = ../speex/libspeex
VPATH = ../speex-src/libspeex
TARGET = speex
DEFINES += NDEBUG HAVE_CONFIG_H
INCLUDEPATH = ../speex/include ../speex/libspeex
INCLUDEPATH = ../speex-src/include ../speex-src/libspeex

win32 {
INCLUDEPATH += ../speexbuild/win32
INCLUDEPATH += ../speex-build/win32
DEFINES+=WIN32 _WINDOWS _USE_SSE _USE_MATH_DEFINES
SOURCES *= mumble_speex_init.c

@@ -57,7 +57,7 @@ win32 {
}
} else {
CONFIG += staticlib
INCLUDEPATH += ../speexbuild
INCLUDEPATH += ../speex-srcbuild
}

DIST = config.h speex.def speex/speex_config_types.h
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -6,17 +6,17 @@ CONFIG *= ordered debug_and_release
CONFIG *= no-bundled-speex
}
!CONFIG(no-bundled-speex) {
SUBDIRS *= speexbuild
SUBDIRS *= 3rdparty/speex-build
}

CONFIG(sbcelt) {
SUBDIRS *= celt-0.7.0-build sbcelt-lib-build sbcelt-helper-build
SUBDIRS *= 3rdparty/celt-0.7.0-build 3rdparty/sbcelt-lib-build 3rdparty/sbcelt-helper-build
} else {
unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) {
CONFIG *= no-bundled-celt
}
!CONFIG(no-bundled-celt) {
SUBDIRS *= celt-0.7.0-build celt-0.11.0-build
SUBDIRS *= 3rdparty/celt-0.7.0-build 3rdparty/celt-0.11.0-build
}
}

@@ -25,7 +25,7 @@ CONFIG *= ordered debug_and_release
}

CONFIG(opus):!CONFIG(no-bundled-opus) {
SUBDIRS *= opus-build
SUBDIRS *= 3rdparty/opus-build
}

win32 {
@@ -65,9 +65,9 @@ ($$$)

# List of 3rd party licenses [<variableName>, <pathToLicenseFile>, <DisplayName>, <URL>]
my @thirdPartyLicenses = (
["licenseCELT", "../celt-0.11.0-src/COPYING", "CELT", "http://www.celt-codec.org/"],
["licenseOpus", "../opus-src/COPYING", "Opus", "http://www.opus-codec.org/"],
["licenseSPEEX", "../speex/COPYING", "Speex", "http://www.speex.org/"],
["licenseCELT", "../3rdparty/celt-0.11.0-src/COPYING", "CELT", "http://www.celt-codec.org/"],
["licenseOpus", "../3rdparty/opus-src/COPYING", "Opus", "http://www.opus-codec.org/"],
["licenseSPEEX", "../3rdparty/speex-src/COPYING", "Speex", "http://www.speex.org/"],
["licenseOpenSSL", "../3rdPartyLicenses/openssl_license.txt", "OpenSSL", "http://www.openssl.org/"],
["licenseLibsndfile", "../3rdPartyLicenses/libsndfile_license.txt", "libsndfile", "http://www.mega-nerd.com/libsndfile/"],
["licenseOgg", "../3rdPartyLicenses/libogg_license.txt", "libogg", "http://www.xiph.org/"],
@@ -46,15 +46,15 @@
# Exclude the archive we are currently writing to
"${ballname}.*",
# Exclude files with Debian FSG licensing issues (#1230)
"${ballname}/speex/doc/draft-herlein-avt-rtp-speex-00.txt",
"${ballname}/speex/doc/draft-herlein-speex-rtp-profile-02.txt",
"${ballname}/speex/doc/draft-herlein-speex-rtp-profile-03.txt",
"${ballname}/speex/doc/draft-ietf-avt-rtp-speex-00.txt",
"${ballname}/speex/doc/draft-ietf-avt-rtp-speex-01-tmp.txt",
"${ballname}/speex/doc/draft-ietf-avt-rtp-speex-05-tmp.txt",
"${ballname}/speex/doc/manual.lyx",
"${ballname}/celt-0.11.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt",
"${ballname}/celt-0.7.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt"
"${ballname}/3rdparty/speex-src/doc/draft-herlein-avt-rtp-speex-00.txt",
"${ballname}/3rdparty/speex-src/doc/draft-herlein-speex-rtp-profile-02.txt",
"${ballname}/3rdparty/speex-src/doc/draft-herlein-speex-rtp-profile-03.txt",
"${ballname}/3rdparty/speex-src/doc/draft-ietf-avt-rtp-speex-00.txt",
"${ballname}/3rdparty/speex-src/doc/draft-ietf-avt-rtp-speex-01-tmp.txt",
"${ballname}/3rdparty/speex-src/doc/draft-ietf-avt-rtp-speex-05-tmp.txt",
"${ballname}/3rdparty/speex-src/doc/manual.lyx",
"${ballname}/3rdparty/celt-0.11.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt",
"${ballname}/3rdparty/celt-0.7.0-src/doc/ietf/draft-valin-celt-rtp-profile-01.txt"
)
);

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

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

CONFIG(sbcelt) {
SOURCES -= CELTCodec.cpp
SOURCES += CELTCodec_sbcelt.cpp
INCLUDEPATH *= ../../celt-0.7.0-src/libcelt ../../sbcelt-src
INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/sbcelt-src
LIBS *= -lcelt -lsbcelt
DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT
} else {
@@ -283,7 +283,7 @@ CONFIG(sbcelt) {
INCLUDEPATH *= /usr/include/celt
}
!CONFIG(no-bundled-celt) {
INCLUDEPATH *= ../../celt-0.7.0-src/libcelt
INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt
}
}

@@ -316,7 +316,7 @@ unix:!CONFIG(bundled-opus):system(pkg-config --exists opus) {
}

CONFIG(opus) {
INCLUDEPATH *= ../../opus-src/celt ../../opus-src/include ../../opus-src/src ../../opus-build/src
INCLUDEPATH *= ../../3rdparty/opus-src/celt ../../3rdparty/opus-src/include ../../3rdparty/opus-src/src ../../3rdparty/opus-build/src
DEFINES *= USE_OPUS
LIBS *= -lopus
}
@@ -374,10 +374,10 @@ unix {
}

!CONFIG(no-bundled-speex) {
QMAKE_CFLAGS *= -I../../speex/include -I../../speexbuild
QMAKE_CXXFLAGS *= -I../../speex/include -I../../speexbuild
QMAKE_CXXFLAGS_RELEASE *= -I../../speex/include -I../../speexbuild
QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
QMAKE_CFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
QMAKE_CXXFLAGS *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
QMAKE_CXXFLAGS_RELEASE *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
QMAKE_CXXFLAGS_DEBUG *= -I../../3rdparty/speex-src/include -I../../3rdparty/speex-build
}

CONFIG *= link_pkgconfig
@@ -15,4 +15,4 @@ win32 {
}

VPATH += ..
INCLUDEPATH += .. ../murmur ../mumble ../../celt-0.7.0-src/libcelt ../../speex/include
INCLUDEPATH += .. ../murmur ../mumble ../../3rdparty/celt-0.7.0-src/libcelt ../../3rdparty/speex-src/include
@@ -7,7 +7,7 @@ TARGET = Resample
SOURCES = Resample.cpp Timer.cpp
HEADERS = Timer.h
VPATH += ..
INCLUDEPATH *= .. ../../speex/include ../../speex/libspeex ../../speexbuild
INCLUDEPATH *= .. ../../3rdparty/speex-src/include ../../3rdparty/speex-src/libspeex ../../3rdparty/speex-build
LIBS *= -lspeex

win32 {

0 comments on commit faa6730

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