[Upstream FreeBSD specific patches] #1761

abishai · 2017-01-31T07:47:49Z

Remove usage of abs() . This one fixes (TRIVIAL) 1.30 is not compiling under FreeBSD11-ALPHA3 #1530
Switch to POSIX basename() FreeBSD project deprecates GNU functions if POSIX analogs available. Function was entirely removed in HEAD.
cmake patch to remove polkit check for FreeBSD and provide more paths for mysql header lookup.
fix llvm400 specific errors See comparison between pointer and zero #1760

provide alternate path for mysql headers

abishai · 2017-01-31T08:15:54Z

Here are some patches I've made during porting ZM to FreeBSD. I included C and CMAKE patches to get feedback (I'm not programmer myself and have little experience in PR system). If they are OK, I'll provide even more :)
Plan is to get rid of patches entirely.

knight-of-ni · 2017-01-31T13:06:19Z

Thank you for submitting these patches. Some of these changes will need to be tweaked a bit.

We are making a final push to get the next release out the door. I'll provide further feedback following release.

connortechnology · 2017-01-31T14:21:12Z

src/zm_image.cpp

-#else
-        if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
-#endif
+	    unsigned int diff = ((*psrc)-RGB_VAL(ref_colour,c)) > 0 ? (*psrc)-RGB_VAL(ref_colour,c) : RGB_VAL(ref_colour,c) - (*psrc);


I thought at first that this couldn't be correct... but it is. You know what I would like to see though? the result of RGB_VAL(ref_colour,c) being put into a variable and then used. I know the compiler likely optimises it away anyways... but I think it would be more readable...

connortechnology · 2017-01-31T16:08:59Z

src/zm_logger.cpp

@@ -515,8 +515,9 @@ void Logger::logPrint( bool hex, const char * const filepath, const int line, co
    va_list     argPtr;
    struct timeval  timeVal;

-    const char * const file = basename(filepath);
-
+    char *filecopy = strdup(filepath);


why are we copying filepath?

GNU and POSIX functions have different prototypes, one is accepting char*, another - const char*

https://www.freebsd.org/cgi/man.cgi?query=basename&apropos=0&sektion=3&manpath=FreeBSD+12-current&arch=default&format=html
https://www.freebsd.org/cgi/man.cgi?query=basename&sektion=3&apropos=0&manpath=FreeBSD+11.0-RELEASE+and+Ports

Okay... but you don't need to copy it.. just use a cast

Well, as I'm not programmer myself, I read manuals. It was said that such casting is a bad habit as const is a pointer to read only memory location and char* to read write. Recommendation was to use another pointer.

Ok, so apparently some implementations of basename will modify the input. This is for multi-threaded support apparently. So... I guess this change is actually correct. But I don't want to be doing this on every logPrint. I will see if I can refactor this to be more efficient.

knight-of-ni · 2017-02-04T21:43:07Z

@abishai I sent a PR to your master branch to revise commit 0f23809
It is a better method for determining when to check for polkit.

Note that generating pr's from your own master branch can cause problems later on. It is best to always create a new branch first and do you work from that... e.g. git checkout -b my_shiny_new_branch

abishai · 2017-02-04T21:48:01Z

@knnniggett Thank you! I'll test if it still builds.

OK, I'll try it. PR system is rather complicated to me. For example, my llvm patch was glued to this one. I tried to made it separated.

knight-of-ni · 2017-02-04T21:51:47Z

OK, I'll try it. PR system is rather complicated to me. For example, my llvm patch was glued to this one. I tried to made it separated.

Yes, that is because you are working out of your master branch.

check for polkit only if systemd is present

abishai · 2017-02-05T18:36:27Z

I'll remake clang patch. I shouldn't blindly change similar lines as only mmap returns -1.

connortechnology · 2017-02-05T21:40:00Z

src/zmf.cpp

@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
    Debug( 1, "Got image, writing to %s", path );

    FILE *fd = 0;
-    if ( (fd = fopen( path, "w" )) < 0 )
+    if ( (fd = fopen( path, "w" )) < (void *)0 )


I'm pretty sure this is incorrect... I will have to do some research to figure out what it should be. I always thought that file descriptors were integers...

Yeah. I wrote that I'll remake the patch. Should be == NULL.

abishai · 2017-02-06T07:02:50Z

Revised clang patch.

knight-of-ni · 2017-04-27T12:30:40Z

CMakeLists.txt

@@ -386,13 +394,13 @@ find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
 if(MYSQLCLIENT_LIBRARIES)
 	set(HAVE_LIBMYSQLCLIENT 1)
 	list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
-	find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql.h)
+	find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h /usr/local/include/mysql /usr/include/mysql)


