Index | Thread | Search

From:
Kirill A. Korinsky <kirill@korins.ky>
Subject:
Re: security/libsrtp: switch to meson
To:
Klemens Nanni <kn@openbsd.org>
Cc:
ports <ports@openbsd.org>
Date:
Tue, 27 May 2025 20:56:56 +0200

Download raw body.

Thread
On Tue, 27 May 2025 18:30:40 +0200,
Klemens Nanni <kn@openbsd.org> wrote:
> 
> No .so version, test or target bits needed as with autoconf.
> 
> Unlike anyone really wants the static library.
> 
> Feedback? OK?
>

Make things clenaer.

/usr/src/lib/check_sym {,$(make show=DESTDIR)}/usr/local/lib/libsrtp2.so.*

doesn't pick any differences.

OK kirill@

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/security/libsrtp/Makefile,v
> diff -u -p -r1.21 Makefile
> --- Makefile	17 Mar 2025 09:49:10 -0000	1.21
> +++ Makefile	27 May 2025 16:28:32 -0000
> @@ -1,26 +1,22 @@
> -SHARED_LIBS +=  srtp2                     6.0
> -
>  COMMENT=	secure RTP library
>  
>  GH_ACCOUNT=	cisco
>  GH_PROJECT=	libsrtp
>  GH_TAGNAME=	v2.7.0
> +REVISION=	0
> +
> +SHARED_LIBS=	srtp2	6.0
>  
>  CATEGORIES=	security telephony
>  
>  # BSD
>  PERMIT_PACKAGE=	Yes
>  
> -CONFIGURE_STYLE= gnu
> -
> -MAKE_FLAGS=	SHAREDLIBVERSION=${LIBsrtp2_VERSION}
>  DEBUG_PACKAGES=	${BUILD_PACKAGES}
>  
> -USE_GMAKE=	Yes
> -ALL_TARGET=	all shared_library
> -TEST_TARGET=	runtest
> +MODULES=	devel/meson
>  
> -post-install:
> -	rm ${PREFIX}/lib/libsrtp2.so
> +CONFIGURE_ARGS=	-Dpcap-tests=disabled \
> +		-Ddoc=disabled
>  
>  .include <bsd.port.mk>
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: patches/patch-Makefile_in
> diff -N patches/patch-Makefile_in
> --- patches/patch-Makefile_in	11 Mar 2022 19:53:32 -0000	1.4
> +++ /dev/null	1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -Index: Makefile.in
> ---- Makefile.in.orig
> -+++ Makefile.in
> -@@ -106,7 +106,7 @@ pkgconfigdir = $(libdir)/pkgconfig
> - pkgconfig_DATA = libsrtp2.pc
> - 
> - SHAREDLIBVERSION = 1
> --ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@)))
> -+ifneq (,$(or $(findstring linux,@host@), $(findstring gnu,@host@), $(findstring openbsd,@host@)))
> - SHAREDLIB_DIR = $(libdir)
> - SHAREDLIB_LDFLAGS = -shared -Wl,-soname,$@
> - SHAREDLIBSUFFIXNOVER = so
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/libsrtp/pkg/PLIST,v
> diff -u -p -r1.6 PLIST
> --- pkg/PLIST	11 Mar 2022 19:53:32 -0000	1.6
> +++ pkg/PLIST	26 May 2025 17:00:45 -0000
> @@ -3,6 +3,5 @@ include/srtp2/auth.h
>  include/srtp2/cipher.h
>  include/srtp2/crypto_types.h
>  include/srtp2/srtp.h
> -@static-lib lib/libsrtp2.a
>  @lib lib/libsrtp2.so.${LIBsrtp2_VERSION}
>  lib/pkgconfig/libsrtp2.pc
> 

-- 
wbr, Kirill