mirror of
git://slackware.nl/current.git
synced 2024-12-30 10:24:23 +01:00
7cde3ca9e7
a/kernel-generic-5.4.20-x86_64-1.txz: Upgraded. a/kernel-huge-5.4.20-x86_64-1.txz: Upgraded. a/kernel-modules-5.4.20-x86_64-1.txz: Upgraded. a/shadow-4.8.1-x86_64-3.txz: Rebuilt. a/util-linux-2.35.1-x86_64-3.txz: Rebuilt. d/kernel-headers-5.4.20-x86-1.txz: Upgraded. k/kernel-source-5.4.20-noarch-1.txz: Upgraded. l/ConsoleKit2-1.2.1-x86_64-2.txz: Rebuilt. l/dconf-editor-3.34.4-x86_64-1.txz: Upgraded. l/libxkbcommon-0.10.0-x86_64-1.txz: Added. l/openal-soft-1.19.1-x86_64-1.txz: Added. l/qt5-5.13.2-x86_64-1.txz: Added. Thanks to alienBOB. n/openssh-8.2p1-x86_64-1.txz: Upgraded. Potentially incompatible changes: * ssh(1), sshd(8): the removal of "ssh-rsa" from the accepted CASignatureAlgorithms list. * ssh(1), sshd(8): this release removes diffie-hellman-group14-sha1 from the default key exchange proposal for both the client and server. * ssh-keygen(1): the command-line options related to the generation and screening of safe prime numbers used by the diffie-hellman-group-exchange-* key exchange algorithms have changed. Most options have been folded under the -O flag. * sshd(8): the sshd listener process title visible to ps(1) has changed to include information about the number of connections that are currently attempting authentication and the limits configured by MaxStartups. x/mesa-19.3.4-x86_64-2.txz: Rebuilt. Reverted "[PATCH] swr: Fix GCC 4.9 checks." which makes X fail to start with an illegal instruction on some hardware. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/PAM/ConsoleKit2-1.2.1-x86_64-2_pam.txz: Rebuilt. Rebuilt with --disable-libcgmanager to fix setting limits on PAM. Thanks to gattocarlo. testing/packages/PAM/openssh-8.2p1-x86_64-1_pam.txz: Upgraded. testing/packages/PAM/shadow-4.8.1-x86_64-3_pam.txz: Rebuilt. Moved some of the /etc/pam.d/ file to the util-linux package where they more properly belong. testing/packages/PAM/util-linux-2.35.1-x86_64-3_pam.txz: Rebuilt. Added some /etc/pam.d/ files previously in the shadow package. Changed /etc/pam.d/{chfn,chsh} and made chfn/chsh setuid root to fix them. Added /etc/pam.d/{runuser,runuser-l}. usb-and-pxe-installers/usbboot.img: Rebuilt.
89 lines
4.8 KiB
Diff
89 lines
4.8 KiB
Diff
From 0b57f15958f07ef12c8944d6db7a33a6fe9d9c59 Mon Sep 17 00:00:00 2001
|
|
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
|
Date: Mon, 23 Sep 2019 13:49:53 +0200
|
|
Subject: Fix building with pulseaudio 13
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The function signature changed though the ABI stayed the same.
|
|
|
|
Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876
|
|
Fixes: QTBUG-77037
|
|
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
|
|
---
|
|
chromium/media/audio/pulse/pulse.sigs | 16 ++++++++--------
|
|
chromium/media/audio/pulse/pulse_stub_header.fragment | 11 +++++++++++
|
|
2 files changed, 19 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/chromium/media/audio/pulse/pulse.sigs b/chromium/media/audio/pulse/pulse.sigs
|
|
index 8b5888786a9..daaeb149c13 100644
|
|
--- a/chromium/media/audio/pulse/pulse.sigs
|
|
+++ b/chromium/media/audio/pulse/pulse.sigs
|
|
@@ -24,11 +24,11 @@ pa_operation* pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
|
|
pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata);
|
|
pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata);
|
|
pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata);
|
|
-pa_context_state_t pa_context_get_state(pa_context* c);
|
|
+pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
|
|
pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
|
|
pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
|
|
void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata);
|
|
-pa_operation_state_t pa_operation_get_state(pa_operation* o);
|
|
+pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
|
|
void pa_context_unref(pa_context* c);
|
|
void pa_operation_unref(pa_operation* o);
|
|
int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
|
|
@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, pa_stream_success_cb_t cb, voi
|
|
int pa_stream_disconnect(pa_stream* s);
|
|
int pa_stream_drop(pa_stream *p);
|
|
pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata);
|
|
-uint32_t pa_stream_get_device_index(pa_stream* s);
|
|
+uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
|
|
int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
|
|
-pa_stream_state_t pa_stream_get_state(pa_stream* p);
|
|
+pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
|
|
pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map);
|
|
pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
|
|
pa_proplist* pa_proplist_new(void);
|
|
-int pa_proplist_contains(pa_proplist* p, const char* key);
|
|
+int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
|
|
void pa_proplist_free(pa_proplist* p);
|
|
-const char* pa_proplist_gets(pa_proplist* p, const char* key);
|
|
+const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
|
|
int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
|
|
-size_t pa_stream_readable_size(pa_stream *p);
|
|
+size_t pa_stream_readable_size(const_pa_stream_ptr p);
|
|
int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
|
|
void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata);
|
|
void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata);
|
|
int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
|
|
void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
|
|
void pa_stream_unref(pa_stream* s);
|
|
-int pa_context_errno(pa_context *c);
|
|
+int pa_context_errno(const_pa_context_ptr c);
|
|
const char* pa_strerror(int error);
|
|
pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v);
|
|
diff --git a/chromium/media/audio/pulse/pulse_stub_header.fragment b/chromium/media/audio/pulse/pulse_stub_header.fragment
|
|
index 2a2d3e7552b..cdaa841b29f 100644
|
|
--- a/chromium/media/audio/pulse/pulse_stub_header.fragment
|
|
+++ b/chromium/media/audio/pulse/pulse_stub_header.fragment
|
|
@@ -5,4 +5,15 @@ extern "C" {
|
|
|
|
#include <pulse/pulseaudio.h>
|
|
|
|
+#if PA_MAJOR > 12
|
|
+typedef const pa_context* const_pa_context_ptr;
|
|
+typedef const pa_operation* const_pa_operation_ptr;
|
|
+typedef const pa_proplist* const_pa_proplist_ptr;
|
|
+typedef const pa_stream* const_pa_stream_ptr;
|
|
+#else
|
|
+typedef pa_context* const_pa_context_ptr;
|
|
+typedef pa_operation* const_pa_operation_ptr;
|
|
+typedef pa_proplist* const_pa_proplist_ptr;
|
|
+typedef pa_stream* const_pa_stream_ptr;
|
|
+#endif
|
|
}
|
|
--
|
|
cgit v1.2.1
|
|
|