Skip to content

F
freeswitch
提交 44da905b authored 作者: Michael Jerris's avatar Michael Jerris
浏览文件
操作

FS-8867: build using in tree libyuv to match required version and not impact… 

FS-8867: build using in tree libyuv to match required version and not impact system ones that are never sufficient version
上级 ed78d389
隐藏空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 81 行删除
Makefile.am
浏览文件 @ 44da905b
...@@ -115,9 +115,11 @@ CORE_CFLAGS = $(AM_LIBAPR_CFLAGS) $(AM_LIBAPR_CPPFLAGS) ...@@ -115,9 +115,11 @@ CORE_CFLAGS = $(AM_LIBAPR_CFLAGS) $(AM_LIBAPR_CPPFLAGS)
CORE_CFLAGS += $(AM_LIBAPU_CPPFLAGS) CORE_CFLAGS += $(AM_LIBAPU_CPPFLAGS)
CORE_CFLAGS += -I$(switch_srcdir)/libs/libtpl-1.5/src CORE_CFLAGS += -I$(switch_srcdir)/libs/libtpl-1.5/src
CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/libyuv/include
CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
CORE_CFLAGS += -I$(switch_builddir)/libs/spandsp/src -I$(switch_srcdir)/libs/spandsp/src CORE_CFLAGS += -I$(switch_builddir)/libs/spandsp/src -I$(switch_srcdir)/libs/spandsp/src
CORE_CFLAGS += -I$(switch_builddir)/libs/tiff-4.0.2/libtiff -I$(switch_srcdir)/libs/tiff-4.0.2/libtiff CORE_CFLAGS += -I$(switch_builddir)/libs/tiff-4.0.2/libtiff -I$(switch_srcdir)/libs/tiff-4.0.2/libtiff
CORE_CFLAGS += -DSWITCH_HAVE_YUV
APR_LIBS = $(AM_LIBAPU_LIBS) $(AM_LIBAPR_LIBS) APR_LIBS = $(AM_LIBAPU_LIBS) $(AM_LIBAPR_LIBS)
CORE_LIBS= CORE_LIBS=
...@@ -153,10 +155,6 @@ if HAVE_VPX ...@@ -153,10 +155,6 @@ if HAVE_VPX
CORE_CFLAGS += -DSWITCH_HAVE_VPX $(VPX_CFLAGS) CORE_CFLAGS += -DSWITCH_HAVE_VPX $(VPX_CFLAGS)
endif endif
if HAVE_YUV
CORE_CFLAGS += -DSWITCH_HAVE_YUV $(YUV_CFLAGS)
endif
if HAVE_FREETYPE if HAVE_FREETYPE
CORE_CFLAGS += -DSWITCH_HAVE_FREETYPE $(LIBFREETYPE_CFLAGS) CORE_CFLAGS += -DSWITCH_HAVE_FREETYPE $(LIBFREETYPE_CFLAGS)
endif endif
...@@ -164,10 +162,44 @@ endif ...@@ -164,10 +162,44 @@ endif
## ##
## libfreeswitch ## libfreeswitch
## ##
noinst_LTLIBRARIES = libfreeswitch_spandsp.la noinst_LTLIBRARIES = libfreeswitch_spandsp.la libfreeswitch_libyuv.la
libfreeswitch_spandsp_la_SOURCES = libs/spandsp/src/plc.c libs/spandsp/src/alloc.c libs/spandsp/src/bit_operations.c libfreeswitch_spandsp_la_SOURCES = libs/spandsp/src/plc.c libs/spandsp/src/alloc.c libs/spandsp/src/bit_operations.c
libfreeswitch_spandsp_la_CFLAGS = -Ilibs/spandsp/src $(CORE_CFLAGS) $(AM_CFLAGS) libfreeswitch_spandsp_la_CFLAGS = -Ilibs/spandsp/src $(CORE_CFLAGS) $(AM_CFLAGS)
CORE_LIBS+=libfreeswitch_spandsp.la CORE_LIBS+=libfreeswitch_spandsp.la
libfreeswitch_libyuv_la_SOURCES = \
libs/libyuv/source/compare.cc \
libs/libyuv/source/compare_common.cc \
libs/libyuv/source/compare_gcc.cc \
libs/libyuv/source/convert.cc \
libs/libyuv/source/convert_argb.cc \
libs/libyuv/source/convert_from.cc \
libs/libyuv/source/convert_from_argb.cc \
libs/libyuv/source/convert_to_argb.cc \
libs/libyuv/source/convert_to_i420.cc \
libs/libyuv/source/cpu_id.cc \
libs/libyuv/source/planar_functions.cc \
libs/libyuv/source/rotate.cc \
libs/libyuv/source/rotate_any.cc \
libs/libyuv/source/rotate_argb.cc \
libs/libyuv/source/rotate_common.cc \
libs/libyuv/source/rotate_gcc.cc \
libs/libyuv/source/rotate_mips.cc \
libs/libyuv/source/row_any.cc \
libs/libyuv/source/row_common.cc \
libs/libyuv/source/row_mips.cc \
libs/libyuv/source/row_gcc.cc \
libs/libyuv/source/scale.cc \
libs/libyuv/source/scale_any.cc \
libs/libyuv/source/scale_argb.cc \
libs/libyuv/source/scale_common.cc \
libs/libyuv/source/scale_gcc.cc \
libs/libyuv/source/scale_mips.cc \
libs/libyuv/source/video_common.cc
libfreeswitch_libyuv_la_CPPFLAGS = -O2 -fomit-frame-pointer -Ilibs/libyuv/include
CORE_LIBS+=libfreeswitch_libyuv.la
lib_LTLIBRARIES = libfreeswitch.la lib_LTLIBRARIES = libfreeswitch.la
libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(VPX_CFLAGS) $(AM_CFLAGS) libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(VPX_CFLAGS) $(AM_CFLAGS)
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
......
configure.ac
浏览文件 @ 44da905b
...@@ -785,12 +785,6 @@ if test "x$have_libz" = "xyes" ; then ...@@ -785,12 +785,6 @@ if test "x$have_libz" = "xyes" ; then
APR_ADDTO([PLATFORM_CORE_LIBS], [-lz]) APR_ADDTO([PLATFORM_CORE_LIBS], [-lz])
fi fi
PKG_CHECK_MODULES([YUV], [libyuv >= 0.0.1280],
[AC_MSG_RESULT([yes]);AM_CONDITIONAL([HAVE_YUV],[true])],
[AC_MSG_RESULT([no]);AM_CONDITIONAL([HAVE_YUV],[false])])
APR_ADDTO([PLATFORM_CORE_LIBS], [${YUV_LIBS}])
PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.20.1],[ PKG_CHECK_MODULES([MPG123], [libmpg123 >= 1.20.1],[
AM_CONDITIONAL([HAVE_MPG123],[true])],[ AM_CONDITIONAL([HAVE_MPG123],[true])],[
AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])]) AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_MPG123],[false])])
......
src/mod/applications/mod_av/Makefile.am
浏览文件 @ 44da905b
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_av MODNAME=mod_av
if HAVE_YUV
if HAVE_VPX if HAVE_VPX
if HAVE_AVFORMAT if HAVE_AVFORMAT
...@@ -24,12 +23,3 @@ all: error ...@@ -24,12 +23,3 @@ all: error
error: error:
$(error You must install libvpx2-dev to build mod_av) $(error You must install libvpx2-dev to build mod_av)
endif endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_av)
endif
src/mod/applications/mod_cv/Makefile.am
浏览文件 @ 44da905b
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_cv MODNAME=mod_cv
if HAVE_YUV
if HAVE_VPX if HAVE_VPX
if HAVE_OPENCV if HAVE_OPENCV
...@@ -24,12 +23,3 @@ all: error ...@@ -24,12 +23,3 @@ all: error
error: error:
$(error You must install libvpx2-dev to build mod_cv) $(error You must install libvpx2-dev to build mod_cv)
endif endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_cv)
endif
src/mod/applications/mod_fsv/Makefile.am
浏览文件 @ 44da905b
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_fsv MODNAME=mod_fsv
if HAVE_YUV
if HAVE_VPX if HAVE_VPX
mod_LTLIBRARIES = mod_fsv.la mod_LTLIBRARIES = mod_fsv.la
...@@ -16,13 +15,3 @@ all: error ...@@ -16,13 +15,3 @@ all: error
error: error:
$(error You must install libvpx2-dev to build mod_fsv) $(error You must install libvpx2-dev to build mod_fsv)
endif endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_fsv)
endif
src/mod/applications/mod_mp4v2/Makefile.am
浏览文件 @ 44da905b
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_mp4v2 MODNAME=mod_mp4v2
if HAVE_YUV
if HAVE_VPX if HAVE_VPX
mod_LTLIBRARIES = mod_mp4v2.la mod_LTLIBRARIES = mod_mp4v2.la
...@@ -16,12 +15,3 @@ all: error ...@@ -16,12 +15,3 @@ all: error
error: error:
$(error You must install libvpx2-dev to build mod_mp4v2) $(error You must install libvpx2-dev to build mod_mp4v2)
endif endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_mp4v2)
endif
src/mod/codecs/mod_openh264/Makefile.am
浏览文件 @ 44da905b
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_openh264 MODNAME=mod_openh264
if HAVE_YUV
if HAVE_VPX if HAVE_VPX
OPENH264_DIR=/usr/local/ OPENH264_DIR=/usr/local/
...@@ -18,12 +17,3 @@ all: error ...@@ -18,12 +17,3 @@ all: error
error: error:
$(error You must install libvpx2-dev to build mod_openh264) $(error You must install libvpx2-dev to build mod_openh264)
endif endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_openh264)
endif
src/mod/formats/mod_imagick/Makefile.am
浏览文件 @ 44da905b
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_imagick MODNAME=mod_imagick
if HAVE_YUV
if HAVE_VPX if HAVE_VPX
if HAVE_MAGICK if HAVE_MAGICK
...@@ -24,12 +23,3 @@ all: error ...@@ -24,12 +23,3 @@ all: error
error: error:
$(error You must install libvpx2-dev to build mod_imagick) $(error You must install libvpx2-dev to build mod_imagick)
endif endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_imagick)
endif
src/mod/formats/mod_vlc/Makefile.am
浏览文件 @ 44da905b
include $(top_srcdir)/build/modmake.rulesam include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_vlc MODNAME=mod_vlc
if HAVE_YUV
if HAVE_VPX if HAVE_VPX
if HAVE_VLC if HAVE_VLC
...@@ -24,11 +23,3 @@ all: error ...@@ -24,11 +23,3 @@ all: error
error: error:
$(error You must install libvpx2-dev to build mod_vlc) $(error You must install libvpx2-dev to build mod_vlc)
endif endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_vlc)
endif
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论