Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jan 2020 20:18:45 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r524128 - in head/multimedia/ustreamer: . files
Message-ID:  <202001252018.00PKIj25042472@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Sat Jan 25 20:18:45 2020
New Revision: 524128
URL: https://svnweb.freebsd.org/changeset/ports/524128

Log:
  multimedia/ustreamer: Unbreak
  
  The upstream uses -DWITH_PTHREAD_NP={0|1} and #ifdef WITH_PTHREAD_NP inconsistently.
  Fixed this by undeffing WITH_PTHREAD_NP.
  
  Reported by:	fallout

Modified:
  head/multimedia/ustreamer/Makefile
  head/multimedia/ustreamer/distinfo
  head/multimedia/ustreamer/files/patch-src_threading.h

Modified: head/multimedia/ustreamer/Makefile
==============================================================================
--- head/multimedia/ustreamer/Makefile	Sat Jan 25 20:04:02 2020	(r524127)
+++ head/multimedia/ustreamer/Makefile	Sat Jan 25 20:18:45 2020	(r524128)
@@ -2,7 +2,8 @@
 
 PORTNAME=	ustreamer
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.11
+DISTVERSION=	1.11-2
+DISTVERSIONSUFFIX=	-g49eb7f6
 CATEGORIES=	multimedia net
 
 MAINTAINER=	yuri@FreeBSD.org

Modified: head/multimedia/ustreamer/distinfo
==============================================================================
--- head/multimedia/ustreamer/distinfo	Sat Jan 25 20:04:02 2020	(r524127)
+++ head/multimedia/ustreamer/distinfo	Sat Jan 25 20:18:45 2020	(r524128)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579082493
-SHA256 (pi-kvm-ustreamer-v1.11_GH0.tar.gz) = bac2fa0f9c7aadcb6707a103a674ab670557d75e0af26ea21586dac99f3541b6
-SIZE (pi-kvm-ustreamer-v1.11_GH0.tar.gz) = 92658
+TIMESTAMP = 1579452747
+SHA256 (pi-kvm-ustreamer-v1.11-2-g49eb7f6_GH0.tar.gz) = d1c933c7b8ec8fb005b49ef8d120eb9cd685e92f3935018c601a3368494e109b
+SIZE (pi-kvm-ustreamer-v1.11-2-g49eb7f6_GH0.tar.gz) = 92712

Modified: head/multimedia/ustreamer/files/patch-src_threading.h
==============================================================================
--- head/multimedia/ustreamer/files/patch-src_threading.h	Sat Jan 25 20:04:02 2020	(r524127)
+++ head/multimedia/ustreamer/files/patch-src_threading.h	Sat Jan 25 20:18:45 2020	(r524128)
@@ -1,6 +1,14 @@
---- src/threading.h.orig	2019-10-12 07:24:29 UTC
+--- src/threading.h.orig	2020-01-19 14:23:41 UTC
 +++ src/threading.h
-@@ -102,7 +102,7 @@ INLINE void thread_get_name(char *name) { // Always re
+@@ -19,6 +19,7 @@
+ #                                                                            #
+ *****************************************************************************/
+ 
++#undef WITH_PTHREAD_NP https://github.com/pikvm/ustreamer/issues/12
+ 
+ #pragma once
+ 
+@@ -102,7 +103,7 @@ INLINE void thread_get_name(char *name) { // Always re
  #	endif
  	if (retval < 0) {
  #endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001252018.00PKIj25042472>