Date: Fri, 28 Feb 2014 09:52:29 GMT From: Nikola Kolev <koue@chaosophia.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/187135: [patch] net/ortp fixed clang build error, update version Message-ID: <201402280952.s1S9qTcb001249@cgiserv.freebsd.org> Resent-Message-ID: <201402281000.s1SA00oi082083@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187135
>Category: ports
>Synopsis: [patch] net/ortp fixed clang build error, update version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 28 10:00:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Nikola Kolev
>Release: 10.0-RELEASE
>Organization:
-
>Environment:
FreeBSD hypocrisy 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Port version is very old 0.13.0. Last available is 0.22.0. Sent mail to maintainer sobomax@FreeBSD.org but still no reply.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -rupN ortp.org/Makefile ortp/Makefile
--- ortp.org/Makefile 2014-01-22 19:00:46.000000000 +0200
+++ ortp/Makefile 2014-02-28 11:39:15.000000000 +0200
@@ -1,8 +1,8 @@
# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
-# $FreeBSD: head/net/ortp/Makefile 340722 2014-01-22 17:00:46Z mat $
+# $FreeBSD$
PORTNAME= ortp
-PORTVERSION= 0.13.0
+PORTVERSION= 0.22.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
@@ -11,16 +11,13 @@ MASTER_SITE_SUBDIR= linphone/ortp/source
MAINTAINER= sobomax@FreeBSD.org
COMMENT= A Real-time Transport Protocol (RTP) stack
+LICENSE= LGPL21
+
USES= pathfix pkgconfig
USE_GNOME= glib20
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc
USE_LDCONFIG= yes
NO_STAGE= yes
-pre-install:
-.if defined(NOPORTDOCS)
- ${RM} -rf ${WRKSRC}/docs/html
-.endif
.include <bsd.port.mk>
diff -rupN ortp.org/distinfo ortp/distinfo
--- ortp.org/distinfo 2014-01-22 17:30:13.000000000 +0200
+++ ortp/distinfo 2014-02-28 11:39:15.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (ortp-0.13.0.tar.gz) = aef36873bd6e9c2c63f30d6d0e3564ac34a680d3930c1e9e4246985a4483371f
-SIZE (ortp-0.13.0.tar.gz) = 495642
+SHA256 (ortp-0.22.0.tar.gz) = 6e37e29b3c3559bac1f2ae0c977f6ceb4d4ce8dc713b691dea8bae57bda92d0b
+SIZE (ortp-0.22.0.tar.gz) = 538024
diff -rupN ortp.org/files/patch-src-avprofile.c ortp/files/patch-src-avprofile.c
--- ortp.org/files/patch-src-avprofile.c 1970-01-01 02:00:00.000000000 +0200
+++ ortp/files/patch-src-avprofile.c 2014-02-28 11:39:15.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/avprofile.c.orig 2014-02-27 18:06:42.000000000 +0200
++++ src/avprofile.c 2014-02-27 18:07:01.000000000 +0200
+@@ -31,7 +31,7 @@ char offset0[4] = {0x00, 0x00, 0x00, 0x0
+ * portability, payload types must be defined with their fields in the right
+ * order.
+ */
+-#if defined(_ISOC99_SOURCE)
++#if defined(_ISOC99_SOURCE) || defined(__clang__)
+ // ISO C99's tagged syntax
+ #define TYPE(val) .type=(val)
+ #define CLOCK_RATE(val) .clock_rate=(val)
diff -rupN ortp.org/files/patch-src-stun.c ortp/files/patch-src-stun.c
--- ortp.org/files/patch-src-stun.c 1970-01-01 02:00:00.000000000 +0200
+++ ortp/files/patch-src-stun.c 2014-02-28 11:39:15.000000000 +0200
@@ -0,0 +1,11 @@
+--- src/stun.c.org 2014-02-28 11:37:17.000000000 +0200
++++ src/stun.c 2014-02-28 11:38:17.000000000 +0200
+@@ -1197,7 +1197,7 @@ stunRand(void)
+ asm("rdtsc" : "=A" (tick));
+ #elif defined (__SUNPRO_CC) && defined( __sparc__ )
+ tick = gethrtime();
+-#elif defined(__linux) || defined(__linux__) || defined(HAVE_DEV_RANDOM)
++#elif defined(__linux) || defined(__linux__) || defined(HAVE_DEV_RANDOM) || defined(__FreeBSD__)
+ {
+ fd_set fdSet;
+ int maxFd=0;
diff -rupN ortp.org/files/patch-src::stun.c ortp/files/patch-src::stun.c
--- ortp.org/files/patch-src::stun.c 2014-01-22 19:40:44.000000000 +0200
+++ ortp/files/patch-src::stun.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,14 +0,0 @@
-
-$FreeBSD: head/net/ortp/files/patch-src::stun.c 340725 2014-01-22 17:40:44Z mat $
-
---- src/stun.c
-+++ src/stun.c
-@@ -768,7 +768,7 @@
- read(fd,&tick,sizeof(tick));
- closesocket(fd);
- }
--#elif defined(__linux)
-+#elif defined(__linux) || defined (__FreeBSD__)
- {
- fd_set fdSet;
- int maxFd=0;
diff -rupN ortp.org/pkg-descr ortp/pkg-descr
--- ortp.org/pkg-descr 2014-01-22 17:44:51.000000000 +0200
+++ ortp/pkg-descr 2014-02-28 11:39:15.000000000 +0200
@@ -21,4 +21,4 @@ Features:
sender report or receiver report + SDES)
* Includes an API to parse incoming RTCP packets.
-WWW: http://www.linphone.org/index.php/v2/code_review/ortp
+WWW: http://www.linphone.org/eng/documentation/dev/ortp.html
diff -rupN ortp.org/pkg-plist ortp/pkg-plist
--- ortp.org/pkg-plist 2014-01-22 17:16:56.000000000 +0200
+++ ortp/pkg-plist 2014-02-28 11:39:15.000000000 +0200
@@ -1,33 +1,22 @@
-include/ortp/event.h
+include/ortp/str_utils.h
+include/ortp/rtpsession.h
+include/ortp/rtp.h
+include/ortp/port.h
+include/ortp/logging.h
include/ortp/ortp.h
+include/ortp/telephonyevents.h
+include/ortp/sessionset.h
include/ortp/payloadtype.h
-include/ortp/port.h
-include/ortp/rtcp.h
-include/ortp/rtp.h
-include/ortp/rtpsession.h
+include/ortp/rtpprofile.h
include/ortp/rtpsignaltable.h
-include/ortp/sessionset.h
-include/ortp/str_utils.h
+include/ortp/rtcp.h
+include/ortp/event.h
include/ortp/stun.h
include/ortp/stun_udp.h
-include/ortp/telephonyevents.h
-lib/libortp.a
+include/ortp/ortp_srtp.h
+include/ortp/zrtp.h
+include/ortp/b64.h
+lib/libortp.so.9
lib/libortp.la
-lib/libortp.so
-lib/libortp.so.5
libdata/pkgconfig/ortp.pc
-%%PORTDOCS%%%%DOCSDIR%%/book1.html
-%%PORTDOCS%%%%DOCSDIR%%/home.png
-%%PORTDOCS%%%%DOCSDIR%%/index.sgml
-%%PORTDOCS%%%%DOCSDIR%%/left.png
-%%PORTDOCS%%%%DOCSDIR%%/ortp-library-management-functions.html
-%%PORTDOCS%%%%DOCSDIR%%/ortp-multiplexing-sessions---in-a-one-thread-design.html
-%%PORTDOCS%%%%DOCSDIR%%/ortp-rtp-payloads-and-profiles.html
-%%PORTDOCS%%%%DOCSDIR%%/ortp-rtpsession-api.html
-%%PORTDOCS%%%%DOCSDIR%%/ortp-telephone-events---rfc2833-.html
-%%PORTDOCS%%%%DOCSDIR%%/ortpapi.html
-%%PORTDOCS%%%%DOCSDIR%%/right.png
-%%PORTDOCS%%%%DOCSDIR%%/style.css
-%%PORTDOCS%%%%DOCSDIR%%/up.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm include/ortp
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402280952.s1S9qTcb001249>