From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17968138334 for ; Wed, 25 Sep 2019 16:20:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CE18E07D7; Wed, 25 Sep 2019 16:20:24 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 739B2E07D7 for ; Wed, 25 Sep 2019 16:20:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 601A734B58F for ; Wed, 25 Sep 2019 16:20:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48D9E7F2 for ; Wed, 25 Sep 2019 16:20:08 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1569428371.cc11cb74daecc797998dac882fd4d32cb1ddf784.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/, www-client/chromium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-77.0.3865.90.ebuild www-client/chromium/files/chromium-77-pulseaudio-13.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: cc11cb74daecc797998dac882fd4d32cb1ddf784 X-VCS-Branch: master Date: Wed, 25 Sep 2019 16:20:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 40e10dd9-9104-40ce-8f84-6ea2bd71d12d X-Archives-Hash: 1cdec25f43ae2aab5b9fa4480cbbc166 commit: cc11cb74daecc797998dac882fd4d32cb1ddf784 Author: Stephan Hartmann googlemail com> AuthorDate: Wed Sep 25 10:20:14 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Sep 25 16:19:31 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc11cb74 www-client/chromium: fix building with pulseaudio-13 Bug: https://bugs.gentoo.org/694896 Closes: https://github.com/gentoo/gentoo/pull/13035 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Stephan Hartmann googlemail.com> Signed-off-by: Mike Gilbert gentoo.org> www-client/chromium/chromium-77.0.3865.90.ebuild | 1 + .../chromium/files/chromium-77-pulseaudio-13.patch | 82 ++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/www-client/chromium/chromium-77.0.3865.90.ebuild b/www-client/chromium/chromium-77.0.3865.90.ebuild index 7c8ae108507..a22e92ceac2 100644 --- a/www-client/chromium/chromium-77.0.3865.90.ebuild +++ b/www-client/chromium/chromium-77.0.3865.90.ebuild @@ -144,6 +144,7 @@ PATCHES=( "${FILESDIR}/chromium-widevine-r4.patch" "${FILESDIR}/chromium-fix-char_traits.patch" "${FILESDIR}/chromium-unbundle-zlib.patch" + "${FILESDIR}/chromium-77-pulseaudio-13.patch" "${FILESDIR}/chromium-77-fix-gn-gen.patch" "${FILESDIR}/chromium-77-system-icu.patch" "${FILESDIR}/chromium-77-system-hb.patch" diff --git a/www-client/chromium/files/chromium-77-pulseaudio-13.patch b/www-client/chromium/files/chromium-77-pulseaudio-13.patch new file mode 100644 index 00000000000..892a3183c9d --- /dev/null +++ b/www-client/chromium/files/chromium-77-pulseaudio-13.patch @@ -0,0 +1,82 @@ +From 7ac85fb4cc6f44a21761a591ac497ae3d6bf966d Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Mon, 23 Sep 2019 13:49:53 +0200 +Subject: [PATCH] Fix building with pulseaudio 13 + +The function signature changed though the ABI stayed the same. + +(Modified to apply on chromium sources too) + +Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876 +Fixes: QTBUG-77037 +Reviewed-by: Jüri Valdmann +--- + +diff --git a/media/audio/pulse/pulse.sigs b/media/audio/pulse/pulse.sigs +index 8b58887..daaeb14 100644 +--- a/media/audio/pulse/pulse.sigs ++++ b/media/audio/pulse/pulse.sigs +@@ -24,11 +24,11 @@ + 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 @@ + 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 2a2d3e7..cdaa841 100644 +--- a/media/audio/pulse/pulse_stub_header.fragment ++++ b/media/audio/pulse/pulse_stub_header.fragment +@@ -5,4 +5,15 @@ + + #include + ++#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 + }