diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-12-10 21:42:58 +0100 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2016-12-10 21:43:14 +0100 |
commit | 468dde31d7865052011e4e0bff49b21407f6f1b3 (patch) | |
tree | b107d8bc4964807c9962d1997720be4883ffca6b /www-misc/zoneminder/files | |
parent | dev-python/rencode: Version bump. (diff) | |
download | gentoo-468dde31d7865052011e4e0bff49b21407f6f1b3.tar.gz gentoo-468dde31d7865052011e4e0bff49b21407f6f1b3.tar.bz2 gentoo-468dde31d7865052011e4e0bff49b21407f6f1b3.zip |
www-misc/zoneminder: Version bump, fixing bug 546842, bug 564278, and bug 574006
In addition a lot of QA cleanup and an EAPI bump has been done.
Thanks to
* Russell Knighton <russell@annunaki2k2.co.uk>
* Jason Oliveira <jason.oliveira@medicalcannab.is>
* Aaron Burnett <awol.lordofthepants@gmail.com>
for their contributions.
Package-Manager: portage-2.3.2
Diffstat (limited to 'www-misc/zoneminder/files')
-rw-r--r-- | www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch | 20 | ||||
-rw-r--r-- | www-misc/zoneminder/files/zoneminder.service | 11 |
2 files changed, 31 insertions, 0 deletions
diff --git a/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch b/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch new file mode 100644 index 000000000000..cb645528c051 --- /dev/null +++ b/www-misc/zoneminder/files/zoneminder-1.28.1-mysql_include_path.patch @@ -0,0 +1,20 @@ +--- a/CMakeLists.txt 2015-10-27 17:28:48.059203421 +0000 ++++ b/CMakeLists.txt 2015-10-27 17:30:11.951226715 +0000 +@@ -255,7 +255,16 @@ + if(MYSQLCLIENT_LIBRARIES) + set(HAVE_LIBMYSQLCLIENT 1) + list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}") +- find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h) ++ find_file(MYSQL_CONFIG mysql_config) ++ if(MYSQL_CONFIG) ++ execute_process(COMMAND ${MYSQL_CONFIG} ++ --variable=pkgincludedir OUTPUT_VARIABLE ++ MYSQLCLIENT_INCLUDE_DIR) ++ STRING(REGEX REPLACE "\n" "" MYSQLCLIENT_INCLUDE_DIR ++ ${MYSQLCLIENT_INCLUDE_DIR}) ++ else() ++ find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h) ++ endif() + if(MYSQLCLIENT_INCLUDE_DIR) + include_directories("${MYSQLCLIENT_INCLUDE_DIR}") + set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}") diff --git a/www-misc/zoneminder/files/zoneminder.service b/www-misc/zoneminder/files/zoneminder.service new file mode 100644 index 000000000000..9ef5bc6ee552 --- /dev/null +++ b/www-misc/zoneminder/files/zoneminder.service @@ -0,0 +1,11 @@ +[Unit] +Description=Video Security and Survellance System + +[Service] +Type=forking +ExecStart=/usr/bin/zmpkg.pl start +ExecReload=/usr/bin/zmpkg.pl reload +PIDFile=/run/zm/zm.pid + +[Install] +WantedBy=multi-user.target |