* [PR PATCH] utox: update to 0.18.0.
@ 2020-11-22 15:17 avoidr
2020-12-07 12:04 ` [PR PATCH] [Updated] " avoidr
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: avoidr @ 2020-11-22 15:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 303 bytes --]
There is a new pull request by avoidr against master on the void-packages repository
https://github.com/avoidr/void-packages utox
https://github.com/void-linux/void-packages/pull/26605
utox: update to 0.18.0.
A patch file from https://github.com/void-linux/void-packages/pull/26605.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-utox-26605.patch --]
[-- Type: text/x-diff, Size: 6264 bytes --]
From 9c6a7152ae4146efb5bc59c8168c0afef2806430 Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Sun, 22 Nov 2020 16:14:42 +0100
Subject: [PATCH] utox: update to 0.18.0.
---
...en-changing-toxcore-related-settings.patch | 149 ------------------
srcpkgs/utox/template | 4 +-
2 files changed, 2 insertions(+), 151 deletions(-)
delete mode 100644 srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch
diff --git a/srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch b/srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch
deleted file mode 100644
index 833b6e29dc3..00000000000
--- a/srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From c034ec9fffe79d46503dbb2686fec113bea2d08b Mon Sep 17 00:00:00 2001
-From: avoidr <avoidr@posteo.de>
-Date: Sat, 11 Jul 2020 05:18:22 +0200
-Subject: [PATCH] Fix crash when changing toxcore-related settings
-
-uTox killed toxcore without killing toxav first, which led to a crash.
-Resources should be deallocated in reverse order of their allocation.
-
-utox_av_ctrl_thread was started only once, when uTox was started, so
-when toxav was killed properly, the thread was never re-created for the
-next use of Tox. utox_av_ctrl_thread is now created whenever a new
-toxcore starts.
-
-Then, the Filter_Audio pointer had to be set to NULL after it's free'd,
-otherwise it wouldn't get re-initialised, and an invalid pointer would
-be passed to kill_filter_audio(), causing a crash.
-
-Finally, replaced magic number 0 with TOX_KILL.
-Deleted a redundant `toxav_thread_msg = false`.
----
- src/av/audio.c | 1 +
- src/av/utox_av.c | 7 ++-----
- src/main.c | 3 ---
- src/tox.c | 20 +++++++++++---------
- 4 files changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/src/av/audio.c b/src/av/audio.c
-index 324ceb22..d4384d8b 100644
---- a/src/av/audio.c
-+++ b/src/av/audio.c
-@@ -909,6 +909,7 @@ void utox_audio_thread(void *args) {
- }
-
- utox_filter_audio_kill(f_a);
-+ f_a = NULL;
-
- // missing some cleanup ?
- alDeleteSources(1, &ringtone);
-diff --git a/src/av/utox_av.c b/src/av/utox_av.c
-index 90e04b36..d7adb9ce 100644
---- a/src/av/utox_av.c
-+++ b/src/av/utox_av.c
-@@ -275,7 +275,6 @@ void utox_av_ctrl_thread(void *UNUSED(args)) {
- }
- }
- }
--
- toxav_thread_msg = false;
-
- if (av) {
-@@ -286,19 +285,17 @@ void utox_av_ctrl_thread(void *UNUSED(args)) {
- }
- }
-
--
- postmessage_audio(UTOXAUDIO_KILL, 0, 0, NULL);
- postmessage_video(UTOXVIDEO_KILL, 0, 0, NULL);
--
- // Wait for all a/v threads to return 0
- while (utox_audio_thread_init || utox_video_thread_init) {
- yieldcpu(1);
- }
-
-- toxav_thread_msg = false;
-+ toxav_kill(av);
-+
- utox_av_ctrl_init = false;
-
-- toxav_kill(av);
- LOG_NOTE("UTOXAV", "Clean thread exit!");
- return;
- }
-diff --git a/src/main.c b/src/main.c
-index a3072edf..39218062 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -269,9 +269,6 @@ void utox_init(void) {
- if (settings.curr_version != settings.last_version) {
- settings.show_splash = true;
- }
--
-- // We likely want to start this on every system.
-- thread(utox_av_ctrl_thread, NULL);
- }
-
- void utox_raze(void) {
-diff --git a/src/tox.c b/src/tox.c
-index 8d93ee19..e9fe3ae8 100644
---- a/src/tox.c
-+++ b/src/tox.c
-@@ -234,10 +234,8 @@ void tox_settingschanged(void) {
- dropdown_list_clear(&dropdown_audio_out);
- dropdown_list_clear(&dropdown_video);
-
-- // send the reconfig message!
-- postmessage_toxcore(0, 1, 0, NULL);
--
- LOG_NOTE("Toxcore", "Restarting Toxcore");
-+ postmessage_toxcore(TOX_KILL, 1, 0, NULL); // send the reconfig message!
- while (!tox_thread_init) {
- yieldcpu(1);
- }
-@@ -476,8 +474,8 @@ void toxcore_thread(void *UNUSED(args)) {
- // avoid trying the creation of thousands of tox instances before user changes the settings
- if (tox_thread_msg) {
- TOX_MSG *msg = &tox_msg;
-- // If msg->msg is 0, reconfig
-- if (!msg->msg) {
-+
-+ if (msg->msg == TOX_KILL) {
- reconfig = (bool) msg->param1;
- tox_thread_init = UTOX_TOX_THREAD_INIT_NONE;
- }
-@@ -513,6 +511,7 @@ void toxcore_thread(void *UNUSED(args)) {
- postmessage_utox(UPDATE_TRAY, 0, 0, NULL);
- postmessage_utox(PROFILE_DID_LOAD, 0, 0, NULL);
-
-+ thread(utox_av_ctrl_thread, NULL);
- postmessage_utoxav(UTOXAV_NEW_TOX_INSTANCE, 0, 0, av);
- }
-
-@@ -548,9 +547,9 @@ void toxcore_thread(void *UNUSED(args)) {
- // If there's a message, load it, and send to the tox message thread
- if (tox_thread_msg) {
- TOX_MSG *msg = &tox_msg;
-- // If msg->msg is 0, reconfig if needed and break from tox_do
-- if (!msg->msg) {
-- reconfig = msg->param1;
-+
-+ if (msg->msg == TOX_KILL) {
-+ reconfig = msg->param1; // reconfig if needed
- tox_thread_msg = 0;
- tox_thread_init = UTOX_TOX_THREAD_INIT_NONE;
- break;
-@@ -574,7 +573,10 @@ void toxcore_thread(void *UNUSED(args)) {
- write_save(tox);
- edit_setstr(&edit_profile_password, (char *)"", 0);
-
-- // Stop toxcore.
-+ postmessage_utoxav(UTOXAV_KILL, 0, 0, NULL);
-+ while (utox_av_ctrl_init) {
-+ yieldcpu(1);
-+ }
- LOG_TRACE("Toxcore", "tox thread ending");
- tox_kill(tox);
- }
---
-2.26.2
-
diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template
index 20f7f8c209d..df31ce2297a 100644
--- a/srcpkgs/utox/template
+++ b/srcpkgs/utox/template
@@ -1,7 +1,7 @@
# Template file for 'utox'
pkgname=utox
-version=0.17.2
-revision=2
+version=0.18.0
+revision=1
wrksrc=uTox
build_style=cmake
configure_args="-DENABLE_ASAN=OFF"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] utox: update to 0.18.0.
2020-11-22 15:17 [PR PATCH] utox: update to 0.18.0 avoidr
@ 2020-12-07 12:04 ` avoidr
2020-12-07 12:57 ` avoidr
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: avoidr @ 2020-12-07 12:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 308 bytes --]
There is an updated pull request by avoidr against master on the void-packages repository
https://github.com/avoidr/void-packages utox
https://github.com/void-linux/void-packages/pull/26605
utox: update to 0.18.0.
A patch file from https://github.com/void-linux/void-packages/pull/26605.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-utox-26605.patch --]
[-- Type: text/x-diff, Size: 6662 bytes --]
From 63acc497a752759fc21f68b5468b249663645347 Mon Sep 17 00:00:00 2001
From: Robert Karszniewicz <avoidr@posteo.de>
Date: Sun, 22 Nov 2020 16:14:42 +0100
Subject: [PATCH] utox: update to 0.18.0.
---
...en-changing-toxcore-related-settings.patch | 149 ------------------
srcpkgs/utox/template | 6 +-
2 files changed, 3 insertions(+), 152 deletions(-)
delete mode 100644 srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch
diff --git a/srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch b/srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch
deleted file mode 100644
index 833b6e29dc3..00000000000
--- a/srcpkgs/utox/patches/0001-Fix-crash-when-changing-toxcore-related-settings.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From c034ec9fffe79d46503dbb2686fec113bea2d08b Mon Sep 17 00:00:00 2001
-From: avoidr <avoidr@posteo.de>
-Date: Sat, 11 Jul 2020 05:18:22 +0200
-Subject: [PATCH] Fix crash when changing toxcore-related settings
-
-uTox killed toxcore without killing toxav first, which led to a crash.
-Resources should be deallocated in reverse order of their allocation.
-
-utox_av_ctrl_thread was started only once, when uTox was started, so
-when toxav was killed properly, the thread was never re-created for the
-next use of Tox. utox_av_ctrl_thread is now created whenever a new
-toxcore starts.
-
-Then, the Filter_Audio pointer had to be set to NULL after it's free'd,
-otherwise it wouldn't get re-initialised, and an invalid pointer would
-be passed to kill_filter_audio(), causing a crash.
-
-Finally, replaced magic number 0 with TOX_KILL.
-Deleted a redundant `toxav_thread_msg = false`.
----
- src/av/audio.c | 1 +
- src/av/utox_av.c | 7 ++-----
- src/main.c | 3 ---
- src/tox.c | 20 +++++++++++---------
- 4 files changed, 14 insertions(+), 17 deletions(-)
-
-diff --git a/src/av/audio.c b/src/av/audio.c
-index 324ceb22..d4384d8b 100644
---- a/src/av/audio.c
-+++ b/src/av/audio.c
-@@ -909,6 +909,7 @@ void utox_audio_thread(void *args) {
- }
-
- utox_filter_audio_kill(f_a);
-+ f_a = NULL;
-
- // missing some cleanup ?
- alDeleteSources(1, &ringtone);
-diff --git a/src/av/utox_av.c b/src/av/utox_av.c
-index 90e04b36..d7adb9ce 100644
---- a/src/av/utox_av.c
-+++ b/src/av/utox_av.c
-@@ -275,7 +275,6 @@ void utox_av_ctrl_thread(void *UNUSED(args)) {
- }
- }
- }
--
- toxav_thread_msg = false;
-
- if (av) {
-@@ -286,19 +285,17 @@ void utox_av_ctrl_thread(void *UNUSED(args)) {
- }
- }
-
--
- postmessage_audio(UTOXAUDIO_KILL, 0, 0, NULL);
- postmessage_video(UTOXVIDEO_KILL, 0, 0, NULL);
--
- // Wait for all a/v threads to return 0
- while (utox_audio_thread_init || utox_video_thread_init) {
- yieldcpu(1);
- }
-
-- toxav_thread_msg = false;
-+ toxav_kill(av);
-+
- utox_av_ctrl_init = false;
-
-- toxav_kill(av);
- LOG_NOTE("UTOXAV", "Clean thread exit!");
- return;
- }
-diff --git a/src/main.c b/src/main.c
-index a3072edf..39218062 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -269,9 +269,6 @@ void utox_init(void) {
- if (settings.curr_version != settings.last_version) {
- settings.show_splash = true;
- }
--
-- // We likely want to start this on every system.
-- thread(utox_av_ctrl_thread, NULL);
- }
-
- void utox_raze(void) {
-diff --git a/src/tox.c b/src/tox.c
-index 8d93ee19..e9fe3ae8 100644
---- a/src/tox.c
-+++ b/src/tox.c
-@@ -234,10 +234,8 @@ void tox_settingschanged(void) {
- dropdown_list_clear(&dropdown_audio_out);
- dropdown_list_clear(&dropdown_video);
-
-- // send the reconfig message!
-- postmessage_toxcore(0, 1, 0, NULL);
--
- LOG_NOTE("Toxcore", "Restarting Toxcore");
-+ postmessage_toxcore(TOX_KILL, 1, 0, NULL); // send the reconfig message!
- while (!tox_thread_init) {
- yieldcpu(1);
- }
-@@ -476,8 +474,8 @@ void toxcore_thread(void *UNUSED(args)) {
- // avoid trying the creation of thousands of tox instances before user changes the settings
- if (tox_thread_msg) {
- TOX_MSG *msg = &tox_msg;
-- // If msg->msg is 0, reconfig
-- if (!msg->msg) {
-+
-+ if (msg->msg == TOX_KILL) {
- reconfig = (bool) msg->param1;
- tox_thread_init = UTOX_TOX_THREAD_INIT_NONE;
- }
-@@ -513,6 +511,7 @@ void toxcore_thread(void *UNUSED(args)) {
- postmessage_utox(UPDATE_TRAY, 0, 0, NULL);
- postmessage_utox(PROFILE_DID_LOAD, 0, 0, NULL);
-
-+ thread(utox_av_ctrl_thread, NULL);
- postmessage_utoxav(UTOXAV_NEW_TOX_INSTANCE, 0, 0, av);
- }
-
-@@ -548,9 +547,9 @@ void toxcore_thread(void *UNUSED(args)) {
- // If there's a message, load it, and send to the tox message thread
- if (tox_thread_msg) {
- TOX_MSG *msg = &tox_msg;
-- // If msg->msg is 0, reconfig if needed and break from tox_do
-- if (!msg->msg) {
-- reconfig = msg->param1;
-+
-+ if (msg->msg == TOX_KILL) {
-+ reconfig = msg->param1; // reconfig if needed
- tox_thread_msg = 0;
- tox_thread_init = UTOX_TOX_THREAD_INIT_NONE;
- break;
-@@ -574,7 +573,10 @@ void toxcore_thread(void *UNUSED(args)) {
- write_save(tox);
- edit_setstr(&edit_profile_password, (char *)"", 0);
-
-- // Stop toxcore.
-+ postmessage_utoxav(UTOXAV_KILL, 0, 0, NULL);
-+ while (utox_av_ctrl_init) {
-+ yieldcpu(1);
-+ }
- LOG_TRACE("Toxcore", "tox thread ending");
- tox_kill(tox);
- }
---
-2.26.2
-
diff --git a/srcpkgs/utox/template b/srcpkgs/utox/template
index 20f7f8c209d..5af30bd0f24 100644
--- a/srcpkgs/utox/template
+++ b/srcpkgs/utox/template
@@ -1,7 +1,7 @@
# Template file for 'utox'
pkgname=utox
-version=0.17.2
-revision=2
+version=0.18.0
+revision=1
wrksrc=uTox
build_style=cmake
configure_args="-DENABLE_ASAN=OFF"
@@ -14,7 +14,7 @@ maintainer="avoidr <avoidr@posteo.de>"
license="MIT"
homepage="https://github.com/uTox/uTox/"
distfiles="https://github.com/uTox/uTox/releases/download/v${version}/uTox-${version}-full.tar.gz"
-checksum=8437827b899e4e358adaf0641680c214f4b6dfb52af6534f261d747a905f08b6
+checksum=259d502eb1277394d839c5ef035ef4dadd75113e4472edae1fe266a762198e15
patch_args="-Np1"
nocross=yes
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: utox: update to 0.18.0.
2020-11-22 15:17 [PR PATCH] utox: update to 0.18.0 avoidr
2020-12-07 12:04 ` [PR PATCH] [Updated] " avoidr
@ 2020-12-07 12:57 ` avoidr
2020-12-07 14:45 ` [PR PATCH] [Merged]: " ericonr
2020-12-07 15:21 ` avoidr
3 siblings, 0 replies; 5+ messages in thread
From: avoidr @ 2020-12-07 12:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
New comment by avoidr on void-packages repository
https://github.com/void-linux/void-packages/pull/26605#issuecomment-739902240
Comment:
Ha! It works!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: utox: update to 0.18.0.
2020-11-22 15:17 [PR PATCH] utox: update to 0.18.0 avoidr
2020-12-07 12:04 ` [PR PATCH] [Updated] " avoidr
2020-12-07 12:57 ` avoidr
@ 2020-12-07 14:45 ` ericonr
2020-12-07 15:21 ` avoidr
3 siblings, 0 replies; 5+ messages in thread
From: ericonr @ 2020-12-07 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
There's a merged pull request on the void-packages repository
utox: update to 0.18.0.
https://github.com/void-linux/void-packages/pull/26605
Description:
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: utox: update to 0.18.0.
2020-11-22 15:17 [PR PATCH] utox: update to 0.18.0 avoidr
` (2 preceding siblings ...)
2020-12-07 14:45 ` [PR PATCH] [Merged]: " ericonr
@ 2020-12-07 15:21 ` avoidr
3 siblings, 0 replies; 5+ messages in thread
From: avoidr @ 2020-12-07 15:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 148 bytes --]
New comment by avoidr on void-packages repository
https://github.com/void-linux/void-packages/pull/26605#issuecomment-739985146
Comment:
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-07 15:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-22 15:17 [PR PATCH] utox: update to 0.18.0 avoidr
2020-12-07 12:04 ` [PR PATCH] [Updated] " avoidr
2020-12-07 12:57 ` avoidr
2020-12-07 14:45 ` [PR PATCH] [Merged]: " ericonr
2020-12-07 15:21 ` avoidr
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).