From 57c4ab4c6a37d006ef4c36a19649968f4289df40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Wed, 14 Sep 2022 04:41:29 -0500 Subject: [PATCH 1/3] update to 2.7.0. --- common/shlibs | 2 +- srcpkgs/re/patches/bsdnet.diff | 30 ------------------------------ srcpkgs/re/patches/musl.patch | 28 ---------------------------- srcpkgs/re/template | 15 +++++++++------ 4 files changed, 10 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/re/patches/bsdnet.diff delete mode 100644 srcpkgs/re/patches/musl.patch diff --git a/common/shlibs b/common/shlibs index ec58b8c40619..63170f16303e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3442,7 +3442,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1 libcss_parser_pp.so.0 htmlcxx-0.86_1 libcss_parser.so.0 htmlcxx-0.86_1 libaom.so.3 libaom-3.4.0_1 -libre.so.1 re-2.0.1_1 +libre.so.9 re-2.7.0_1 libtpms.so.0 libtpms-0.9.0_1 libswtpm_libtpms.so.0 libswtpm-0.6.1_1 libspandsp.so.2 spandsp-0.0.6_1 diff --git a/srcpkgs/re/patches/bsdnet.diff b/srcpkgs/re/patches/bsdnet.diff deleted file mode 100644 index 46a4329808e7..000000000000 --- a/srcpkgs/re/patches/bsdnet.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/net/posix/pif.c 2016-12-03 15:21:22.000000000 +0100 -+++ b/src/net/posix/pif.c 2016-12-03 15:21:39.000000000 +0100 -@@ -3,6 +3,7 @@ - * - * Copyright (C) 2010 Creytiv.com - */ -+#define _GNU_SOURCE - #include - #include - #include ---- a/src/net/ifaddrs.c 2016-12-03 15:24:22.000000000 +0100 -+++ b/src/net/ifaddrs.c 2016-12-03 15:24:39.000000000 +0100 -@@ -3,6 +3,7 @@ - * - * Copyright (C) 2010 Creytiv.com - */ -+#define _GNU_SOURCE - #include - #include - #define __USE_MISC 1 /**< Use MISC code */ ---- a/src/tcp/tcp.c 2016-12-03 15:30:06.000000000 +0100 -+++ b/src/tcp/tcp.c 2016-12-03 15:29:46.000000000 +0100 -@@ -3,6 +3,7 @@ - * - * Copyright (C) 2010 Creytiv.com - */ -+#define _GNU_SOURCE - #include - #ifdef HAVE_UNISTD_H - #include diff --git a/srcpkgs/re/patches/musl.patch b/srcpkgs/re/patches/musl.patch deleted file mode 100644 index 3ae7636e4504..000000000000 --- a/srcpkgs/re/patches/musl.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/re_types.h 2018-01-14 21:33:25.561341291 +0100 -+++ b/include/re_types.h 2018-01-14 21:34:45.444384148 +0100 -@@ -37,20 +37,25 @@ - typedef signed long long int int64_t; - - #ifndef __uint32_t_defined -+#ifdef __GLIBC__ - #define __uint32_t_defined - typedef unsigned char uint8_t; - typedef unsigned short int uint16_t; - typedef unsigned int uint32_t; - typedef unsigned long long int uint64_t; - #endif -+#endif - - #endif /* __BIT_TYPES_DEFINED__ */ - - #endif /* __int8_t_defined */ - #ifndef __ssize_t_defined -+#ifndef __DEFINED_ssize_t - typedef long ssize_t; -+#define __DEFINED_ssize_t - #define __ssize_t_defined - #endif -+#endif - - - #ifndef WIN32 diff --git a/srcpkgs/re/template b/srcpkgs/re/template index 726ba0360748..1ed40c721fba 100644 --- a/srcpkgs/re/template +++ b/srcpkgs/re/template @@ -1,6 +1,6 @@ # Template file for 're' pkgname=re -version=2.0.1 +version=2.7.0 revision=1 build_style=gnu-makefile make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS @@ -8,14 +8,16 @@ make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS USE_DTLS_SRTP=yes USE_ZLIB=yes" make_install_args="$make_build_args" make_use_env=1 +hostmakedepends="pkg-config" makedepends="openssl-devel zlib-devel" short_desc="Portable library for real-time communications" maintainer="John " license="BSD-3-Clause" homepage="https://github.com/baresip/re/" -distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz" -checksum=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed -shlib_provides="libre.so" +distfiles="https://github.com/baresip/re/archive/refs/tags/v${version}.tar.gz" +checksum=999f02b4299f9f4bbf637cf610099b656225fef0ce08ce56728978214d448343 + +CFLAGS=-D_GNU_SOURCE case $XBPS_TARGET_MACHINE in i686*) arch="i686";; @@ -34,7 +36,7 @@ pre_build() { } post_install() { - vlicense docs/COPYING + vlicense LICENSE } re-devel_package() { @@ -42,7 +44,8 @@ re-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/share/re/re.mk } From dbc8cd8bd8b146b83677b375b1318fd6ad1fd145 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Wed, 14 Sep 2022 04:42:13 -0500 Subject: [PATCH 2/3] rem: update to 2.7.0. --- common/shlibs | 2 +- srcpkgs/rem/template | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index 63170f16303e..7e779a6a28bd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3455,7 +3455,7 @@ libspa-jack.so libspa-jack-0.3.6_1 libspa-v4l2.so libspa-v4l2-0.3.6_1 libspa-videoconvert.so libspa-videoconvert-0.3.6_1 libspa-vulkan.so libspa-vulkan-0.3.6_1 -librem.so rem-0.5.3_1 +librem.so.3 rem-2.7.0_1 libshp.so.1 shapelib-1.4.1_1 libantlr3c.so libantlr3c-3.4_1 libbzrtp.so.0 bzrtp-1.0.6_1 diff --git a/srcpkgs/rem/template b/srcpkgs/rem/template index ac2b25e44751..e16baaea6161 100644 --- a/srcpkgs/rem/template +++ b/srcpkgs/rem/template @@ -1,6 +1,6 @@ # Template file for 'rem' pkgname=rem -version=1.0.0 +version=2.7.0 revision=1 build_style=gnu-makefile make_build_args="EXTRA_CFLAGS=$CFLAGS EXTRA_LFLAGS=$LDFLAGS RELEASE=1 @@ -9,14 +9,14 @@ make_build_args="EXTRA_CFLAGS=$CFLAGS EXTRA_LFLAGS=$LDFLAGS RELEASE=1 LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib" make_install_args="${make_build_args}" make_use_env=yes +hostmakedepends="pkg-config" makedepends="re-devel" short_desc="Library for real-time audio and video processing" maintainer="John " license="BSD-3-Clause" homepage="https://github.com/baresip/rem" -distfiles="https://github.com/baresip/rem/archive/v${version}.tar.gz" -checksum=bcc91bb521fae183357fb422b00a3981477a22e99d3afe165c4ec50a6bbed9da -shlib_provides="librem.so" +distfiles="https://github.com/baresip/rem/archive/refs/tags/v${version}.tar.gz" +checksum=7f4ad245eb9fb07a82890022d1c721c93ee2e299acb88a7e775ca541f7a09892 case $XBPS_TARGET_MACHINE in i686*) arch="i686";; @@ -46,7 +46,8 @@ rem-devel_package() { depends="${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib/*.a vmove usr/lib/pkgconfig + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" } } From d357a7b977c461475551fc7d0f0cd5ed2d6f980b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= Date: Wed, 14 Sep 2022 04:43:26 -0500 Subject: [PATCH 3/3] baresip: update to 2.7.0. Close: #39266 --- srcpkgs/baresip/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template index 7ef339536933..7efec4c758b4 100644 --- a/srcpkgs/baresip/template +++ b/srcpkgs/baresip/template @@ -1,6 +1,6 @@ # Template file for 'baresip' pkgname=baresip -version=1.1.0 +version=2.7.0 revision=1 build_style=gnu-makefile make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk @@ -24,8 +24,9 @@ short_desc="Modular SIP User-Agent with audio and video support" maintainer="John " license="BSD-3-Clause" homepage="https://github.com/baresip/baresip" -distfiles="https://github.com/baresip/baresip/archive/v${version}.tar.gz" -checksum=f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e +changelog="https://raw.githubusercontent.com/baresip/baresip/main/CHANGELOG.md" +distfiles="https://github.com/baresip/baresip/archive/refs/tags/v${version}.tar.gz" +checksum=6bc3ac1b2a301b6de91a40079a9ec44545a00c57662ca0bdf2518fbb932ff181 # Package build options build_options="gtk video"