FS-8867: build using in tree libyuv to match required version and not impact system ones that are never sufficient version

This commit is contained in:
Michael Jerris
2016-02-24 16:52:40 -05:00
parent ed78d38994
commit 44da905b4f
9 changed files with 37 additions and 81 deletions

View File

@@ -1,7 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_av
if HAVE_YUV
if HAVE_VPX
if HAVE_AVFORMAT
@@ -24,12 +23,3 @@ all: error
error:
$(error You must install libvpx2-dev to build mod_av)
endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_av)
endif

View File

@@ -1,7 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_cv
if HAVE_YUV
if HAVE_VPX
if HAVE_OPENCV
@@ -24,12 +23,3 @@ all: error
error:
$(error You must install libvpx2-dev to build mod_cv)
endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_cv)
endif

View File

@@ -1,7 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_fsv
if HAVE_YUV
if HAVE_VPX
mod_LTLIBRARIES = mod_fsv.la
@@ -16,13 +15,3 @@ all: error
error:
$(error You must install libvpx2-dev to build mod_fsv)
endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_fsv)
endif

View File

@@ -1,7 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_mp4v2
if HAVE_YUV
if HAVE_VPX
mod_LTLIBRARIES = mod_mp4v2.la
@@ -16,12 +15,3 @@ all: error
error:
$(error You must install libvpx2-dev to build mod_mp4v2)
endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_mp4v2)
endif

View File

@@ -1,7 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_openh264
if HAVE_YUV
if HAVE_VPX
OPENH264_DIR=/usr/local/
@@ -18,12 +17,3 @@ all: error
error:
$(error You must install libvpx2-dev to build mod_openh264)
endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_openh264)
endif

View File

@@ -1,7 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_imagick
if HAVE_YUV
if HAVE_VPX
if HAVE_MAGICK
@@ -24,12 +23,3 @@ all: error
error:
$(error You must install libvpx2-dev to build mod_imagick)
endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_imagick)
endif

View File

@@ -1,7 +1,6 @@
include $(top_srcdir)/build/modmake.rulesam
MODNAME=mod_vlc
if HAVE_YUV
if HAVE_VPX
if HAVE_VLC
@@ -24,11 +23,3 @@ all: error
error:
$(error You must install libvpx2-dev to build mod_vlc)
endif
else
install: error
all: error
error:
$(error You must install libyuv-dev to build mod_vlc)
endif