From: index-0 <index-0@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] baresip, rem & re: update to 2.7.0.
Date: Tue, 13 Sep 2022 22:59:07 +0200 [thread overview]
Message-ID: <20220913205907.JnJxN6o-xmZBOw3TNgJE2KIDPXsL78R5lG3OCGgFkN0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39266@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 553 bytes --]
There is an updated pull request by index-0 against master on the void-packages repository
https://github.com/index-0/void-packages master
https://github.com/void-linux/void-packages/pull/39266
baresip, rem & re: update to 2.7.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-musl)
- I built this PR locally for these architectures:
- armv6l
A patch file from https://github.com/void-linux/void-packages/pull/39266.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-39266.patch --]
[-- Type: text/x-diff, Size: 8352 bytes --]
From da493ea8af6a596432b66c944ef9e8fbf3f02fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= <alfredoperez1998@tutanota.com>
Date: Tue, 13 Sep 2022 15:52:00 -0500
Subject: [PATCH 1/4] re: update to 2.7.0.
---
common/shlibs | 2 +-
srcpkgs/re/patches/bsdnet.diff | 24 ++++++++++++------------
srcpkgs/re/patches/musl.patch | 28 ----------------------------
srcpkgs/re/template | 9 +++++----
4 files changed, 18 insertions(+), 45 deletions(-)
delete mode 100644 srcpkgs/re/patches/musl.patch
diff --git a/common/shlibs b/common/shlibs
index ae39d4551d59..6ae7509a8342 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
index 46a4329808e7..3039bc42decc 100644
--- a/srcpkgs/re/patches/bsdnet.diff
+++ b/srcpkgs/re/patches/bsdnet.diff
@@ -1,29 +1,29 @@
---- 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
+--- a/src/net/ifaddrs.c
++++ b/src/net/ifaddrs.c
@@ -3,6 +3,7 @@
*
* Copyright (C) 2010 Creytiv.com
*/
+#define _GNU_SOURCE
- #include <string.h>
#include <unistd.h>
- #include <sys/ioctl.h>
---- 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
+ #include <sys/socket.h>
+ #define __USE_MISC 1 /**< Use MISC code */
+--- a/src/net/posix/pif.c
++++ b/src/net/posix/pif.c
@@ -3,6 +3,7 @@
*
* Copyright (C) 2010 Creytiv.com
*/
+#define _GNU_SOURCE
+ #include <string.h>
#include <unistd.h>
- #include <sys/socket.h>
- #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 @@
- *
+ #include <sys/ioctl.h>
+--- a/src/tcp/tcp.c
++++ b/src/tcp/tcp.c
+@@ -4,6 +4,7 @@
* Copyright (C) 2010 Creytiv.com
*/
+
+#define _GNU_SOURCE
#include <stdlib.h>
#ifdef HAVE_UNISTD_H
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..8ac20f2bc086 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,13 +8,14 @@ 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 <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://github.com/baresip/re/"
-distfiles="https://github.com/baresip/re/archive/v${version}.tar.gz"
-checksum=43aa439b96aff75fe5768b9f9d49dea97042e42e7647df47b345465763e2f7ed
+distfiles="https://github.com/baresip/re/archive/refs/tags/v${version}.tar.gz"
+checksum=999f02b4299f9f4bbf637cf610099b656225fef0ce08ce56728978214d448343
shlib_provides="libre.so"
case $XBPS_TARGET_MACHINE in
@@ -34,7 +35,7 @@ pre_build() {
}
post_install() {
- vlicense docs/COPYING
+ vlicense LICENSE
}
re-devel_package() {
From 660f81f81f495636c0eb1324a8b0b07ce207c451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= <alfredoperez1998@tutanota.com>
Date: Tue, 13 Sep 2022 15:53:33 -0500
Subject: [PATCH 2/4] rem: update to 2.7.0.
---
common/shlibs | 2 +-
srcpkgs/rem/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 6ae7509a8342..245d9ad9c708 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..351b5417fc62 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
@@ -14,8 +14,8 @@ short_desc="Library for real-time audio and video processing"
maintainer="John <me@johnnynator.dev>"
license="BSD-3-Clause"
homepage="https://github.com/baresip/rem"
-distfiles="https://github.com/baresip/rem/archive/v${version}.tar.gz"
-checksum=bcc91bb521fae183357fb422b00a3981477a22e99d3afe165c4ec50a6bbed9da
+distfiles="https://github.com/baresip/rem/archive/refs/tags/v${version}.tar.gz"
+checksum=7f4ad245eb9fb07a82890022d1c721c93ee2e299acb88a7e775ca541f7a09892
shlib_provides="librem.so"
case $XBPS_TARGET_MACHINE in
From daa1da4db031263bdfbf6e95694ae57e5c4accf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= <alfredoperez1998@tutanota.com>
Date: Tue, 13 Sep 2022 15:55:54 -0500
Subject: [PATCH 3/4] baresip: update to 2.7.0.
---
srcpkgs/baresip/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/baresip/template b/srcpkgs/baresip/template
index 7ef339536933..6699b9f7c370 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,8 @@ 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"
-distfiles="https://github.com/baresip/baresip/archive/v${version}.tar.gz"
-checksum=f9230b27c4a62f31223847bc485c51f3d960f8a09f36998dedb73358e1784b4e
+distfiles="https://github.com/baresip/baresip/archive/refs/tags/v${version}.tar.gz"
+checksum=6bc3ac1b2a301b6de91a40079a9ec44545a00c57662ca0bdf2518fbb932ff181
# Package build options
build_options="gtk video"
From e46ef73e737395de912f0a7521d74b4e7e296bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alfredo=20P=C3=A9rez?= <alfredoperez1998@tutanota.com>
Date: Tue, 13 Sep 2022 15:58:41 -0500
Subject: [PATCH 4/4] New package: baresip-devel
---
srcpkgs/baresip-devel | 1 +
srcpkgs/baresip/template | 8 ++++++++
2 files changed, 9 insertions(+)
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 6699b9f7c370..274c0d0ad7a4 100644
--- a/srcpkgs/baresip/template
+++ b/srcpkgs/baresip/template
@@ -51,3 +51,11 @@ pre_build() {
post_install() {
vlicense docs/COPYING
}
+
+baresip-devel_package() {
+ short_desc+=" - development files"
+ depends="${sourcepkg}>=${version}_${revision}"
+ pkg_install() {
+ vinstall include/baresip.h 644 usr/include/
+ }
+}
next prev parent reply other threads:[~2022-09-13 20:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-13 19:43 [PR PATCH] " index-0
2022-09-13 19:46 ` classabbyamp
2022-09-13 19:58 ` index-0
2022-09-13 20:30 ` classabbyamp
2022-09-13 20:59 ` index-0 [this message]
2022-09-13 21:03 ` index-0
2022-09-13 22:40 ` [PR REVIEW] " classabbyamp
2022-09-13 22:40 ` classabbyamp
2022-09-14 4:02 ` sgn
2022-09-14 4:04 ` sgn
2022-09-14 4:05 ` sgn
2022-09-14 4:06 ` sgn
2022-09-14 9:44 ` [PR PATCH] [Updated] " index-0
2022-09-15 22:29 ` index-0
2022-09-16 7:14 ` [PR REVIEW] " sgn
2022-09-16 7:29 ` [PR PATCH] [Updated] " sgn
2022-09-16 7:57 ` sgn
2022-09-18 3:05 ` [PR PATCH] [Closed]: " sgn
2022-09-18 4:04 ` sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220913205907.JnJxN6o-xmZBOw3TNgJE2KIDPXsL78R5lG3OCGgFkN0@z \
--to=index-0@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).