diff --git a/common/shlibs b/common/shlibs index ec58b8c4061..63170f16303 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 46a4329808e..00000000000 --- 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 3ae7636e450..00000000000 --- 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 726ba036074..1ed40c721fb 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 }