Index: head/multimedia/ustreamer/Makefile =================================================================== --- head/multimedia/ustreamer/Makefile (revision 514320) +++ head/multimedia/ustreamer/Makefile (revision 514321) @@ -1,27 +1,26 @@ # $FreeBSD$ PORTNAME= ustreamer DISTVERSIONPREFIX= v -DISTVERSION= 1.0 -PORTREVISION= 2 +DISTVERSION= 1.9 CATEGORIES= multimedia net MAINTAINER= yuri@FreeBSD.org COMMENT= Lightweight and fast MJPG-HTTP streamer LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid USES= compiler:c11 gmake jpeg localbase:ldflags USE_GITHUB= yes GH_ACCOUNT= pi-kvm INSTALL_TARGET= install-strip PLIST_FILES= bin/ustreamer .include Index: head/multimedia/ustreamer/distinfo =================================================================== --- head/multimedia/ustreamer/distinfo (revision 514320) +++ head/multimedia/ustreamer/distinfo (revision 514321) @@ -1,3 +1,3 @@ -TIMESTAMP = 1563008797 -SHA256 (pi-kvm-ustreamer-v1.0_GH0.tar.gz) = fc22e861e164d1cc34b43f20ef85ceca41ff3cf22926438f8c8b1057827bb68d -SIZE (pi-kvm-ustreamer-v1.0_GH0.tar.gz) = 87975 +TIMESTAMP = 1570864748 +SHA256 (pi-kvm-ustreamer-v1.9_GH0.tar.gz) = 04ac714e5b0fb8ba37d7b6df510aec807187db5d5bd2f9468ee0caea6d2b1f55 +SIZE (pi-kvm-ustreamer-v1.9_GH0.tar.gz) = 92600 Index: head/multimedia/ustreamer/files/patch-src_encoders_omx_formatters.h =================================================================== --- head/multimedia/ustreamer/files/patch-src_encoders_omx_formatters.h (revision 514320) +++ head/multimedia/ustreamer/files/patch-src_encoders_omx_formatters.h (nonexistent) @@ -1,24 +0,0 @@ ---- src/encoders/omx/formatters.h.orig 2019-04-27 06:14:24 UTC -+++ src/encoders/omx/formatters.h -@@ -34,12 +34,21 @@ - #include "../../tools.h" - - -+#if defined(__FreeBSD__) -+#define LOG_OMX_ERROR(_error, _msg, ...) { \ -+ LOGGING_LOCK; \ -+ printf("-- ERROR [%.03Lf tid=%ld] -- " _msg ": %s\n", get_now_monotonic(), \ -+ pthread_getthreadid_np(), ##__VA_ARGS__, omx_error_to_string(_error)); \ -+ LOGGING_UNLOCK; \ -+ } -+#else - #define LOG_OMX_ERROR(_error, _msg, ...) { \ - LOGGING_LOCK; \ - printf("-- ERROR [%.03Lf tid=%ld] -- " _msg ": %s\n", get_now_monotonic(), \ - syscall(SYS_gettid), ##__VA_ARGS__, omx_error_to_string(_error)); \ - LOGGING_UNLOCK; \ - } -+#endif - - - const char *omx_error_to_string(OMX_ERRORTYPE error); Property changes on: head/multimedia/ustreamer/files/patch-src_encoders_omx_formatters.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/ustreamer/files/patch-src_threading.h =================================================================== --- head/multimedia/ustreamer/files/patch-src_threading.h (nonexistent) +++ head/multimedia/ustreamer/files/patch-src_threading.h (revision 514321) @@ -0,0 +1,11 @@ +--- src/threading.h.orig 2019-10-12 07:24:29 UTC ++++ src/threading.h +@@ -102,7 +102,7 @@ INLINE void thread_get_name(char *name) { // Always re + # endif + if (retval < 0) { + #endif +- assert(snprintf(name, MAX_THREAD_NAME, "tid=%d", (pid_t)syscall(SYS_gettid)) > 0); ++ assert(snprintf(name, MAX_THREAD_NAME, "tid=%d", (pid_t)syscall(SYS_thr_self)) > 0); + #ifdef WITH_PTHREAD_NP + } + #endif Property changes on: head/multimedia/ustreamer/files/patch-src_threading.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/multimedia/ustreamer/files/patch-src_tools.h =================================================================== --- head/multimedia/ustreamer/files/patch-src_tools.h (revision 514320) +++ head/multimedia/ustreamer/files/patch-src_tools.h (revision 514321) @@ -1,26 +1,16 @@ ---- src/tools.h.orig 2019-04-27 06:12:11 UTC +--- src/tools.h.orig 2019-10-11 20:37:25 UTC +++ src/tools.h -@@ -36,6 +36,13 @@ - #include - #include +@@ -40,6 +40,13 @@ + #define INLINE inline __attribute__((always_inline)) + #define UNUSED __attribute__((unused)) +#ifndef CLOCK_MONOTONIC_RAW +# ifdef CLOCK_MONOTONIC_FAST +# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_FAST +# else +# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC +# endif +#endif - #define A_THREAD_CREATE(_tid, _func, _arg) assert(!pthread_create(_tid, NULL, _func, _arg)) - #define A_THREAD_JOIN(_tid) assert(!pthread_join(_tid, NULL)) -@@ -106,5 +113,9 @@ INLINE long double get_now_real(void) { - } - - INLINE pid_t get_thread_id(void) { -+#if defined(__FreeBSD__) -+ return pthread_getthreadid_np(); -+#else - return syscall(SYS_gettid); -+#endif - } + INLINE char *bool_to_string(bool flag) { + return (flag ? "true" : "false");