fix debian/install and build process for binary & API clients

CMakeLists.txt

@@ -75,15 +75,12 @@ pkg_check_modules(SOUP REQUIRED libsoup-2.4>=${SOUP_REQUIRED})
 
 set(CMAKE_INSTALL_GST_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/gstreamer-1.5)
 
-# Patch and build the ALVAR library
-message("Patch ALVAR library sources for OpenCV compatibility:")
-execute_process(
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  COMMAND git apply --verbose --directory=alvar-2.0.0-src-opencv3 alvar-compat-opencv-2-3.patch
-  RESULT_VARIABLE GIT_RESULT
-)
-if(NOT GIT_RESULT EQUAL "0")
-  message(FATAL_ERROR "git apply failed on ALVAR library")
+# Set some definitions before adding the ALVAR library
+if(NOT DEFINED ALVAR_PACKAGE)
+    set(ALVAR_PACKAGE src)
+endif()
+if(NOT DEFINED ALVAR_NOGLUT)
+    set(ALVAR_NOGLUT 1)
 endif()
 add_subdirectory(alvar-2.0.0-src-opencv3)
 

alvar-patch.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+# Preparation script to build ALVAR from sources.
+#
+# ALVAR source code has some issues with modern versions of the compiler, so
+# we maintain a patch that fixes all compilation errors. This patch should be
+# applied once before the build step.
+
+# Bash options for strict error checking
+set -o errexit -o errtrace -o pipefail -o nounset
+
+# Trace all commands
+set -o xtrace
+
+# Apply our patch on the ALVAR sources
+git apply --verbose \
+    --directory=alvar-2.0.0-src-opencv3 \
+    ./alvar-compat-opencv-2-3.patch

debian/control

@@ -20,6 +20,8 @@ Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends},
+ kms-core (>= 6.7.0),
+ kms-elements (>= 6.7.0),
  kms-filters (>= 6.7.0)
 Breaks: kms-markerdetector-6.0
 Replaces: kms-markerdetector-6.0
@@ -29,9 +31,9 @@ Package: kms-markerdetector-dev
 Architecture: any
 Section: libdevel
 Depends: kms-markerdetector (= ${binary:Version}),
- kms-core-dev,
- kms-elements-dev,
- kms-filters-dev,
+ kms-core-dev (>= 6.7.0),
+ kms-elements-dev (>= 6.7.0),
+ kms-filters-dev (>= 6.7.0),
  libopencv-dev,
  libsoup2.4-dev,
  libtinyxml-dev

debian/kms-markerdetector-dev.install

@@ -1,4 +1,12 @@
+usr/include/alvar/*.h
+usr/include/alvar/*/*.h
+usr/include/alvar/*/*/*.h
+usr/include/kurento/modules/*/*.h
 usr/include/kurento/modules/*/*.hpp
+usr/lib/*/libalvar.so
+usr/lib/*/libalvarplatform.so
 usr/lib/*/libkmsmarkerdetectorimpl.so
 usr/lib/*/pkgconfig/*.pc
+usr/share/alvar/*
+usr/share/cmake-*/*/*.cmake
 usr/share/kurento/modules/*.kmd.json

debian/kms-markerdetector.install

@@ -1,2 +1,3 @@
-usr/lib/*/lib*.so*
 usr/lib/*/kurento/*/*.so
+usr/lib/*/lib*.so.*
+usr/lib/*/libalvarcaptureplugin*.so

debian/rules

@@ -7,4 +7,4 @@
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DALVAR_PACKAGE=src -DALVAR_NOGLUT=1
+	./alvar-patch.sh && dh_auto_configure

src/server/CMakeLists.txt

@@ -1,24 +1,7 @@
 cmake_minimum_required (VERSION 2.8)
 
-# Generate code
 include (CodeGenerator)
 
-# Possible parameters
-# set (MULTI_VALUE_PARAMS
-#   MODELS
-#   INTERFACE_LIB_EXTRA_SOURCES
-#   INTERFACE_LIB_EXTRA_HEADERS
-#   INTERFACE_LIB_EXTRA_INCLUDE_DIRS
-#   INTERFACE_LIB_EXTRA_LIBRARIES
-#   SERVER_IMPL_LIB_EXTRA_SOURCES
-#   SERVER_IMPL_LIB_EXTRA_HEADERS
-#   SERVER_IMPL_LIB_EXTRA_INCLUDE_DIRS
-#   SERVER_IMPL_LIB_EXTRA_LIBRARIES
-#   MODULE_EXTRA_INCLUDE_DIRS
-#   MODULE_EXTRA_LIBRARIES
-#   SERVER_IMPL_LIB_FIND_CMAKE_EXTRA_LIBRARIES
-# )
-
 generate_code (
   MODELS ${CMAKE_CURRENT_SOURCE_DIR}/interface
   INTERFACE_LIB_EXTRA_INCLUDE_DIRS ${ALVAR_INCLUDE_DIRS}