Attachment 230859 Details for Bug 261035 – cleaned up version of previous patch, according to portlint

[patch] cleaned up version of previous patch, according to portlint

0001-audio-re-update-to-2.0.1.patch (text/plain), 11.36 KB, created by Denis Polygalov on 2022-01-10 07:49:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Polygalov

Created: 2022-01-10 07:49:30 UTC

Size: 11.36 KB

patch

obsolete

>From b0aecc69335250de93778cad2ed7ccfca635421c Mon Sep 17 00:00:00 2001
>From: Denis Polygalov <dpolyg@gmail.com>
>Date: Mon, 10 Jan 2022 16:34:43 +0900
>Subject: [PATCH] audio/re: update to 2.0.1 audio/rem: update to 1.0.0
> audio/baresip: update to 1.1.0
>
>---
> audio/baresip/Makefile                      | 16 ++++++++++------
> audio/baresip/Makefile.depends              |  2 +-
> audio/baresip/distinfo                      |  6 +++---
> audio/baresip/files/patch-modules_gst_gst.c | 11 +++++++++++
> audio/re/Makefile                           | 20 +++++++++++++++++---
> audio/re/distinfo                           |  6 +++---
> audio/re/files/patch-Makefile               | 13 +++++++++++++
> audio/re/files/patch-mk_re.mk               |  8 ++++----
> audio/re/pkg-plist                          |  4 ++++
> audio/rem/Makefile                          | 20 +++++++++++++++++---
> audio/rem/distinfo                          |  6 +++---
> audio/rem/files/patch-Makefile              | 11 +++++++++++
> audio/rem/pkg-plist                         |  7 +++++++
> 13 files changed, 104 insertions(+), 26 deletions(-)
> create mode 100644 audio/baresip/files/patch-modules_gst_gst.c
> create mode 100644 audio/re/files/patch-Makefile
> create mode 100644 audio/rem/files/patch-Makefile
>
>diff --git a/audio/baresip/Makefile b/audio/baresip/Makefile
>index 30f8f07fdd83..b269621f4d1f 100644
>--- a/audio/baresip/Makefile
>+++ b/audio/baresip/Makefile
>@@ -1,8 +1,7 @@
> PORTNAME=	baresip
>-PORTVERSION=	0.5.8
>-PORTREVISION=	9
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.1.0
> CATEGORIES=	audio
>-MASTER_SITES=	http://www.creytiv.com/pub/
> 
> MAINTAINER=	crees@FreeBSD.org
> COMMENT=	Small SIP client
>@@ -10,11 +9,13 @@ COMMENT=	Small SIP client
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/docs/COPYING
> 
>-BUILD_DEPENDS=	re>=0.5.8:audio/re \
>-		rem>=0.5.3:audio/rem
>+BUILD_DEPENDS=	re>=2.0.0:audio/re \
>+		rem>=1.0.0:audio/rem
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USES=		gmake pkgconfig ssl
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	baresip
> CFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/ilbc
> MAKE_ARGS=	MOD_AUTODETECT=""
> PLIST_FILES=	bin/baresip
>@@ -66,6 +67,9 @@ $o_DESC=	${o:C,^(.).*,\1,}${o:C,^.,,:tl} module
> # Port calls it GST, standard OPTION is GSTREAMER
> .if ${PORT_OPTIONS:MGSTREAMER}
> PORT_OPTIONS+=	GST
>+USES+=		gettext-runtime
>+USES+=		gnome
>+USE_GNOME+=	glib20
> .endif
> 
> # Port calls it PULSE, standard OPTION is PULSEAUDIO
>@@ -88,7 +92,7 @@ MAKE_ARGS+=	HAVE_SPEEXDSP=yes
> 
> .for o in V4L DTLS_SRTP V4L2 X11
> .  if ${PORT_OPTIONS:M$o}
>-BROKEN=	OPTIONS marked as BROKEN have not been updated to the new Baresip API
>+BROKEN=	port OPTIONS marked as BROKEN have not been updated to the new Baresip API
> .  endif
> .endfor
> 
>diff --git a/audio/baresip/Makefile.depends b/audio/baresip/Makefile.depends
>index 0ef05c78b25f..691455bafb43 100644
>--- a/audio/baresip/Makefile.depends
>+++ b/audio/baresip/Makefile.depends
>@@ -8,7 +8,7 @@ G711_DEPEND=	${LOCALBASE}/include/spandsp/g711.h:comms/spandsp
> G722_DEPEND=	${LOCALBASE}/include/spandsp/g722.h:comms/spandsp
> G722_1_DEPEND=	# nonexistent
> GSM_DEPEND=	${LOCALBASE}/include/gsm.h:audio/gsm
>-GST_DEPEND=	gst-launch:multimedia/gstreamer
>+GST_DEPEND=	gst-launch-1.0:multimedia/gstreamer1
> ILBC_DEPEND=	${LOCALBASE}/include/ilbc/iLBC_define.h:net/ilbc
> L16_DEPEND=	
> OPUS_DEPEND=	${LOCALBASE}/include/opus/opus.h:audio/opus
>diff --git a/audio/baresip/distinfo b/audio/baresip/distinfo
>index 7352ccad00ab..90a3a76cacfc 100644
>--- a/audio/baresip/distinfo
>+++ b/audio/baresip/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524574857
>-SHA256 (baresip-0.5.8.tar.gz) = d9f11da50fd6c9359ab478618b5d3c132474a838fe9f668c249f9d5a07f26662
>-SIZE (baresip-0.5.8.tar.gz) = 584406
>+TIMESTAMP = 1641721018
>+SHA256 (baresip-baresip-v1.1.0_GH0.tar.gz) = f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e
>+SIZE (baresip-baresip-v1.1.0_GH0.tar.gz) = 1105338
>diff --git a/audio/baresip/files/patch-modules_gst_gst.c b/audio/baresip/files/patch-modules_gst_gst.c
>new file mode 100644
>index 000000000000..2234a57a8148
>--- /dev/null
>+++ b/audio/baresip/files/patch-modules_gst_gst.c
>@@ -0,0 +1,11 @@
>+--- modules/gst/gst.c.orig	2021-04-21 09:34:08 UTC
>++++ modules/gst/gst.c
>+@@ -4,7 +4,7 @@
>+  * Copyright (C) 2010 - 2015 Alfred E. Heggestad
>+  */
>+ #define _DEFAULT_SOURCE 1
>+-#define _POSIX_C_SOURCE 199309L
>++#define _POSIX_C_SOURCE 200112L
>+ #include <stdlib.h>
>+ #include <string.h>
>+ #include <time.h>
>diff --git a/audio/re/Makefile b/audio/re/Makefile
>index 1218a8deea69..5e76c1303b48 100644
>--- a/audio/re/Makefile
>+++ b/audio/re/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	re
>-PORTVERSION=	0.5.8
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	2.0.1
> CATEGORIES=	audio devel
>-MASTER_SITES=	http://www.creytiv.com/pub/
> 
> MAINTAINER=	crees@FreeBSD.org
> COMMENT=	Library for real-time comms with async IO support
>@@ -10,16 +10,30 @@ LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/docs/COPYING
> 
> USES=		gmake ssl
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	baresip
> USE_LDCONFIG=	yes
> MAKE_ARGS+=	SYSROOT_ALT=${OPENSSLBASE}
> 
> PORTDATA=	re.mk
>+ABI_MAJOR=	1
>+ABI_AGE=	0
>+ABI_REV=	1
>+PLIST_SUB=	ABI_MAJOR=${ABI_MAJOR}
>+PLIST_SUB+=	ABI_AGE=${ABI_AGE}
>+PLIST_SUB+=	ABI_REV=${ABI_REV}
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${STAGEDIR}${DATADIR}
> 	(cd ${WRKSRC}/include && \
> 	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
> 	${INSTALL_DATA} ${WRKSRC}/mk/${PORTNAME}.mk ${STAGEDIR}${DATADIR}
>-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.[sa]* ${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${ABI_MAJOR}.${ABI_AGE}.${ABI_REV} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
> 
> .include <bsd.port.mk>
>diff --git a/audio/re/distinfo b/audio/re/distinfo
>index af6bda923778..b4d08d210907 100644
>--- a/audio/re/distinfo
>+++ b/audio/re/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524574824
>-SHA256 (re-0.5.8.tar.gz) = 190fd652da167d8d6351b7a26fa0aef2ddab75fe5e8d5de77edf023988440e70
>-SIZE (re-0.5.8.tar.gz) = 301351
>+TIMESTAMP = 1641718132
>+SHA256 (baresip-re-v2.0.1_GH0.tar.gz) = 43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
>+SIZE (baresip-re-v2.0.1_GH0.tar.gz) = 342897
>diff --git a/audio/re/files/patch-Makefile b/audio/re/files/patch-Makefile
>new file mode 100644
>index 000000000000..eec8d93120be
>--- /dev/null
>+++ b/audio/re/files/patch-Makefile
>@@ -0,0 +1,13 @@
>+--- Makefile.orig	2021-04-21 22:05:17 UTC
>++++ Makefile
>+@@ -61,9 +61,7 @@ SHARED_SONAME  := $(SHARED).$(ABI_MAJOR)
>+ SHARED_FILE    := $(SHARED).$(ABI_MAJOR).$(ABI_AGE).$(ABI_REV)
>+ STATIC         := libre.a
>+ 
>+-ifeq ($(OS),linux)
>+-SH_LFLAGS      += -Wl,-soname,$(SHARED_SONAME)
>+-endif
>++SH_LFLAGS      += -Wl,-soname=$(SHARED_SONAME)
>+ 
>+ include $(MODMKS)
>+ 
>diff --git a/audio/re/files/patch-mk_re.mk b/audio/re/files/patch-mk_re.mk
>index 1e77f47ec8f5..c8db692ba1fe 100644
>--- a/audio/re/files/patch-mk_re.mk
>+++ b/audio/re/files/patch-mk_re.mk
>@@ -1,6 +1,6 @@
>---- mk/re.mk.orig	2016-04-15 07:09:59 UTC
>+--- mk/re.mk.orig	2021-04-21 22:05:17 UTC
> +++ mk/re.mk
>-@@ -75,9 +75,6 @@ endif
>+@@ -82,9 +82,6 @@ endif
>  ifeq ($(CC),)
>  	CC := gcc
>  endif
>@@ -8,5 +8,5 @@
> -	CC := gcc
> -endif
>  LD := $(CC)
>- CC_LONGVER := $(shell if $(CC) -v 2>/dev/null; then \
>- 						$(CC) -v 2>&1 ;\
>+ 
>+ CC_LONGVER  := $(shell $(CC) - --version|head -n 1)
>diff --git a/audio/re/pkg-plist b/audio/re/pkg-plist
>index 4769ba8a6d13..734b23751138 100644
>--- a/audio/re/pkg-plist
>+++ b/audio/re/pkg-plist
>@@ -27,6 +27,7 @@ include/re/re_msg.h
> include/re/re_natbd.h
> include/re/re_net.h
> include/re/re_odict.h
>+include/re/re_rtmp.h
> include/re/re_rtp.h
> include/re/re_sa.h
> include/re/re_sdp.h
>@@ -42,6 +43,7 @@ include/re/re_tcp.h
> include/re/re_telev.h
> include/re/re_tls.h
> include/re/re_tmr.h
>+include/re/re_trace.h
> include/re/re_turn.h
> include/re/re_types.h
> include/re/re_udp.h
>@@ -49,3 +51,5 @@ include/re/re_uri.h
> include/re/re_websock.h
> lib/libre.a
> lib/libre.so
>+lib/libre.so.%%ABI_MAJOR%%
>+lib/libre.so.%%ABI_MAJOR%%.%%ABI_AGE%%.%%ABI_REV%%
>diff --git a/audio/rem/Makefile b/audio/rem/Makefile
>index bfd9f4a357f7..6288fc5f9436 100644
>--- a/audio/rem/Makefile
>+++ b/audio/rem/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	rem
>-PORTVERSION=	0.5.3
>+DISTVERSIONPREFIX=	v
>+DISTVERSION=	1.0.0
> CATEGORIES=	audio devel
>-MASTER_SITES=	http://www.creytiv.com/pub/
> 
> MAINTAINER=	crees@FreeBSD.org
> COMMENT=	Library for real-time audio and video processing
>@@ -13,13 +13,27 @@ BUILD_DEPENDS=	${LOCALBASE}/share/re/re.mk:audio/re
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
> USES=		gmake ssl
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	baresip
> USE_LDCONFIG=	yes
> 
>+VER_MAJOR=	1
>+VER_MINOR=	0
>+VER_PATCH=	0
>+PLIST_SUB=	VER_MAJOR=${VER_MAJOR}
>+PLIST_SUB+=	VER_MINOR=${VER_MINOR}
>+PLIST_SUB+=	VER_PATCH=${VER_PATCH}
>+
> do-install:
> 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
> 	(cd ${WRKSRC}/include && \
> 	    ${COPYTREE_SHARE} \*.h ${STAGEDIR}${PREFIX}/include/${PORTNAME})
>-	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib
> 	${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
>+	${INSTALL_LIB} ${WRKSRC}/lib${PORTNAME}.so \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${VER_MAJOR}
>+	${RLN} ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${VER_MAJOR}.${VER_MINOR}.${VER_PATCH} \
>+	       ${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so
> 
> .include <bsd.port.mk>
>diff --git a/audio/rem/distinfo b/audio/rem/distinfo
>index 4d8166d4e5fd..f21a216fa836 100644
>--- a/audio/rem/distinfo
>+++ b/audio/rem/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524574809
>-SHA256 (rem-0.5.3.tar.gz) = 9f98a79947d4709282a5791ac30f0eda03d5d34086f36df74bff4f8aac0e8050
>-SIZE (rem-0.5.3.tar.gz) = 40417
>+TIMESTAMP = 1641720373
>+SHA256 (baresip-rem-v1.0.0_GH0.tar.gz) = bcc91bb521fae183357fb422b00a3981477a22e99d3afe165c4ec50a6bbed9da
>+SIZE (baresip-rem-v1.0.0_GH0.tar.gz) = 47190
>diff --git a/audio/rem/files/patch-Makefile b/audio/rem/files/patch-Makefile
>new file mode 100644
>index 000000000000..f74308799792
>--- /dev/null
>+++ b/audio/rem/files/patch-Makefile
>@@ -0,0 +1,11 @@
>+--- Makefile.orig	2021-04-09 11:05:40 UTC
>++++ Makefile
>+@@ -70,7 +70,7 @@ endif
>+ MODMKS	:= $(patsubst %,src/%/mod.mk,$(MODULES))
>+ SHARED  := librem$(LIB_SUFFIX)
>+ STATIC	:= librem.a
>+-
>++LFLAGS	+= -Wl,-soname=$(SHARED).$(VER_MAJOR)
>+ 
>+ include $(MODMKS)
>+ 
>diff --git a/audio/rem/pkg-plist b/audio/rem/pkg-plist
>index 4c93e0151351..a6ae527ad350 100644
>--- a/audio/rem/pkg-plist
>+++ b/audio/rem/pkg-plist
>@@ -1,20 +1,27 @@
> include/rem/rem.h
>+include/rem/rem_aac.h
> include/rem/rem_au.h
> include/rem/rem_aubuf.h
> include/rem/rem_auconv.h
> include/rem/rem_audio.h
> include/rem/rem_aufile.h
>+include/rem/rem_aulevel.h
> include/rem/rem_aumix.h
> include/rem/rem_auresamp.h
> include/rem/rem_autone.h
>+include/rem/rem_avc.h
> include/rem/rem_dsp.h
> include/rem/rem_dtmf.h
> include/rem/rem_fir.h
>+include/rem/rem_flv.h
> include/rem/rem_g711.h
> include/rem/rem_goertzel.h
>+include/rem/rem_h264.h
> include/rem/rem_vid.h
> include/rem/rem_vidconv.h
> include/rem/rem_video.h
> include/rem/rem_vidmix.h
> lib/librem.a
> lib/librem.so
>+lib/librem.so.%%VER_MAJOR%%
>+lib/librem.so.%%VER_MAJOR%%.%%VER_MINOR%%.%%VER_PATCH%%
>-- 
>2.32.0
>

Actions: View | Diff

Attachments on bug 261035: 230820 | 230859 | 235169 | 235170 | 235171 | 235190 | 237173 | 237832 | 241082