mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-08 12:01:56 +00:00
Code Issues Releases Activity

multimedia/ustreamer: Update 1.0 -> 1.9

Browse Source 
Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2019-10-12 07:26:44 +00:00
parent 81f9ebe9d3
commit 08aef2b2b8
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=514321
5 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/ustreamer/Makefile
View File

@ -2,8 +2,7 @@
PORTNAME= ustreamer
DISTVERSIONPREFIX= v
DISTVERSION= 1.0
PORTREVISION= 2
DISTVERSION= 1.9
CATEGORIES= multimedia net
MAINTAINER= yuri@FreeBSD.org

6
multimedia/ustreamer/distinfo
View File

@ -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

24
multimedia/ustreamer/files/patch-src_encoders_omx_formatters.h
View File

@ -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);

11
multimedia/ustreamer/files/patch-src_threading.h Normal file
View File

@ -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

22
multimedia/ustreamer/files/patch-src_tools.h
View File

@ -1,8 +1,8 @@
--- 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 <sys/ioctl.h>
#include <sys/syscall.h>
@@ -40,6 +40,13 @@
#define INLINE inline __attribute__((always_inline))
#define UNUSED __attribute__((unused))
+#ifndef CLOCK_MONOTONIC_RAW
+# ifdef CLOCK_MONOTONIC_FAST
@ -12,15 +12,5 @@
+# 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");