@abishai Can you try this instead?
find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)

knight-of-ni · 2017-05-10T13:11:41Z

@abishai I changed find_path to use PATH_SUFFIXES before merging this. I believe it should work.
Thank you for submitting these. Now that 1.30.4 is released, we will merge any future pr's like this one much more quickly. Remember though, first create a new branch in your fork and work out of that rather than master. :-)

abishai added 2 commits January 31, 2017 10:42

implement platform-agnostic comparison without abs()

97380f0

rc.d is not require polkit

0f23809

provide alternate path for mysql headers

abishai changed the title ~~[Upstream FreeBSD specific patches] implement platform-agnostic comparison without abs()~~ [Upstream FreeBSD specific patches] Jan 31, 2017

switch to POSIX basename()

1687217

connortechnology reviewed Jan 31, 2017

View reviewed changes

abishai and others added 2 commits February 3, 2017 14:53

make clang happy

8d5a8f5

check for polkit only if systemd is present

160aa1c

Merge pull request #1 from knnniggett/master

c7aaa8a

check for polkit only if systemd is present

connortechnology reviewed Feb 5, 2017

View reviewed changes

make clang happy take two

74dd8ab

knight-of-ni added this to the 1.31.0 milestone Apr 27, 2017

knight-of-ni reviewed Apr 27, 2017

View reviewed changes

knight-of-ni merged commit 74dd8ab into ZoneMinder:master May 10, 2017

knight-of-ni mentioned this pull request May 18, 2017

mysql57 - header files detection problem #1510

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Upstream FreeBSD specific patches] #1761

[Upstream FreeBSD specific patches] #1761

abishai commented Jan 31, 2017 •

edited

abishai commented Jan 31, 2017 •

edited

knight-of-ni commented Jan 31, 2017

connortechnology Jan 31, 2017

connortechnology Jan 31, 2017

abishai Jan 31, 2017

abishai Jan 31, 2017

connortechnology Jan 31, 2017

abishai Jan 31, 2017

connortechnology Jan 31, 2017

knight-of-ni commented Feb 4, 2017 •

edited

abishai commented Feb 4, 2017

knight-of-ni commented Feb 4, 2017

abishai commented Feb 5, 2017

connortechnology Feb 5, 2017

abishai Feb 5, 2017

abishai commented Feb 6, 2017

knight-of-ni Apr 27, 2017

knight-of-ni commented May 10, 2017

[Upstream FreeBSD specific patches] #1761

[Upstream FreeBSD specific patches] #1761

Conversation

abishai commented Jan 31, 2017 • edited

abishai commented Jan 31, 2017 • edited

knight-of-ni commented Jan 31, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

knight-of-ni commented Feb 4, 2017 • edited

abishai commented Feb 4, 2017

knight-of-ni commented Feb 4, 2017

abishai commented Feb 5, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abishai commented Feb 6, 2017

Choose a reason for hiding this comment

knight-of-ni commented May 10, 2017

abishai commented Jan 31, 2017 •

edited

abishai commented Jan 31, 2017 •

edited

knight-of-ni commented Feb 4, 2017 •

edited