diff --git a/common/shlibs b/common/shlibs index 6f3411be67..910ee70ba7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3527,7 +3527,7 @@ librem.so rem-0.5.3_1 libshp.so.1 shapelib-1.4.1_1 libantlr3c.so libantlr3c-3.4_1 libbzrtp.so.0 bzrtp-1.0.6_1 -libbellesip.so.0 belle-sip-1.5.0_1 +libbellesip.so.1 belle-sip-4.4.0_1 libKF5EventViews.so.5 eventviews-18.04.3_1 libKF5IncidenceEditor.so.5 incidenceeditor-18.04.3_1 libmediastreamer_base.so.10 mediastreamer-2.16.1_1 diff --git a/srcpkgs/belle-sip/patches/va-args.patch b/srcpkgs/belle-sip/patches/va-args.patch deleted file mode 100644 index a49f7acf29..0000000000 --- a/srcpkgs/belle-sip/patches/va-args.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dns.h 2019-12-05 13:30:14.183293978 +0100 -+++ - 2019-12-05 13:33:17.144413838 +0100 -@@ -158,7 +158,7 @@ - - #define dns_quietinit(...) \ - DNS_PRAGMA_PUSH DNS_PRAGMA_QUIET __VA_ARGS__ DNS_PRAGMA_POP --#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4 -+#elif ((__GNUC__ == 4 && __GNUC_MINOR__ >= 6) || __GNUC__ > 4) && __GNUC__ < 9 - #define DNS_PRAGMA_PUSH _Pragma("GCC diagnostic push") - #define DNS_PRAGMA_QUIET _Pragma("GCC diagnostic ignored \"-Woverride-init\"") - #define DNS_PRAGMA_POP _Pragma("GCC diagnostic pop") diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template index 5dc3ef130c..6351feba63 100644 --- a/srcpkgs/belle-sip/template +++ b/srcpkgs/belle-sip/template @@ -1,18 +1,18 @@ # Template file for 'belle-sip' pkgname=belle-sip -version=1.6.3 -revision=2 -wrksrc="${pkgname}-${version}-0" +version=4.4.0 +revision=1 build_style=cmake -configure_args="-DANTLR3_JAR_PATH=/usr/share/java/antlr3.jar -DENABLE_STRICT=OFF" +configure_args="-DANTLR3_JAR_PATH=/usr/share/java/antlr3.jar -DENABLE_STRICT=OFF + -DENABLE_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON -DCMAKE_MODULE_PATH=/usr/lib/cmake" hostmakedepends="antlr3-bin" makedepends="mbedtls-devel libantlr3c bctoolbox-devel zlib-devel" short_desc="SIP (RFC3261) implementation written in C" maintainer="John " license="GPL-2.0-or-later" homepage="https://www.linphone.org" -distfiles="https://www.linphone.org/releases/sources/belle-sip/belle-sip-${version}.tar.gz" -checksum=3f3807078b177e50a5ed97aaf8d7f6e77532df3205153e1b2957f557df9ba568 +distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz" +checksum=4f9218b0bbf55c2f68d70a0e83779e591ef9fe97f1caf7550768ea192ee34cee belle-sip-devel_package() { depends="${sourcepkg}>=${version}_${revision}" @@ -22,6 +22,6 @@ belle-sip-devel_package() { vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/lib/pkgconfig - vmove usr/share/BelleSIP/cmake + vmove usr/lib/cmake } }