diff options
| author | GP Orcullo <kinsamanka@gmail.com> | 2017-08-31 17:14:32 +0800 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-09-06 07:10:38 +0000 |
| commit | 66ff8434575d6f12b1d7ca893d22df1a55ff84e3 (patch) | |
| tree | 1e7f38b1bbb17e594c24103ec0906b23dea2de15 /testing/motion/pthread_key_create.patch | |
| parent | 1e776e60847dfb253fc3e76286e40384ad9d8d96 (diff) | |
| download | aports-66ff8434575d6f12b1d7ca893d22df1a55ff84e3.tar.bz2 aports-66ff8434575d6f12b1d7ca893d22df1a55ff84e3.tar.xz | |
testing/motion: Updated to version 4.0.1 with ffmpeg
- updated to the latest release
- re-enabled ffmpeg support
- switched to openrc init
- used /var/lib/motion for storage
- disabled cpu optimization
Diffstat (limited to 'testing/motion/pthread_key_create.patch')
| -rw-r--r-- | testing/motion/pthread_key_create.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/testing/motion/pthread_key_create.patch b/testing/motion/pthread_key_create.patch deleted file mode 100644 index afedce75b5..0000000000 --- a/testing/motion/pthread_key_create.patch +++ /dev/null @@ -1,53 +0,0 @@ -make sure we create the tls key before we access in any way. - -we also fix the check for broken glibc strerror_r - ---- ./motion.c.orig -+++ ./motion.c -@@ -2267,6 +2267,9 @@ - struct sigaction sigchild_action; - setup_signals(&sig_handler_action, &sigchild_action); - -+ /* Create the TLS key for thread number. */ -+ pthread_key_create(&tls_key_threadnr, NULL); -+ - motion_startup(1, argc, argv); - - #ifdef HAVE_FFMPEG -@@ -2290,9 +2293,6 @@ - pthread_attr_init(&thread_attr); - pthread_attr_setdetachstate(&thread_attr, PTHREAD_CREATE_DETACHED); - -- /* Create the TLS key for thread number. */ -- pthread_key_create(&tls_key_threadnr, NULL); -- - do { - if (restart) { - /* Handle the restart situation. Currently the approach is to -@@ -2745,9 +2745,6 @@ - { - int errno_save, n; - char buf[1024]; --#if (!defined(BSD)) && (!(_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE) -- char msg_buf[100]; --#endif - va_list ap; - int threadnr; - -@@ -2780,12 +2778,13 @@ - * version of strerror_r, which doesn't actually put the message into - * my buffer :-(. I have put in a 'hack' to get around this. - */ --#if (defined(BSD)) -- strerror_r(errno_save, buf + n, sizeof(buf) - n); /* 2 for the ': ' */ --#elif (_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! _GNU_SOURCE -+#if !defined(__GLIBC__) || ((_POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600) && ! defined(_GNU_SOURCE)) - strerror_r(errno_save, buf + n, sizeof(buf) - n); - #else -+ { -+ char msg_buf[100]; - strncat(buf, strerror_r(errno_save, msg_buf, sizeof(msg_buf)), 1024 - strlen(buf)); -+ } - #endif - } - /* If 'level' is not negative, send the message to the syslog */ |
