From b2c59335bfbeb25c5644f32172e1e9b23c447710 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 22 Dec 2022 01:55:45 +0000
Subject: gentoo auto-resync : 22:12:2022 - 01:55:45

---
 ...peech-dispatcher-0.11.1-include-pthread_h.patch | 14 ----
 .../speech-dispatcher-0.11.3-fix-dlopen.patch      | 93 ----------------------
 2 files changed, 107 deletions(-)
 delete mode 100644 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch
 delete mode 100644 app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch

(limited to 'app-accessibility/speech-dispatcher/files')

diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch
deleted file mode 100644
index 3575e2c54c99..000000000000
--- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.1-include-pthread_h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-This fixes pthread_mutex_t being undefined on musl libc.
-
-https://github.com/brailcom/speechd/commit/17e4038948f01e389cbd7fedbe3f0eb54ad3292d
-https://bugs.gentoo.org/833347
---- a/src/modules/module_main.h
-+++ b/src/modules/module_main.h
-@@ -31,6 +31,7 @@
- 
- #include <speechd_types.h>
- #include <spd_audio.h>
-+#include <pthread.h>
- 
- #ifdef __cplusplus
- extern "C" {
diff --git a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch b/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch
deleted file mode 100644
index f520fdc6adfb..000000000000
--- a/app-accessibility/speech-dispatcher/files/speech-dispatcher-0.11.3-fix-dlopen.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-https://github.com/brailcom/speechd/commit/db21e5fe4b3155734f60a67c8ab5da6b53174e1b
-https://github.com/brailcom/speechd/pull/783
-https://bugs.gentoo.org/877339
-
-From db21e5fe4b3155734f60a67c8ab5da6b53174e1b Mon Sep 17 00:00:00 2001
-From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
-Date: Mon, 17 Oct 2022 15:28:37 +0200
-Subject: [PATCH] Fix audio plugin loading with dlopen
-
-dlopen needs the full name including .so extension
-Set SPD_AUDIO_PLUGIN_ENTRY to correct name (ltdl adds a prefix)
---- a/src/audio/alsa.c
-+++ b/src/audio/alsa.c
-@@ -37,7 +37,11 @@
- #include <alsa/asoundlib.h>
- #include <alsa/pcm.h>
- 
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_alsa_LTX_spd_audio_plugin_get
-+#endif
- #include <spd_audio_plugin.h>
- 
- typedef struct {
---- a/src/audio/libao.c
-+++ b/src/audio/libao.c
-@@ -32,7 +32,11 @@
- #include <glib.h>
- #include <ao/ao.h>
- 
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_libao_LTX_spd_audio_plugin_get
-+#endif
- #include <spd_audio_plugin.h>
- 
- /* send a packet of XXX bytes to the sound device */
---- a/src/audio/nas.c
-+++ b/src/audio/nas.c
-@@ -32,7 +32,11 @@
- 
- #include <pthread.h>
- 
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_nas_LTX_spd_audio_plugin_get
-+#endif
- #include <spd_audio_plugin.h>
- 
- typedef struct {
---- a/src/audio/oss.c
-+++ b/src/audio/oss.c
-@@ -39,7 +39,11 @@
- 
- #include <sys/soundcard.h>
- 
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_oss_LTX_spd_audio_plugin_get
-+#endif
- #include <spd_audio_plugin.h>
- 
- typedef struct {
---- a/src/audio/pulse.c
-+++ b/src/audio/pulse.c
-@@ -51,7 +51,11 @@
- #include <pulse/simple.h>
- #include <pulse/error.h>
- 
-+#ifdef USE_DLOPEN
-+#define SPD_AUDIO_PLUGIN_ENTRY spd_audio_plugin_get
-+#else
- #define SPD_AUDIO_PLUGIN_ENTRY spd_pulse_LTX_spd_audio_plugin_get
-+#endif
- #include <spd_audio_plugin.h>
- 
- typedef struct {
---- a/src/common/spd_audio.c
-+++ b/src/common/spd_audio.c
-@@ -120,7 +120,7 @@ AudioID *spd_audio_open(const char *name, void **pars, char **error)
- 		plugin_dir = PLUGIN_DIR;
- 
- #ifdef USE_DLOPEN
--	libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s", plugin_dir, name);
-+	libname = g_strdup_printf("%s/" SPD_AUDIO_LIB_PREFIX "%s.so", plugin_dir, name);
- 	dlhandle = dlopen(libname, RTLD_NOW | RTLD_GLOBAL);
- 
- 	g_free(libname);
-
-- 
cgit v1.2.3