5fff4723c5
o Make speex codec working with recent version of libspeex. PR: 129970.
71 lines
2.6 KiB
Text
71 lines
2.6 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- codecs/Makefile.orig
|
|
+++ codecs/Makefile
|
|
@@ -29,7 +29,7 @@
|
|
endif
|
|
|
|
ifndef WITHOUT_ZAPTEL
|
|
-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
|
|
+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
|
|
ifeq (${OSARCH},NetBSD)
|
|
SOLINK+=-L$(CROSS_COMPILE_TARGET)/usr/pkg/lib
|
|
endif
|
|
@@ -43,28 +43,28 @@
|
|
|
|
UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h)
|
|
UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h)
|
|
-ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h)
|
|
-ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex/speex.h)
|
|
+ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex.h)
|
|
+ULIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex/speex.h)
|
|
ifneq (${UI_SPEEX},)
|
|
MODSPEEX=codec_speex.so
|
|
- LIBSPEEX+=-lspeex -lm
|
|
+ LIBSPEEX+=-lspeex -lspeexdsp -lm
|
|
endif
|
|
ifneq (${UIS_SPEEX},)
|
|
MODSPEEX=codec_speex.so
|
|
CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/include/speex
|
|
- LIBSPEEX+=-lspeex -lm
|
|
+ LIBSPEEX+=-lspeex -lspeexdsp -lm
|
|
endif
|
|
ifneq (${ULI_SPEEX},)
|
|
MODSPEEX=codec_speex.so
|
|
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include
|
|
- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
|
|
- LIBSPEEX+=-lspeex -lm
|
|
+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include
|
|
+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
|
|
+ LIBSPEEX+=-lspeex -lspeexdsp -lm
|
|
endif
|
|
ifneq (${ULIS_SPEEX},)
|
|
MODSPEEX=codec_speex.so
|
|
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex
|
|
- LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
|
|
- LIBSPEEX+=-lspeex -lm
|
|
+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/speex
|
|
+ LIBSPEEX=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
|
|
+ LIBSPEEX+=-lspeex -lspeexdsp -lm
|
|
endif
|
|
|
|
ifneq ($(wildcard ilbc/iLBC_decode.h),)
|
|
@@ -78,7 +78,7 @@
|
|
LIBLPC10=lpc10/liblpc10.a
|
|
|
|
ifeq ($(findstring BSD,${OSARCH}),BSD)
|
|
- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
|
|
+ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
|
|
endif
|
|
|
|
CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_lpc10.so \
|
|
@@ -139,7 +139,7 @@
|
|
endif
|
|
|
|
install: all
|
|
- for x in $(CODECS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
|
|
+ for x in $(CODECS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done
|
|
|
|
depend: .depend
|
|
|