No longer build v4l-utils, it should be found on the system.

builders/ms2.cmake

@@ -114,7 +114,3 @@ if(ENABLE_ZRTP)
 	lcb_dependencies("bzrtp")
 endif()
 
-if(ENABLE_V4L)
-	lcb_dependencies("v4l")
-endif()
-

builders/v4l.cmake

-############################################################################
-# v4l.cmake
-# Copyright (C) 2014  Belledonne Communications, Grenoble France
-#
-############################################################################
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-############################################################################
-
-lcb_git_repository("git://linuxtv.org/v4l-utils.git")
-lcb_git_tag_latest("master")
-lcb_git_tag("v4l-utils-1.0.0")
-lcb_external_source_paths("externals/v4l-utils")
-lcb_may_be_found_on_system(YES)
-lcb_ignore_warnings(YES)
-
-lcb_build_method("autotools")
-lcb_use_autoreconf(YES)
-lcb_cross_compilation_options(
-	"--prefix=${CMAKE_INSTALL_PREFIX}"
-	"--host=${LINPHONE_BUILDER_HOST}"
-)
-lcb_configure_options(
-	"--disable-v4l-utils"
-	"--disable-qv4l2"
-	"--disable-libdvbv5"
-	"--with-udevdir=${CMAKE_INSTALL_PREFIX}/etc"
-	"--without-jpeg"
-)
-lcb_linking_type("--disable-static" "--enable-shared")

configs/config-android.cmake

@@ -90,7 +90,6 @@ lcb_builder_cmake_options(ms2 "-DENABLE_ANDROIDSND=YES")
 lcb_builder_cmake_options(ms2 "-DENABLE_PULSEAUDIO=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_OSS=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_GLX=NO")
-lcb_builder_cmake_options(ms2 "-DENABLE_V4L=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_X11=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_XV=NO")
 lcb_builder_cmake_options(ms2 "-DENABLE_DOC=NO")

configs/config-python.cmake

@@ -120,9 +120,6 @@ endif()
 # polarssl
 lcb_builder_linking_type(polarssl "-DUSE_SHARED_POLARSSL_LIBRARY=NO")
 
-# v4l
-lcb_builder_linking_type(v4l "--enable-static" "--disable-shared" "--with-pic")
-
 # vpx
 lcb_builder_linking_type(vpx "--enable-static" "--disable-shared" "--enable-pic")
 

configs/desktop-raspberry/package/CMakeLists.txt

@@ -60,7 +60,6 @@ file(GLOB FILES_TO_DELETE
 	"${LINPHONE_SDK_TMP}/bin/ir-*"
 	"${LINPHONE_SDK_TMP}/bin/ivtv*"
 	"${LINPHONE_SDK_TMP}/bin/rds-*"
-	"${LINPHONE_SDK_TMP}/bin/v4l*"
 )
 file(REMOVE ${FILES_TO_DELETE})
 

options/ms2.cmake

@@ -62,7 +62,6 @@ lcb_add_strict_dependent_option("H263p" "H263+ video encoding/decoding support (
 lcb_add_option("MKV" "MKV playing and recording support." "${DEFAULT_VALUE_ENABLE_MKV}")
 lcb_add_strict_dependent_option("MPEG4" "MPEG4 video encoding/decoding support (require license)." OFF "ENABLE_FFMPEG" OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
 lcb_add_strict_dependent_option("OpenH264" "H.264 video encoding/decoding support with the openh264 library (require license)." OFF "ENABLE_VIDEO" OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")
-lcb_add_dependent_option("V4L" "V4L camera driver." ON "ENABLE_VIDEO;UNIX;NOT APPLE;NOT QNX;NOT ANDROID" OFF)
 lcb_add_dependent_option("VPX" "VPX (VP8) video encoding/decoding support." "${DEFAULT_VALUE_ENABLE_VPX}" "ENABLE_VIDEO" OFF)
 lcb_add_strict_dependent_option("X264" "H.264 video encoding support with the x264 library (require license)." OFF "ENABLE_VIDEO;ENABLE_GPL_THIRD_PARTIES;ENABLE_UNMAINTAINED" OFF "ENABLE_NON_FREE_CODECS" "non free codecs option not enabled (ENABLE_NON_FREE_CODECS).")