Skip to content
Snippets Groups Projects
Commit 6fe0567d authored by Alexandre Lision's avatar Alexandre Lision
Browse files

contrib: fix common host conf

We assumed all hosts wanted --enable-static --disable-shared
It caused an issue with libspeex and libopus on OSX (Unresolved symbols).
This dependencies are re-enabled for all platforms by this patch.

Refs #68286

Change-Id: Ie6d158e6de6b22bfe93b45e9dfe0dfbe3f3b7218
parent 6419cde6
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,7 @@ LIBAVCONF += \ ...@@ -33,6 +33,7 @@ LIBAVCONF += \
LIBAVCONF += \ LIBAVCONF += \
--enable-libx264 \ --enable-libx264 \
--enable-libopus \ --enable-libopus \
--enable-libspeex \
--enable-libvpx --enable-libvpx
#encoders/decoders #encoders/decoders
...@@ -54,7 +55,9 @@ LIBAVCONF += \ ...@@ -54,7 +55,9 @@ LIBAVCONF += \
--enable-encoder=libvpx_vp8 \ --enable-encoder=libvpx_vp8 \
--enable-decoder=vp8 \ --enable-decoder=vp8 \
--enable-encoder=h263 \ --enable-encoder=h263 \
--enable-decoder=h263 --enable-decoder=h263 \
--enable-encoder=libspeex \
--enable-decoder=libspeex
# Linux # Linux
ifdef HAVE_LINUX ifdef HAVE_LINUX
...@@ -62,14 +65,6 @@ LIBAVCONF += \ ...@@ -62,14 +65,6 @@ LIBAVCONF += \
--enable-x11grab --enable-x11grab
endif endif
# There is an unresolved symbol for speex when linking statically
ifndef HAVE_DARWIN_OS
LIBAVCONF += \
--enable-libspeex \
--enable-encoder=libspeex \
--enable-decoder=libspeex
endif
DEPS_libav = zlib x264 vpx $(DEPS_vpx) DEPS_libav = zlib x264 vpx $(DEPS_vpx)
ifdef HAVE_CROSS_COMPILE ifdef HAVE_CROSS_COMPILE
......
...@@ -261,7 +261,12 @@ HOSTCONF += --libdir="$(PREFIX)/lib" ...@@ -261,7 +261,12 @@ HOSTCONF += --libdir="$(PREFIX)/lib"
HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)" HOSTCONF += --build="$(BUILD)" --host="$(HOST)" --target="$(HOST)"
HOSTCONF += --program-prefix="" HOSTCONF += --program-prefix=""
# libtool stuff: # libtool stuff:
HOSTCONF += --enable-static --disable-shared --disable-dependency-tracking HOSTCONF += --disable-dependency-tracking
ifdef HAVE_LINUX
HOSTCONF += --enable-static --disable-shared
endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
HOSTCONF += --without-pic HOSTCONF += --without-pic
PIC := PIC :=
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment