* [PR PATCH] baresip: update to 2.10.0
@ 2023-01-06 16:02 Johnnynator
2023-01-06 18:04 ` [PR PATCH] [Merged]: " Johnnynator
0 siblings, 1 reply; 2+ messages in thread
From: Johnnynator @ 2023-01-06 16:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1320 bytes --]
There is a new pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages baresip
https://github.com/void-linux/void-packages/pull/41494
baresip: update to 2.10.0
- re: update to 2.10.0.
- rem: update to 2.10.0.
- baresip: update to 2.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/41494.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-baresip-41494.patch --]
[-- Type: text/x-diff, Size: 8453 bytes --]
From bfd3c5f04206abacc83e6ba1a32722d69e64feea Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Jan 2023 16:12:32 +0100
Subject: [PATCH 1/3] re: update to 2.10.0.
---
common/shlibs | 2 +-
srcpkgs/re/template | 33 ++++++---------------------------
2 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index f0917a476aa5..8163f8eeb736 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3464,7 +3464,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.9 re-2.7.0_1
+libre.so.12 re-2.10.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/template b/srcpkgs/re/template
index 1ed40c721fba..008ccc87d656 100644
--- a/srcpkgs/re/template
+++ b/srcpkgs/re/template
@@ -1,52 +1,31 @@
# Template file for 're'
pkgname=re
-version=2.7.0
+version=2.10.0
revision=1
-build_style=gnu-makefile
-make_build_args="RELEASE=1 EXTRA_CFLAGS=$CFLAGS
- EXTRA_LFLAGS=$LDFLAGS USE_OPENSSL=yes USE_DTLS=yes
- USE_DTLS_SRTP=yes USE_ZLIB=yes"
-make_install_args="$make_build_args"
-make_use_env=1
-hostmakedepends="pkg-config"
+build_style=cmake
+configure_args="-DUSE_OPENSSL=yes"
makedepends="openssl-devel zlib-devel"
short_desc="Portable library for real-time communications"
maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://github.com/baresip/re/"
distfiles="https://github.com/baresip/re/archive/refs/tags/v${version}.tar.gz"
-checksum=999f02b4299f9f4bbf637cf610099b656225fef0ce08ce56728978214d448343
+checksum=4d2b6f8fc73efdbcb5a7b2a98d0b46ac6eb28ede5ae90f9596b49663eec623a9
CFLAGS=-D_GNU_SOURCE
-case $XBPS_TARGET_MACHINE in
- i686*) arch="i686";;
- x86_64*) arch="x86_64";;
- armv6*) arch="arm6";;
- aarch64*) arch="arm64";;
- arm*) arch="arm";;
- mips*) arch="mips";;
- ppc64*) arch="ppc64";;
-esac
-make_build_args+=" ARCH=$arch"
-make_install_args+=" ARCH=$arch"
-
-pre_build() {
- make ${make_build_args} info
-}
-
post_install() {
vlicense LICENSE
}
re-devel_package() {
short_desc+=" - development files"
- depends="${sourcepkg}>=${version}_${revision}"
+ depends="${sourcepkg}>=${version}_${revision} openssl-devel zlib-devel"
pkg_install() {
vmove usr/include
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
- vmove usr/share/re/re.mk
+ vmove usr/lib/cmake
}
}
From dc6a72bfb56bbe98e4ea4b5ca62a12553ccd0957 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Jan 2023 16:20:53 +0100
Subject: [PATCH 2/3] rem: update to 2.10.0.
---
common/shlibs | 2 +-
srcpkgs/rem/template | 33 ++++-----------------------------
2 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 8163f8eeb736..a9146b6be1e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3477,7 +3477,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.3 rem-2.7.0_1
+librem.so.4 rem-2.10.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 e16baaea6161..51b72e52a837 100644
--- a/srcpkgs/rem/template
+++ b/srcpkgs/rem/template
@@ -1,14 +1,8 @@
# Template file for 'rem'
pkgname=rem
-version=2.7.0
+version=2.10.0
revision=1
-build_style=gnu-makefile
-make_build_args="EXTRA_CFLAGS=$CFLAGS EXTRA_LFLAGS=$LDFLAGS RELEASE=1
- LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk \
- SYSROOT=${XBPS_CROSS_BASE}/usr LIBREM_PATH=${wrksrc} \
- 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
+build_style=cmake
hostmakedepends="pkg-config"
makedepends="re-devel"
short_desc="Library for real-time audio and video processing"
@@ -16,29 +10,10 @@ maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://github.com/baresip/rem"
distfiles="https://github.com/baresip/rem/archive/refs/tags/v${version}.tar.gz"
-checksum=7f4ad245eb9fb07a82890022d1c721c93ee2e299acb88a7e775ca541f7a09892
-
-case $XBPS_TARGET_MACHINE in
- i686*) arch="i686";;
- x86_64*) arch="x86_64";;
- armv6*) arch="arm6";;
- aarch64*) arch="arm64";;
- arm*) arch="arm";;
- mips*) arch="mips";;
-esac
-
-case "$XBPS_TARGET_MACHINE" in
- armv6*) make_build_args+=" HAVE_ARMV6=1 ARCH=$arch";;
- aarch64* | armv7* ) make_build_args+=" HAVE_NEON= ARCH=$arch";;
- *) make_build_args+=" ARCH=$arch"
-esac
-
-pre_build() {
- make ${make_build_args} info
-}
+checksum=82d417f9ece6cafdbfb1e342cf1c7cf4390136578dd7c77b4c7995cbbf4792a0
post_install() {
- vlicense docs/COPYING
+ vlicense LICENSE
}
rem-devel_package() {
From ee9b9ce98a8817e780bd9b2e8ac3a49746d0155b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Fri, 6 Jan 2023 16:32:30 +0100
Subject: [PATCH 3/3] baresip: update to 2.10.0.
---
srcpkgs/baresip-devel | 1 +
srcpkgs/baresip/template | 64 +++++++++++-----------------------------
2 files changed, 19 insertions(+), 46 deletions(-)
create mode 120000 srcpkgs/baresip-devel
diff --git a/srcpkgs/baresip-devel b/srcpkgs/baresip-devel
new file mode 120000
index 000000000000..164155010887
--- /dev/null
+++ b/srcpkgs/baresip-devel
@@ -0,0 +1 @@
+baresip
\ No newline at end of file
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 5a0c9b5002aa..f1bd1817048b 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -1,61 +1,33 @@
# Template file for 'baresip'
pkgname=baresip
-version=2.7.0
-revision=2
-build_style=gnu-makefile
-make_build_args="LIBRE_MK=${XBPS_CROSS_BASE}/usr/share/re/re.mk
- DESTDIR=${DESTDIR} V=1 LIBRE_INC=${XBPS_CROSS_BASE}/usr/include/re
- SYSROOT=${XBPS_CROSS_BASE}/usr SYSROOT_LOCAL=${XBPS_CROSS_BASE}/usr
- LIBRE_SO=${XBPS_CROSS_BASE}/usr/lib LIBDIR=/usr/lib${XBPS_TARGET_WORDSIZE}
- USE_ALSA=y USE_GST=y USE_GST_VIDEO=y USE_OSS=y USE_SDL=y"
-make_install_args="$make_build_args"
-make_use_env=1
+version=2.10.0
+revision=1
+build_style=cmake
hostmakedepends="pkg-config glib-devel"
makedepends="libgsm-devel libpng-devel openssl-devel libsndfile-devel
opus-devel re-devel rem-devel spandsp-devel speex-devel speexdsp-devel
- tiff-devel twolame-devel sndio-devel"
+ tiff-devel twolame-devel cairo-devel gst-plugins-base1-devel jack-devel
+ gstreamer1-devel gtk+3-devel mpg123-devel SDL2-devel ffmpeg-devel libvpx-devel
+ libX11-devel v4l-utils-devel x265-devel libXext-devel webrtc-audio-processing-devel"
+# sndio-devel Currently not hooked up in their cmake build system
short_desc="Modular SIP User-Agent with audio and video support"
maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://github.com/baresip/baresip"
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
+checksum=1bbeda0cb6c0f0480fb67f4fcc389df42384da7da909d9d950538fbbbfb92495
-# Package build options
-build_options="gtk3 video"
-build_options_default="gtk3 video"
-desc_option_video="Enable support for video calling"
-
-if [ "$build_option_video" ]; then
- make_build_args+=" USE_SNAPSHOT=y USE_AVCODEC=y USE_AVFORMAT=y
- USE_SDL2=y USE_V4L2=y USE_VIDEO=y USE_VPX=y USE_X11=y"
- makedepends+=" SDL2-devel ffmpeg-devel libvpx-devel libX11-devel
- v4l-utils-devel x265-devel libXext-devel"
-fi
-
-if [ "$build_option_gtk3" ]; then
- make_build_args+=" USE_GST1=y USE_GST_VIDEO1=y USE_GTK=y"
- makedepends+=" cairo-devel gst-plugins-base1-devel gstreamer1-devel
- gtk+3-devel mpg123-devel"
-fi
-
-case $XBPS_TARGET_MACHINE in
- i686*) arch="i686";;
- x86_64*) arch="x86_64";;
- armv6*) arch="arm6";;
- aarch64*) arch="arm64";;
- arm*) arch="arm";;
- mips*) arch="mips";;
-esac
-
-make_build_args+=" ARCH=$arch"
-make_install_args+=" ARCH=$arch"
-
-pre_build() {
- make ${make_build_args} info
+post_install() {
+ vlicense LICENSE
}
-post_install() {
- vlicense docs/COPYING
+baresip-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.so"
+ vmove usr/lib/pkgconfig
+ }
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: baresip: update to 2.10.0
2023-01-06 16:02 [PR PATCH] baresip: update to 2.10.0 Johnnynator
@ 2023-01-06 18:04 ` Johnnynator
0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2023-01-06 18:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1161 bytes --]
There's a merged pull request on the void-packages repository
baresip: update to 2.10.0
https://github.com/void-linux/void-packages/pull/41494
Description:
- re: update to 2.10.0.
- rem: update to 2.10.0.
- baresip: update to 2.10.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-06 18:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-06 16:02 [PR PATCH] baresip: update to 2.10.0 Johnnynator
2023-01-06 18:04 ` [PR PATCH] [Merged]: " Johnnynator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).