Merge branch 'osx-port' of https://github.com/pliablepixels/ZoneMinder into osx-port

CMakeLists.txt

@@ -232,7 +232,7 @@ check_type_size("ucontext_t" HAVE_UCONTEXT_T)
 
 # *** LIBRARY CHECKS ***
 
-if (UNIX)
+if (UNIX AND NOT APPLE)
     include (CheckLibraryExists)
     CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
     if(NOT HAVE_CLOCK_GETTIME)
@@ -240,7 +240,7 @@ if (UNIX)
     else(NOT HAVE_CLOCK_GETTIME)
         list(APPEND ZM_BIN_LIBS "-lrt")
     endif(NOT HAVE_CLOCK_GETTIME)
-endif(UNIX)
+endif(UNIX AND NOT APPLE)
 
 # zlib
 find_package(ZLIB)
@@ -659,11 +659,13 @@ message(STATUS "Using web user: ${ZM_WEB_USER}")
 message(STATUS "Using web group: ${ZM_WEB_GROUP}")
 
 # Check for polkit
-find_package(Polkit)
+#if (NOT APPLE)
-if(NOT POLKIT_FOUND)
+	find_package(Polkit)
-	message(FATAL_ERROR 
+	if(NOT POLKIT_FOUND)
-            "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
+		message(FATAL_ERROR 
-endif(NOT POLKIT_FOUND)
+		    "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
+	endif(NOT POLKIT_FOUND)
+#endif (NOT APPLE)
 
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")

README.md

@@ -1,83 +1,48 @@
-ZoneMinder
+###OSX port notes
-==========
 
-[![Build Status](https://travis-ci.org/ZoneMinder/ZoneMinder.png)](https://travis-ci.org/ZoneMinder/ZoneMinder) [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
+This is an initial port *attempt* OSX
+It's just at a point where stuff compiles, and processes run from command line
+That's pretty much it. No packaging modifications yet (and therefore no make install) and no idea if mapped memory works
+No idea if it works together as a system either.
 
-All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
+This may help folks who are interested in an OSX port.
 
-## Overview
 
-ZoneMinder is an integrated set of applications which provide a complete surveillance solution allowing capture, analysis, recording and monitoring of any CCTV or security cameras attached to a Linux based machine. It is designed to run on distributions which support the Video For Linux (V4L) interface and has been tested with video cameras attached to BTTV cards, various USB cameras and also supports most IP network cameras. 
+#### Toolchain
 
-## Contacting the Development Team
+xcode-select --install
-Before creating an issue in our github forum, please read our posting rules:
-https://github.com/ZoneMinder/ZoneMinder/wiki/Github-Posting-Rules
 
-## Installation Methods
+requirement - macports (brew doesn't have polkit)
+sudo port install cmake
+sudo port install jpeg
+sudo port install mysql5
 
-### Building from Source is Discouraged
+sudo perl -MCPAN -e 'install DBI'
+sudo perl -MCPAN -e 'install DBD::mysql'
+sudo perl -MCPAN -e 'install Sys::Mmap'
+sudo perl -MCPAN -e 'install DBI'
+sudo perl -MCPAN -e 'install DBD::mysql'
+sudo perl -MCPAN -e 'install Sys::Mmap'
+sudo perl -MCPAN -e 'install Date::Manip'
+sudo perl -MCPAN -e 'install LWP::UserAgent'
 
-Historically, installing ZoneMinder onto your system required building from source code by issuing the traditional configure, make, make install commands.  To get ZoneMinder to build, all of its dependencies had to be determined and installed beforehand. Init and logrotate scripts had to be manually copied into place following the build.  Optional packages such as jscalendar and Cambozola had to be manually installed. Uninstalls could leave stale files around, which could cause problems during an upgrade.  Speaking of upgrades, when it comes time to upgrade all these manual steps must be repeated again.
 
-Better methods exist today that do much of this for you. The current development team, along with other volunteers, have taken great strides in providing the resources necessary to avoid building from source.  
+#### Environment used to build
 
-### Install from a Package Repository
+Xcode Version 7.3.1 (7D1014)
+gcc --version
+Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
+Apple LLVM version 7.3.0 (clang-703.0.31)
+Target: x86_64-apple-darwin15.4.0
+Thread model: posix
+InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin
 
-This is the recommended method to install ZoneMinder onto your system. ZoneMinder packages are maintained for the following distros:
 
-- Ubuntu via [Iconnor's PPA](https://launchpad.net/~iconnor/+archive/ubuntu/zoneminder)
+#### Build process
-- Debian from their [default repository](https://packages.debian.org/search?searchon=names&keywords=zoneminder) 
-- RHEL/CentOS and clones via [zmrepo](http://zmrepo.zoneminder.com/)
-- Fedora via [zmrepo](http://zmrepo.zoneminder.com/)
-- OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
-- Maegia from their default repository
 
-If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
+git submodule update --init --recursive
+cmake .
 
-### Building a ZoneMinder Package
+#### Things to resolve
-
+*) Haven't tried make install - don't want my mac to explode - need a VM
-Building ZoneMinder into a package is not any harder than building from source.  As a matter of fact, if you have successfully built ZoneMinder from source in the past, then you may find these steps to be easier. 
+*) Apache linkage is TBD
-
-When building a package, it is best to do this work in a separate environment, dedicated to development purposes. This could be as simple as creating a virtual machine, using Docker, or using mock.  All it takes is one “Oops” to regret doing this work on your production server.
-
-Lastly, if you desire to build a development snapshot from the master branch, it is recommended you first build your package using an official release of ZoneMinder. This will help identify whether any problems you may encounter are caused by the build process or is a new issue in the master branch.
-
-Please visit our [ReadtheDocs site](https://zoneminder.readthedocs.org/en/stable/installationguide/index.html) for distro specific instructions.
-
-### Package Maintainers
-Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
-
-For example, let's say I have created a new ZoneMinder package that contains the cambolzola javascript file.  However, by default cambozola support is turned off.  To fix that, add this to the pacakging script:
-```bash
-./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
-```
-
-Note that zmeditconfigdata.sh is intended to be called, from the root build folder, prior to running cmake or configure.
-
-#### Docker
-
-Docker is a system to run applications inside isolated containers. ZoneMinder, and the ZM webserver, will run using the 
-Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
-properly and are documented. 
-
-## Contribution Model and  Development
-
-* Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
-* Report issues/questions/feature requests on [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
-
-Pull requests are very welcome!  If you would like to contribute, please follow
-the following steps.
-
-1. Fork the repo
-2. Open an issue at our [GitHub Issues Tracker](https://github.com/ZoneMinder/ZoneMinder/issues).
-   Describe the bug that you've found, or the feature which you're asking for.
-   Jot down the issue number (e.g. 456)
-3. Create your feature branch (`git checkout -b 456-my-new-feature`)
-4. Commit your changes (`git commit -am 'Added some feature'`)
-   It is preferred that you 'commit early and often' instead of bunching all
-   changes into a single commit.
-5. Push your branch to your fork on github (`git push origin 456-my-new-feature`)
-6. Create new Pull Request
-7. The team will then review, discuss and hopefully merge your changes.
-
-[![Analytics](https://ga-beacon.appspot.com/UA-15147273-6/ZoneMinder/README.md)](https://github.com/igrigorik/ga-beacon)

src/zm.h

@@ -37,4 +37,13 @@
 
 extern const char* self;
 
+#ifdef __APPLE__
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/unistd.h>
+#include <sys/socket.h>
+#include <libgen.h>
+
+#endif
 #endif // ZM_H

src/zm_logger.cpp

@@ -42,6 +42,24 @@ Logger *Logger::smInstance = 0;
 Logger::StringMap Logger::smCodes;
 Logger::IntMap Logger::smSyslogPriorities;
 
+#ifdef __APPLE__
+// can't find basename on OSX though it seems to exist in libgen
+// credit: http://www.math.unl.edu/~rdieter1/OpenStep/Developer/PortingTips/nscompatlib/basename.c
+char * basename (const char *name)
+{
+  const char *base = name;
+
+  while (*name)
+    {
+      if (*name++ == '/')
+        {
+          base = name;
+        }
+    }
+  return (char *) base;
+}
+#endif
+
 #if 0
 static void subtractTime( struct timeval * const tp1, struct timeval * const tp2 )
 {

src/zm_logger.h

@@ -21,6 +21,7 @@
 #define ZM_LOGGER_H
 
 #include "zm_config.h"
+#include "zm.h"
 #include <stdint.h>
 #include <unistd.h>
 #include <string>

src/zm_sendfile.h

@@ -1,31 +1,51 @@
-#ifdef HAVE_SENDFILE4_SUPPORT
+#if defined(HAVE_SENDFILE4_SUPPORT) 
+
 #include <sys/sendfile.h>
 int zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
-    int err;
+        int err;
 
-    err = sendfile(out_fd, in_fd, offset, size);
+        err = sendfile(out_fd, in_fd, offset, size);
-    if (err < 0)
+        if (err < 0)
-        return -errno;
+                return -errno;
 
-    return err;
+        return err;
 }
 #elif HAVE_SENDFILE7_SUPPORT
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 int zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
-    int err;
+        int err;
-    err = sendfile(in_fd, out_fd, *offset, size, NULL, &size, 0);
+        err = sendfile(in_fd, out_fd, *offset, size, NULL, &size, 0);
-    if (err && errno != EAGAIN)
+        if (err && errno != EAGAIN)
-        return -errno;
+                return -errno;
 
-    if (size) {
+        if (size) {
-        *offset += size;
+                *offset += size;
-        return size;
+                return size;
-    }
+        }
 
-    return -EAGAIN;
+        return -EAGAIN;
 }
+#elif HAVE_SENDFILE6_SUPPORT
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
+int zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
+        int err;
+        err = sendfile(in_fd, out_fd, *offset, &size,  0, 0);
+        if (err && errno != EAGAIN)
+                return -errno;
+
+        if (size) {
+                *offset += size;
+                return size;
+        }
+
+        return -EAGAIN;
+}
+
+
 #else
 #error "Your platform does not support sendfile. Sorry."
 #endif

src/zm_signal.cpp

@@ -65,12 +65,16 @@ RETSIGTYPE zm_die_handler(int signal)
     #if defined(__x86_64__)
 	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_rip);
+	    #elif __APPLE__
+		 ip = (void *)(uc->uc_mcontext->__ss.__rip);
 	    #else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]);
 	    #endif
     #else
 	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_eip);
+	    #elif __APPLE_
+		 ip = (void *)(uc->uc_mcontext->__ss.__rip);
 	    #else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
 	    #endif

src/zm_thread.h

@@ -20,6 +20,40 @@
 #ifndef ZM_THREAD_H
 #define ZM_THREAD_H
 
+// missing phread_mutex_timedlock
+//https://lists.freedesktop.org/archives/spice-devel/2010-September/001231.html
+#ifdef __APPLE__
+#include <pthread.h>
+#include <errno.h>
+#define min(a,b) (((a)<(b))?(a):(b))
+int pthread_mutex_timedlock(pthread_mutex_t *mutex, const struct timespec
+*abs_timeout)
+{
+    int pthread_rc;
+    struct timespec remaining, slept, ts;
+
+    remaining = *abs_timeout;
+    while ((pthread_rc = pthread_mutex_trylock(mutex)) == EBUSY) {
+        ts.tv_sec = 0;
+        ts.tv_nsec = (remaining.tv_sec > 0 ? 10000000 : min(remaining.tv_nsec,10000000));
+        nanosleep(&ts, &slept);
+        ts.tv_nsec -= slept.tv_nsec;
+        if (ts.tv_nsec <= remaining.tv_nsec) {
+            remaining.tv_nsec -= ts.tv_nsec;
+        }
+        else {
+            remaining.tv_sec--;
+            remaining.tv_nsec = (1000000 - (ts.tv_nsec - remaining.tv_nsec));
+        }
+        if (remaining.tv_sec < 0 || (!remaining.tv_sec && remaining.tv_nsec <= 0)) {
+            return ETIMEDOUT;
+        }
+    }
+
+    return pthread_rc;
+}
+#endif
+
 #include <unistd.h>
 #include <pthread.h>
 #include <unistd.h>

src/zmc.cpp

@@ -57,7 +57,7 @@ possible, this should run at more or less constant speed.
 
 #include <getopt.h>
 #include <signal.h>
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined (__APPLE__)
 #include <limits.h>
 #else
 #include <values.h>