Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve detection of system libspeex and fallback earlier.

Browse source 
libspeex is split into libspeex and libspeexdsp. We need both, so check
for them the same time instead of trying to respect the fact that old
versions didn't have the libspeexdsp part. Should fix issues with
distributions that have libspeex and libspeexdsp split into separate
packages and only the libspeex one is installed.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23872 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Riebeling 2009-12-06 10:19:43 +00:00
parent d587794dfc
commit e8bab4e3a0
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rbutil/rbutilqt/rbutilqt.pro
View file

@ -29,12 +29,12 @@ RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
message("Rockbox Base dir: "$$RBBASE_DIR)
# check for system speex. Add a custom rule for pre-building librbspeex if not found.
LIBSPEEX = $$system(pkg-config --silence-errors --libs speex)
# check for system speex. Add a custom rule for pre-building librbspeex if not
# found. Newer versions of speex are split up into libspeex and libspeexdsp,
# and some distributions package them separately. Check for both and fall back
# to librbspeex if not found.
LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp)
!static:!isEmpty(LIBSPEEX) {
# newer versions of speex are split up into libspeex and libspeexdsp.
# avoid checking twice if libspeex is missing.
LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp)
LIBS += $$LIBSPEEX
}
# custom rules for rockbox-specific libs

5
tools/rbspeex/Makefile
View file

@ -29,10 +29,7 @@ endif
# don't try to use the systems libspeex when building a static binary.
ifndef STATIC
SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex)
ifneq ($(SYS_SPEEX),)
SYS_SPEEX += $(shell pkg-config --silence-errors --libs speexdsp)
endif
SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex speexdsp)
endif
# fall back to our own librbspeex if no suitable found.