From 70c9bb0b48639a523708a309b7b8e99ffc12b4f6 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Wed, 3 Sep 2014 02:35:32 +0000 Subject: [PATCH 1/4] Reduced minimum OpenCV version (2.4.8 not required since OpenCL was removed) --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 39d1fc0..0699005 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -27,7 +27,7 @@ find_path(OpenCV_DIR # Opencv Package FIND_PACKAGE( OpenCV REQUIRED ) -IF (${OpenCV_VERSION} VERSION_LESS 2.4.8) +IF (${OpenCV_VERSION} VERSION_LESS 2.4.7) MESSAGE(FATAL_ERROR "OpenCV version is not compatible : ${OpenCV_VERSION}") ENDIF() From 14542b5eb13350012b07bc78ee495e2fd3c52107 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Thu, 18 Sep 2014 08:27:07 -0500 Subject: [PATCH 2/4] Added alprd to install targets --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0699005..f30132f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,6 +91,7 @@ add_subdirectory(video) install (TARGETS alpr DESTINATION bin) +install (TARGETS alprd DESTINATION bin) install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION share/man/man1 COMPONENT doc) install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION share/openalpr/) install (FILES ${CMAKE_SOURCE_DIR}/../config/openalpr.conf DESTINATION /etc/openalpr/ COMPONENT config) From 719cf102ec0babfc6ec2a172e5fbea5fe3880bef Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Thu, 18 Sep 2014 08:28:53 -0500 Subject: [PATCH 3/4] Added alprd.conf to install targets --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f30132f..1970d4c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -95,6 +95,7 @@ install (TARGETS alprd DESTINATION bin) install (FILES ${CMAKE_SOURCE_DIR}/../doc/man/alpr.1 DESTINATION share/man/man1 COMPONENT doc) install (DIRECTORY ${CMAKE_SOURCE_DIR}/../runtime_data DESTINATION share/openalpr/) install (FILES ${CMAKE_SOURCE_DIR}/../config/openalpr.conf DESTINATION /etc/openalpr/ COMPONENT config) +install (FILES ${CMAKE_SOURCE_DIR}/../config/alprd.conf DESTINATION /etc/openalpr/ COMPONENT config) From 95796c412df15adec7cac08e0dd124bf47269a54 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Thu, 18 Sep 2014 08:31:16 -0500 Subject: [PATCH 4/4] Tweaked alprd upstart --- upstart/alprd.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/upstart/alprd.conf b/upstart/alprd.conf index a9a2dcf..257d5a1 100644 --- a/upstart/alprd.conf +++ b/upstart/alprd.conf @@ -16,8 +16,8 @@ respawn limit 5 30 env uid=watchtower env gid=watchtower -env DAEMON=/usr/local/bin/alprd -env DAEMON_ARGS="-l /var/log/watchtower/alprd.log -n 20" +env DAEMON=/usr/bin/alprd +env DAEMON_ARGS="-l /var/log/alprd.log -n 20" env PIDFILE=/var/run/alprd.pid exec start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --chuid $uid:$gid -- $DAEMON_ARGS