* [PR PATCH] [ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686
@ 2025-03-08 22:04 Duncaen
2025-03-09 3:02 ` [PR PATCH] [Updated] chromium: update to 134.0.6998.35 Duncaen
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Duncaen @ 2025-03-08 22:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
There is a new pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-134
https://github.com/void-linux/void-packages/pull/54630
[ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/54630.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-134-54630.patch --]
[-- Type: text/x-diff, Size: 35399 bytes --]
From e9a85058fe5f273ed0d59f5c3a4ce03a5188cc0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:42 +0100
Subject: [PATCH 1/2] gn: update to 0.0.20250113.
---
srcpkgs/gn/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gn/template b/srcpkgs/gn/template
index 0c8795645f6362..bffada998f7e94 100644
--- a/srcpkgs/gn/template
+++ b/srcpkgs/gn/template
@@ -1,8 +1,8 @@
# Template file for 'gn'
pkgname=gn
-version=0.0.20240706
+version=0.0.20250113
revision=1
-_ref=b3a0bff47dd81073bfe67a402971bad92e4f2423
+_ref=ed1abc107815210dc66ec439542bee2f6cbabc00
create_wrksrc=yes
hostmakedepends="python3 ninja"
short_desc="Meta-build system that generates build files for Ninja"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://gn.googlesource.com/gn"
distfiles="https://gn.googlesource.com/gn/+archive/${_ref}.tar.gz"
-checksum=@6cc1aea3aaf370d5c4eee864baebebbf17a546e78800c4c068bb1a14a445ab8d
+checksum=7633c7bd05d01e869211112bd339170e6b460f5b77b23f6928cbdf296c91afac
do_configure() {
cat <<-EOF >src/gn/last_commit_position.h
From 47de471e04ca936502ca9f9d8ddd327967fbd2f0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:47 +0100
Subject: [PATCH 2/2] chromium: update to 134.0.6998.35.
---
...-v8-monotonic-pthread-cont_timedwait.patch | 24 -
srcpkgs/chromium/patches/sndio.patch | 10 +-
srcpkgs/chromium/patches/sndio.patch.orig | 875 ++++++++++++++++++
srcpkgs/chromium/template | 13 +-
4 files changed, 889 insertions(+), 33 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
create mode 100644 srcpkgs/chromium/patches/sndio.patch.orig
diff --git a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
deleted file mode 100644
index 56a4ad1c807e55..00000000000000
--- a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Use monotonic clock for pthread_cond_timedwait with musl too.
-
-diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
-index 5ea7083..c13027e 100644
---- a/v8/src/base/platform/condition-variable.cc
-+++ b/v8/src/base/platform/condition-variable.cc
-@@ -16,7 +16,7 @@ namespace base {
-
- ConditionVariable::ConditionVariable() {
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- pthread_condattr_t attr;
-@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
- &native_handle_, &mutex->native_handle(), &ts);
- #else
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index 060865aa60e2a6..b240ac3fed1fd5 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -1,13 +1,13 @@
diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
---- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200
-+++ - 2024-09-19 19:44:06.486438185 +0200
-@@ -66,6 +66,7 @@
- "USE_CRAS=$use_cras",
+--- a/media/BUILD.gn
++++ b/media/BUILD.gn
+@@ -69,6 +69,7 @@
"USE_PROPRIETARY_CODECS=$proprietary_codecs",
"ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture",
+ "USE_OPENSLES=$media_use_opensles",
+ "USE_SNDIO=$use_sndio",
]
-
+
if (enable_library_cdms) {
diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200
diff --git a/srcpkgs/chromium/patches/sndio.patch.orig b/srcpkgs/chromium/patches/sndio.patch.orig
new file mode 100644
index 00000000000000..060865aa60e2a6
--- /dev/null
+++ b/srcpkgs/chromium/patches/sndio.patch.orig
@@ -0,0 +1,875 @@
+diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
+--- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200
++++ - 2024-09-19 19:44:06.486438185 +0200
+@@ -66,6 +66,7 @@
+ "USE_CRAS=$use_cras",
+ "USE_PROPRIETARY_CODECS=$proprietary_codecs",
+ "ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture",
++ "USE_SNDIO=$use_sndio",
+ ]
+
+ if (enable_library_cdms) {
+diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
+--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200
++++ b/media/audio/BUILD.gn 2020-06-13 17:32:28.511395969 +0200
+@@ -236,6 +236,17 @@
+ sources += [ "linux/audio_manager_linux.cc" ]
+ }
+
++ if (use_sndio) {
++ libs += [ "sndio" ]
++ sources += [
++ "sndio/audio_manager_sndio.cc",
++ "sndio/sndio_input.cc",
++ "sndio/sndio_input.h",
++ "sndio/sndio_output.cc",
++ "sndio/sndio_output.h"
++ ]
++ }
++
+ if (use_alsa) {
+ libs += [ "asound" ]
+ sources += [
+diff -Naur chromium-83.0.4103.97.orig/media/audio/linux/audio_manager_linux.cc chromium-83.0.4103.97/media/audio/linux/audio_manager_linux.cc
+--- a/media/audio/linux/audio_manager_linux.cc 2020-06-03 20:39:37.000000000 +0200
++++ b/media/audio/linux/audio_manager_linux.cc 2020-06-13 18:09:43.623333167 +0200
+@@ -19,6 +19,11 @@
+ #include "media/audio/pulse/audio_manager_pulse.h"
+ #include "media/audio/pulse/pulse_util.h"
+ #endif
++#if defined(USE_SNDIO)
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#endif
+
+ namespace media {
+
+ std::unique_ptr<media::AudioManager> CreateAudioManager(
+@@ -39,6 +45,16 @@
+ audio_log_factory);
+ }
+
++#if defined(USE_SNDIO)
++ struct sio_hdl *hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++ if (hdl != NULL) {
++ sio_close(hdl);
++ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kSndio, kAudioIOMax + 1);
++ return std::make_unique<AudioManagerSndio>(std::move(audio_thread),
++ audio_log_factory);
++ }
++#endif
++
+ #if defined(USE_CRAS)
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseCras)) {
+ UMA_HISTOGRAM_ENUMERATION("Media.LinuxAudioIO", kCras, kAudioIOMax + 1);
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.cc chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.cc
+--- a/media/audio/sndio/audio_manager_sndio.cc 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/audio_manager_sndio.cc 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,148 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "media/audio/sndio/audio_manager_sndio.h"
++
++#include "base/metrics/histogram_macros.h"
++#include "base/memory/ptr_util.h"
++#include "media/audio/audio_device_description.h"
++#include "media/audio/audio_output_dispatcher.h"
++#include "media/audio/sndio/sndio_input.h"
++#include "media/audio/sndio/sndio_output.h"
++#include "media/base/limits.h"
++#include "media/base/media_switches.h"
++
++namespace media {
++
++
++// Maximum number of output streams that can be open simultaneously.
++static const int kMaxOutputStreams = 4;
++
++// Default sample rate for input and output streams.
++static const int kDefaultSampleRate = 48000;
++
++void AddDefaultDevice(AudioDeviceNames* device_names) {
++ DCHECK(device_names->empty());
++ device_names->push_front(AudioDeviceName::CreateDefault());
++}
++
++bool AudioManagerSndio::HasAudioOutputDevices() {
++ return true;
++}
++
++bool AudioManagerSndio::HasAudioInputDevices() {
++ return true;
++}
++
++void AudioManagerSndio::GetAudioInputDeviceNames(
++ AudioDeviceNames* device_names) {
++ DCHECK(device_names->empty());
++ AddDefaultDevice(device_names);
++}
++
++void AudioManagerSndio::GetAudioOutputDeviceNames(
++ AudioDeviceNames* device_names) {
++ AddDefaultDevice(device_names);
++}
++
++const char* AudioManagerSndio::GetName() {
++ return "SNDIO";
++}
++
++AudioParameters AudioManagerSndio::GetInputStreamParameters(
++ const std::string& device_id) {
++ static const int kDefaultInputBufferSize = 1024;
++
++ int user_buffer_size = GetUserBufferSize();
++ int buffer_size = user_buffer_size ?
++ user_buffer_size : kDefaultInputBufferSize;
++
++ return AudioParameters(
++ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
++ kDefaultSampleRate, buffer_size);
++}
++
++AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++ AudioLogFactory* audio_log_factory)
++ : AudioManagerBase(std::move(audio_thread),
++ audio_log_factory) {
++ DLOG(WARNING) << "AudioManagerSndio";
++ SetMaxOutputStreamsAllowed(kMaxOutputStreams);
++}
++
++AudioManagerSndio::~AudioManagerSndio() {
++ Shutdown();
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLinearOutputStream(
++ const AudioParameters& params,
++ const LogCallback& log_callback) {
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++ return MakeOutputStream(params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeLowLatencyOutputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) {
++ DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++ return MakeOutputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLinearInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) {
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
++ return MakeInputStream(params);
++}
++
++AudioInputStream* AudioManagerSndio::MakeLowLatencyInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) {
++ DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
++ return MakeInputStream(params);
++}
++
++AudioParameters AudioManagerSndio::GetPreferredOutputStreamParameters(
++ const std::string& output_device_id,
++ const AudioParameters& input_params) {
++ // TODO(tommi): Support |output_device_id|.
++ DLOG_IF(ERROR, !output_device_id.empty()) << "Not implemented!";
++ static const int kDefaultOutputBufferSize = 2048;
++
++ ChannelLayout channel_layout = CHANNEL_LAYOUT_STEREO;
++ int sample_rate = kDefaultSampleRate;
++ int buffer_size = kDefaultOutputBufferSize;
++ if (input_params.IsValid()) {
++ sample_rate = input_params.sample_rate();
++ channel_layout = input_params.channel_layout();
++ buffer_size = std::min(buffer_size, input_params.frames_per_buffer());
++ }
++
++ int user_buffer_size = GetUserBufferSize();
++ if (user_buffer_size)
++ buffer_size = user_buffer_size;
++
++ return AudioParameters(
++ AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
++ sample_rate, buffer_size);
++}
++
++AudioInputStream* AudioManagerSndio::MakeInputStream(
++ const AudioParameters& params) {
++ DLOG(WARNING) << "MakeInputStream";
++ return new SndioAudioInputStream(this,
++ AudioDeviceDescription::kDefaultDeviceId, params);
++}
++
++AudioOutputStream* AudioManagerSndio::MakeOutputStream(
++ const AudioParameters& params) {
++ DLOG(WARNING) << "MakeOutputStream";
++ return new SndioAudioOutputStream(params, this);
++}
++
++} // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/audio_manager_sndio.h chromium-83.0.4103.97/media/audio/sndio/audio_manager_sndio.h
+--- a/media/audio/sndio/audio_manager_sndio.h 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/audio_manager_sndio.h 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,65 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++#define MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
++
++#include <set>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/ref_counted.h"
++#include "base/threading/thread.h"
++#include "media/audio/audio_manager_base.h"
++
++namespace media {
++
++class MEDIA_EXPORT AudioManagerSndio : public AudioManagerBase {
++ public:
++ AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
++ AudioLogFactory* audio_log_factory);
++ ~AudioManagerSndio() override;
++
++ // Implementation of AudioManager.
++ bool HasAudioOutputDevices() override;
++ bool HasAudioInputDevices() override;
++ void GetAudioInputDeviceNames(AudioDeviceNames* device_names) override;
++ void GetAudioOutputDeviceNames(AudioDeviceNames* device_names) override;
++ AudioParameters GetInputStreamParameters(
++ const std::string& device_id) override;
++ const char* GetName() override;
++
++ // Implementation of AudioManagerBase.
++ AudioOutputStream* MakeLinearOutputStream(
++ const AudioParameters& params,
++ const LogCallback& log_callback) override;
++ AudioOutputStream* MakeLowLatencyOutputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) override;
++ AudioInputStream* MakeLinearInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) override;
++ AudioInputStream* MakeLowLatencyInputStream(
++ const AudioParameters& params,
++ const std::string& device_id,
++ const LogCallback& log_callback) override;
++
++ protected:
++ AudioParameters GetPreferredOutputStreamParameters(
++ const std::string& output_device_id,
++ const AudioParameters& input_params) override;
++
++ private:
++ // Called by MakeLinearOutputStream and MakeLowLatencyOutputStream.
++ AudioOutputStream* MakeOutputStream(const AudioParameters& params);
++ AudioInputStream* MakeInputStream(const AudioParameters& params);
++
++ DISALLOW_COPY_AND_ASSIGN(AudioManagerSndio);
++};
++
++} // namespace media
++
++#endif // MEDIA_AUDIO_SNDIO_AUDIO_MANAGER_SNDIO_H_
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium-83.0.4103.97/media/audio/sndio/sndio_input.cc
+--- a/media/audio/sndio/sndio_input.cc 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_input.cc 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,200 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/bind.h"
++#include "base/logging.h"
++#include "base/macros.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/audio_manager_sndio.h"
++#include "media/audio/audio_manager.h"
++#include "media/audio/sndio/sndio_input.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioInputStream::OnMoveCallback(void *arg, int delta)
++{
++ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++ self->hw_delay += delta;
++}
++
++void *SndioAudioInputStream::ThreadEntry(void *arg) {
++ SndioAudioInputStream* self = static_cast<SndioAudioInputStream*>(arg);
++
++ self->ThreadLoop();
++ return NULL;
++}
++
++SndioAudioInputStream::SndioAudioInputStream(AudioManagerBase* manager,
++ const std::string& device_name,
++ const AudioParameters& params)
++ : manager(manager),
++ params(params),
++ audio_bus(AudioBus::Create(params)),
++ state(kClosed) {
++}
++
++SndioAudioInputStream::~SndioAudioInputStream() {
++ if (state != kClosed)
++ Close();
++}
++
++bool SndioAudioInputStream::Open() {
++ struct sio_par par;
++ int sig;
++
++ if (state != kClosed)
++ return false;
++
++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++ LOG(WARNING) << "Unsupported audio format.";
++ return false;
++ }
++
++ sio_initpar(&par);
++ par.rate = params.sample_rate();
++ par.rchan = params.channels();
++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++ par.bps = par.bits / 8;
++ par.sig = sig = par.bits != 8 ? 1 : 0;
++ par.le = SIO_LE_NATIVE;
++ par.appbufsz = params.frames_per_buffer();
++
++ hdl = sio_open(SIO_DEVANY, SIO_REC, 0);
++
++ if (hdl == NULL) {
++ LOG(ERROR) << "Couldn't open audio device.";
++ return false;
++ }
++
++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++ LOG(ERROR) << "Couldn't set audio parameters.";
++ goto bad_close;
++ }
++
++ if (par.rate != (unsigned int)params.sample_rate() ||
++ par.rchan != (unsigned int)params.channels() ||
++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++ par.sig != (unsigned int)sig ||
++ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++ (par.bits != par.bps * 8)) {
++ LOG(ERROR) << "Unsupported audio parameters.";
++ goto bad_close;
++ }
++ state = kStopped;
++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++ sio_onmove(hdl, &OnMoveCallback, this);
++ return true;
++bad_close:
++ sio_close(hdl);
++ return false;
++}
++
++void SndioAudioInputStream::Start(AudioInputCallback* cb) {
++
++ StartAgc();
++
++ state = kRunning;
++ hw_delay = 0;
++ callback = cb;
++ sio_start(hdl);
++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++ LOG(ERROR) << "Failed to create real-time thread for recording.";
++ sio_stop(hdl);
++ state = kStopped;
++ }
++}
++
++void SndioAudioInputStream::Stop() {
++
++ if (state == kStopped)
++ return;
++
++ state = kStopWait;
++ pthread_join(thread, NULL);
++ sio_stop(hdl);
++ state = kStopped;
++
++ StopAgc();
++}
++
++void SndioAudioInputStream::Close() {
++
++ if (state == kClosed)
++ return;
++
++ if (state == kRunning)
++ Stop();
++
++ state = kClosed;
++ delete [] buffer;
++ sio_close(hdl);
++
++ manager->ReleaseInputStream(this);
++}
++
++double SndioAudioInputStream::GetMaxVolume() {
++ // Not supported
++ return 0.0;
++}
++
++void SndioAudioInputStream::SetVolume(double volume) {
++ // Not supported. Do nothing.
++}
++
++double SndioAudioInputStream::GetVolume() {
++ // Not supported.
++ return 0.0;
++}
++
++bool SndioAudioInputStream::IsMuted() {
++ // Not supported.
++ return false;
++}
++
++void SndioAudioInputStream::SetOutputDeviceForAec(
++ const std::string& output_device_id) {
++ // Not supported.
++}
++
++void SndioAudioInputStream::ThreadLoop(void) {
++ size_t todo, n;
++ char *data;
++ unsigned int nframes;
++ double normalized_volume = 0.0;
++
++ nframes = audio_bus->frames();
++
++ while (state == kRunning && !sio_eof(hdl)) {
++
++ GetAgcVolume(&normalized_volume);
++
++ // read one block
++ todo = nframes * params.GetBytesPerFrame(kSampleFormat);
++ data = buffer;
++ while (todo > 0) {
++ n = sio_read(hdl, data, todo);
++ if (n == 0)
++ return; // unrecoverable I/O error
++ todo -= n;
++ data += n;
++ }
++ hw_delay -= nframes;
++
++ // convert frames count to TimeDelta
++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++ params.sample_rate());
++
++ // push into bus
++ audio_bus->FromInterleaved<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(buffer), nframes);
++
++ // invoke callback
++ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++ }
++}
++
++} // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.h chromium-83.0.4103.97/media/audio/sndio/sndio_input.h
+--- a/media/audio/sndio/sndio_input.h 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_input.h 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,91 @@
++// Copyright 2013 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
++
++#include <stdint.h>
++#include <string>
++#include <sndio.h>
++
++#include "base/compiler_specific.h"
++#include "base/macros.h"
++#include "base/memory/weak_ptr.h"
++#include "base/time/time.h"
++#include "media/audio/agc_audio_stream.h"
++#include "media/audio/audio_io.h"
++#include "media/audio/audio_device_description.h"
++#include "media/base/audio_parameters.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioInputStream : public AgcAudioStream<AudioInputStream> {
++ public:
++ // Pass this to the constructor if you want to attempt auto-selection
++ // of the audio recording device.
++ static const char kAutoSelectDevice[];
++
++ // Create a PCM Output stream for the SNDIO device identified by
++ // |device_name|. If unsure of what to use for |device_name|, use
++ // |kAutoSelectDevice|.
++ SndioAudioInputStream(AudioManagerBase* audio_manager,
++ const std::string& device_name,
++ const AudioParameters& params);
++
++ ~SndioAudioInputStream() override;
++
++ // Implementation of AudioInputStream.
++ bool Open() override;
++ void Start(AudioInputCallback* callback) override;
++ void Stop() override;
++ void Close() override;
++ double GetMaxVolume() override;
++ void SetVolume(double volume) override;
++ double GetVolume() override;
++ bool IsMuted() override;
++ void SetOutputDeviceForAec(const std::string& output_device_id) override;
++
++ private:
++
++ enum StreamState {
++ kClosed, // Not opened yet
++ kStopped, // Device opened, but not started yet
++ kRunning, // Started, device playing
++ kStopWait // Stopping, waiting for the real-time thread to exit
++ };
++
++ // C-style call-backs
++ static void OnMoveCallback(void *arg, int delta);
++ static void* ThreadEntry(void *arg);
++
++ // Continuously moves data from the device to the consumer
++ void ThreadLoop();
++ // Our creator, the audio manager needs to be notified when we close.
++ AudioManagerBase* manager;
++ // Parameters of the source
++ AudioParameters params;
++ // We store data here for consumer
++ std::unique_ptr<AudioBus> audio_bus;
++ // Call-back that consumes recorded data
++ AudioInputCallback* callback; // Valid during a recording session.
++ // Handle of the audio device
++ struct sio_hdl* hdl;
++ // Current state of the stream
++ enum StreamState state;
++ // High priority thread running ThreadLoop()
++ pthread_t thread;
++ // Number of frames buffered in the hardware
++ int hw_delay;
++ // Temporary buffer where data is stored sndio-compatible format
++ char* buffer;
++
++ DISALLOW_COPY_AND_ASSIGN(SndioAudioInputStream);
++};
++
++} // namespace media
++
++#endif // MEDIA_AUDIO_SNDIO_SNDIO_INPUT_H_
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium-83.0.4103.97/media/audio/sndio/sndio_output.cc
+--- a/media/audio/sndio/sndio_output.cc 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_output.cc 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,183 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "base/logging.h"
++#include "base/time/time.h"
++#include "base/time/default_tick_clock.h"
++#include "media/audio/audio_manager_base.h"
++#include "media/base/audio_timestamp_helper.h"
++#include "media/audio/sndio/sndio_output.h"
++
++namespace media {
++
++static const SampleFormat kSampleFormat = kSampleFormatS16;
++
++void SndioAudioOutputStream::OnMoveCallback(void *arg, int delta) {
++ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++ self->hw_delay -= delta;
++}
++
++void SndioAudioOutputStream::OnVolCallback(void *arg, unsigned int vol) {
++ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++ self->vol = vol;
++}
++
++void *SndioAudioOutputStream::ThreadEntry(void *arg) {
++ SndioAudioOutputStream* self = static_cast<SndioAudioOutputStream*>(arg);
++
++ self->ThreadLoop();
++ return NULL;
++}
++
++SndioAudioOutputStream::SndioAudioOutputStream(const AudioParameters& params,
++ AudioManagerBase* manager)
++ : manager(manager),
++ params(params),
++ audio_bus(AudioBus::Create(params)),
++ state(kClosed),
++ mutex(PTHREAD_MUTEX_INITIALIZER) {
++}
++
++SndioAudioOutputStream::~SndioAudioOutputStream() {
++ if (state != kClosed)
++ Close();
++}
++
++bool SndioAudioOutputStream::Open() {
++ struct sio_par par;
++ int sig;
++
++ if (params.format() != AudioParameters::AUDIO_PCM_LINEAR &&
++ params.format() != AudioParameters::AUDIO_PCM_LOW_LATENCY) {
++ LOG(WARNING) << "Unsupported audio format.";
++ return false;
++ }
++ sio_initpar(&par);
++ par.rate = params.sample_rate();
++ par.pchan = params.channels();
++ par.bits = SampleFormatToBitsPerChannel(kSampleFormat);
++ par.bps = par.bits / 8;
++ par.sig = sig = par.bits != 8 ? 1 : 0;
++ par.le = SIO_LE_NATIVE;
++ par.appbufsz = params.frames_per_buffer();
++
++ hdl = sio_open(SIO_DEVANY, SIO_PLAY, 0);
++ if (hdl == NULL) {
++ LOG(ERROR) << "Couldn't open audio device.";
++ return false;
++ }
++ if (!sio_setpar(hdl, &par) || !sio_getpar(hdl, &par)) {
++ LOG(ERROR) << "Couldn't set audio parameters.";
++ goto bad_close;
++ }
++ if (par.rate != (unsigned int)params.sample_rate() ||
++ par.pchan != (unsigned int)params.channels() ||
++ par.bits != (unsigned int)SampleFormatToBitsPerChannel(kSampleFormat) ||
++ par.sig != (unsigned int)sig ||
++ (par.bps > 1 && par.le != SIO_LE_NATIVE) ||
++ (par.bits != par.bps * 8)) {
++ LOG(ERROR) << "Unsupported audio parameters.";
++ goto bad_close;
++ }
++ state = kStopped;
++ volpending = 0;
++ vol = 0;
++ buffer = new char[audio_bus->frames() * params.GetBytesPerFrame(kSampleFormat)];
++ sio_onmove(hdl, &OnMoveCallback, this);
++ sio_onvol(hdl, &OnVolCallback, this);
++ return true;
++ bad_close:
++ sio_close(hdl);
++ return false;
++}
++
++void SndioAudioOutputStream::Close() {
++ if (state == kClosed)
++ return;
++ if (state == kRunning)
++ Stop();
++ state = kClosed;
++ delete [] buffer;
++ sio_close(hdl);
++ manager->ReleaseOutputStream(this); // Calls the destructor
++}
++
++void SndioAudioOutputStream::Start(AudioSourceCallback* callback) {
++ state = kRunning;
++ hw_delay = 0;
++ source = callback;
++ sio_start(hdl);
++ if (pthread_create(&thread, NULL, &ThreadEntry, this) != 0) {
++ LOG(ERROR) << "Failed to create real-time thread.";
++ sio_stop(hdl);
++ state = kStopped;
++ }
++}
++
++void SndioAudioOutputStream::Stop() {
++ if (state == kStopped)
++ return;
++ state = kStopWait;
++ pthread_join(thread, NULL);
++ sio_stop(hdl);
++ state = kStopped;
++}
++
++void SndioAudioOutputStream::SetVolume(double v) {
++ pthread_mutex_lock(&mutex);
++ vol = v * SIO_MAXVOL;
++ volpending = 1;
++ pthread_mutex_unlock(&mutex);
++}
++
++void SndioAudioOutputStream::GetVolume(double* v) {
++ pthread_mutex_lock(&mutex);
++ *v = vol * (1. / SIO_MAXVOL);
++ pthread_mutex_unlock(&mutex);
++}
++
++// This stream is always used with sub second buffer sizes, where it's
++// sufficient to simply always flush upon Start().
++void SndioAudioOutputStream::Flush() {}
++
++void SndioAudioOutputStream::ThreadLoop(void) {
++ int avail, count, result;
++
++ while (state == kRunning) {
++ // Update volume if needed
++ pthread_mutex_lock(&mutex);
++ if (volpending) {
++ volpending = 0;
++ sio_setvol(hdl, vol);
++ }
++ pthread_mutex_unlock(&mutex);
++
++ // Get data to play
++ const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay,
++ params.sample_rate());
++ count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get());
++ audio_bus->ToInterleaved<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(buffer));
++ if (count == 0) {
++ // We have to submit something to the device
++ count = audio_bus->frames();
++ memset(buffer, 0, count * params.GetBytesPerFrame(kSampleFormat));
++ LOG(WARNING) << "No data to play, running empty cycle.";
++ }
++
++ // Submit data to the device
++ avail = count * params.GetBytesPerFrame(kSampleFormat);
++ result = sio_write(hdl, buffer, avail);
++ if (result == 0) {
++ LOG(WARNING) << "Audio device disconnected.";
++ break;
++ }
++
++ // Update hardware pointer
++ hw_delay += count;
++ }
++}
++
++} // namespace media
+diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-83.0.4103.97/media/audio/sndio/sndio_output.h
+--- a/media/audio/sndio/sndio_output.h 1970-01-01 01:00:00.000000000 +0100
++++ b/media/audio/sndio/sndio_output.h 2020-06-13 17:32:28.511395969 +0200
+@@ -0,0 +1,86 @@
++// Copyright (c) 2012 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++#define MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
++
++#include <pthread.h>
++#include <sndio.h>
++
++#include "base/time/tick_clock.h"
++#include "base/time/time.h"
++#include "media/audio/audio_io.h"
++
++namespace media {
++
++class AudioManagerBase;
++
++// Implementation of AudioOutputStream using sndio(7)
++class SndioAudioOutputStream : public AudioOutputStream {
++ public:
++ // The manager is creating this object
++ SndioAudioOutputStream(const AudioParameters& params,
++ AudioManagerBase* manager);
++ virtual ~SndioAudioOutputStream();
++
++ // Implementation of AudioOutputStream.
++ bool Open() override;
++ void Close() override;
++ void Start(AudioSourceCallback* callback) override;
++ void Stop() override;
++ void SetVolume(double volume) override;
++ void GetVolume(double* volume) override;
++ void Flush() override;
++
++ friend void sndio_onmove(void *arg, int delta);
++ friend void sndio_onvol(void *arg, unsigned int vol);
++ friend void *sndio_threadstart(void *arg);
++
++ private:
++ enum StreamState {
++ kClosed, // Not opened yet
++ kStopped, // Device opened, but not started yet
++ kRunning, // Started, device playing
++ kStopWait // Stopping, waiting for the real-time thread to exit
++ };
++
++ // C-style call-backs
++ static void OnMoveCallback(void *arg, int delta);
++ static void OnVolCallback(void *arg, unsigned int vol);
++ static void* ThreadEntry(void *arg);
++
++ // Continuously moves data from the producer to the device
++ void ThreadLoop(void);
++
++ // Our creator, the audio manager needs to be notified when we close.
++ AudioManagerBase* manager;
++ // Parameters of the source
++ AudioParameters params;
++ // Source stores data here
++ std::unique_ptr<AudioBus> audio_bus;
++ // Call-back that produces data to play
++ AudioSourceCallback* source;
++ // Handle of the audio device
++ struct sio_hdl* hdl;
++ // Current state of the stream
++ enum StreamState state;
++ // High priority thread running ThreadLoop()
++ pthread_t thread;
++ // Protects vol, volpending and hw_delay
++ pthread_mutex_t mutex;
++ // Current volume in the 0..SIO_MAXVOL range
++ int vol;
++ // Set to 1 if volumes must be refreshed in the realtime thread
++ int volpending;
++ // Number of frames buffered in the hardware
++ int hw_delay;
++ // Temporary buffer where data is stored sndio-compatible format
++ char* buffer;
++
++ DISALLOW_COPY_AND_ASSIGN(SndioAudioOutputStream);
++};
++
++} // namespace media
++
++#endif // MEDIA_AUDIO_SNDIO_SNDIO_OUTPUT_H_
+diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
+--- a/media/media_options.gni
++++ b/media/media_options.gni
+@@ -158,6 +158,9 @@
+ # Enables runtime selection of ALSA library for audio.
+ use_alsa = false
+
++ # Enable runtime selection of sndio(7)
++ use_sndio = false
++
+ # Alsa should be used on all non-Android, non-Mac POSIX systems - with the
+ # exception of CastOS desktop builds.
+ #
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c6c4f79502a3cb..be0bd4bc08729f 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=133.0.6943.53
+version=134.0.6998.35
revision=1
archs="i686* x86_64* aarch64* armv7l*"
_llvmver=19
@@ -20,7 +20,7 @@ makedepends="
libxslt-devel minizip-devel mit-krb5-devel nss-devel opus-devel
pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
- compiler-rt
+ compiler-rt qt5-devel qt6-base-devel
$(vopt_if pipewire pipewire-devel)
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel)"
@@ -31,7 +31,7 @@ license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"
#distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz"
-checksum=433c8891a3d717994b0e9544334491888e835a4b813354eefacae05489c23d01
+checksum=d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7
lib32disabled=yes
@@ -93,6 +93,10 @@ post_patch() {
mkdir -p third_party/node/linux/node-linux-x64/bin
rm -f third_party/node/linux/node-linux-x64/bin/node
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
+ # Rust 1.86 ships adler2 but we need to change it to adler when
+ # using older Rust versions (idea for this borrowed from Gentoo^WArch)
+ sed -i 's/adler2/adler/' build/rust/std/BUILD.gn
}
_setup_clang() {
@@ -230,7 +234,8 @@ do_configure() {
'use_system_harfbuzz=false'
'use_system_libffi=true'
- 'use_qt=false'
+ 'use_qt5=true'
+ 'use_qt6=true'
'use_cups=true'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 134.0.6998.35.
2025-03-08 22:04 [PR PATCH] [ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686 Duncaen
@ 2025-03-09 3:02 ` Duncaen
2025-03-09 15:57 ` Duncaen
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2025-03-09 3:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-134
https://github.com/void-linux/void-packages/pull/54630
chromium: update to 134.0.6998.35.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/54630.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-134-54630.patch --]
[-- Type: text/x-diff, Size: 5640 bytes --]
From e9a85058fe5f273ed0d59f5c3a4ce03a5188cc0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:42 +0100
Subject: [PATCH 1/2] gn: update to 0.0.20250113.
---
srcpkgs/gn/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gn/template b/srcpkgs/gn/template
index 0c8795645f6362..bffada998f7e94 100644
--- a/srcpkgs/gn/template
+++ b/srcpkgs/gn/template
@@ -1,8 +1,8 @@
# Template file for 'gn'
pkgname=gn
-version=0.0.20240706
+version=0.0.20250113
revision=1
-_ref=b3a0bff47dd81073bfe67a402971bad92e4f2423
+_ref=ed1abc107815210dc66ec439542bee2f6cbabc00
create_wrksrc=yes
hostmakedepends="python3 ninja"
short_desc="Meta-build system that generates build files for Ninja"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://gn.googlesource.com/gn"
distfiles="https://gn.googlesource.com/gn/+archive/${_ref}.tar.gz"
-checksum=@6cc1aea3aaf370d5c4eee864baebebbf17a546e78800c4c068bb1a14a445ab8d
+checksum=7633c7bd05d01e869211112bd339170e6b460f5b77b23f6928cbdf296c91afac
do_configure() {
cat <<-EOF >src/gn/last_commit_position.h
From 02b4d515c4ef4be7c51b569e19b9b9d3da866df4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:47 +0100
Subject: [PATCH 2/2] chromium: update to 134.0.6998.35.
---
...-v8-monotonic-pthread-cont_timedwait.patch | 24 -------------------
srcpkgs/chromium/patches/sndio.patch | 10 ++++----
srcpkgs/chromium/template | 11 ++++++---
3 files changed, 13 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
diff --git a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
deleted file mode 100644
index 56a4ad1c807e55..00000000000000
--- a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Use monotonic clock for pthread_cond_timedwait with musl too.
-
-diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
-index 5ea7083..c13027e 100644
---- a/v8/src/base/platform/condition-variable.cc
-+++ b/v8/src/base/platform/condition-variable.cc
-@@ -16,7 +16,7 @@ namespace base {
-
- ConditionVariable::ConditionVariable() {
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- pthread_condattr_t attr;
-@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
- &native_handle_, &mutex->native_handle(), &ts);
- #else
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index 060865aa60e2a6..b240ac3fed1fd5 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -1,13 +1,13 @@
diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
---- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200
-+++ - 2024-09-19 19:44:06.486438185 +0200
-@@ -66,6 +66,7 @@
- "USE_CRAS=$use_cras",
+--- a/media/BUILD.gn
++++ b/media/BUILD.gn
+@@ -69,6 +69,7 @@
"USE_PROPRIETARY_CODECS=$proprietary_codecs",
"ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture",
+ "USE_OPENSLES=$media_use_opensles",
+ "USE_SNDIO=$use_sndio",
]
-
+
if (enable_library_cdms) {
diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c6c4f79502a3cb..1e6981246fb8ea 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=133.0.6943.53
+version=134.0.6998.35
revision=1
archs="i686* x86_64* aarch64* armv7l*"
_llvmver=19
@@ -31,7 +31,7 @@ license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"
#distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz"
-checksum=433c8891a3d717994b0e9544334491888e835a4b813354eefacae05489c23d01
+checksum=d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7
lib32disabled=yes
@@ -93,6 +93,10 @@ post_patch() {
mkdir -p third_party/node/linux/node-linux-x64/bin
rm -f third_party/node/linux/node-linux-x64/bin/node
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
+ # Rust 1.86 ships adler2 but we need to change it to adler when
+ # using older Rust versions (idea for this borrowed from Gentoo^WArch)
+ sed -i 's/adler2/adler/' build/rust/std/BUILD.gn
}
_setup_clang() {
@@ -230,7 +234,8 @@ do_configure() {
'use_system_harfbuzz=false'
'use_system_libffi=true'
- 'use_qt=false'
+ 'use_qt5=false'
+ 'use_qt6=false'
'use_cups=true'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 134.0.6998.35.
2025-03-08 22:04 [PR PATCH] [ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686 Duncaen
2025-03-09 3:02 ` [PR PATCH] [Updated] chromium: update to 134.0.6998.35 Duncaen
@ 2025-03-09 15:57 ` Duncaen
2025-03-09 23:59 ` Duncaen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2025-03-09 15:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-134
https://github.com/void-linux/void-packages/pull/54630
chromium: update to 134.0.6998.35.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/54630.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-134-54630.patch --]
[-- Type: text/x-diff, Size: 5640 bytes --]
From 101205006c28f8bd480378793e16b388ca9bad6c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:42 +0100
Subject: [PATCH 1/2] gn: update to 0.0.20250113.
---
srcpkgs/gn/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gn/template b/srcpkgs/gn/template
index 0c8795645f6362..bffada998f7e94 100644
--- a/srcpkgs/gn/template
+++ b/srcpkgs/gn/template
@@ -1,8 +1,8 @@
# Template file for 'gn'
pkgname=gn
-version=0.0.20240706
+version=0.0.20250113
revision=1
-_ref=b3a0bff47dd81073bfe67a402971bad92e4f2423
+_ref=ed1abc107815210dc66ec439542bee2f6cbabc00
create_wrksrc=yes
hostmakedepends="python3 ninja"
short_desc="Meta-build system that generates build files for Ninja"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://gn.googlesource.com/gn"
distfiles="https://gn.googlesource.com/gn/+archive/${_ref}.tar.gz"
-checksum=@6cc1aea3aaf370d5c4eee864baebebbf17a546e78800c4c068bb1a14a445ab8d
+checksum=7633c7bd05d01e869211112bd339170e6b460f5b77b23f6928cbdf296c91afac
do_configure() {
cat <<-EOF >src/gn/last_commit_position.h
From 633455f9def453201d4b23f34059c120d3348326 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:47 +0100
Subject: [PATCH 2/2] chromium: update to 134.0.6998.35.
---
...-v8-monotonic-pthread-cont_timedwait.patch | 24 -------------------
srcpkgs/chromium/patches/sndio.patch | 10 ++++----
srcpkgs/chromium/template | 11 ++++++---
3 files changed, 13 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
diff --git a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
deleted file mode 100644
index 56a4ad1c807e55..00000000000000
--- a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Use monotonic clock for pthread_cond_timedwait with musl too.
-
-diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
-index 5ea7083..c13027e 100644
---- a/v8/src/base/platform/condition-variable.cc
-+++ b/v8/src/base/platform/condition-variable.cc
-@@ -16,7 +16,7 @@ namespace base {
-
- ConditionVariable::ConditionVariable() {
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- pthread_condattr_t attr;
-@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
- &native_handle_, &mutex->native_handle(), &ts);
- #else
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index 060865aa60e2a6..b240ac3fed1fd5 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -1,13 +1,13 @@
diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
---- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200
-+++ - 2024-09-19 19:44:06.486438185 +0200
-@@ -66,6 +66,7 @@
- "USE_CRAS=$use_cras",
+--- a/media/BUILD.gn
++++ b/media/BUILD.gn
+@@ -69,6 +69,7 @@
"USE_PROPRIETARY_CODECS=$proprietary_codecs",
"ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture",
+ "USE_OPENSLES=$media_use_opensles",
+ "USE_SNDIO=$use_sndio",
]
-
+
if (enable_library_cdms) {
diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c6c4f79502a3cb..1e6981246fb8ea 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=133.0.6943.53
+version=134.0.6998.35
revision=1
archs="i686* x86_64* aarch64* armv7l*"
_llvmver=19
@@ -31,7 +31,7 @@ license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"
#distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz"
-checksum=433c8891a3d717994b0e9544334491888e835a4b813354eefacae05489c23d01
+checksum=d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7
lib32disabled=yes
@@ -93,6 +93,10 @@ post_patch() {
mkdir -p third_party/node/linux/node-linux-x64/bin
rm -f third_party/node/linux/node-linux-x64/bin/node
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
+ # Rust 1.86 ships adler2 but we need to change it to adler when
+ # using older Rust versions (idea for this borrowed from Gentoo^WArch)
+ sed -i 's/adler2/adler/' build/rust/std/BUILD.gn
}
_setup_clang() {
@@ -230,7 +234,8 @@ do_configure() {
'use_system_harfbuzz=false'
'use_system_libffi=true'
- 'use_qt=false'
+ 'use_qt5=false'
+ 'use_qt6=false'
'use_cups=true'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 134.0.6998.35.
2025-03-08 22:04 [PR PATCH] [ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686 Duncaen
2025-03-09 3:02 ` [PR PATCH] [Updated] chromium: update to 134.0.6998.35 Duncaen
2025-03-09 15:57 ` Duncaen
@ 2025-03-09 23:59 ` Duncaen
2025-03-11 2:19 ` Duncaen
2025-03-11 2:20 ` [PR PATCH] [Merged]: " Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2025-03-09 23:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-134
https://github.com/void-linux/void-packages/pull/54630
chromium: update to 134.0.6998.35.
[ci skip]
* [x] x86_64-glibc
* [ ] x86_64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/54630.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-134-54630.patch --]
[-- Type: text/x-diff, Size: 5640 bytes --]
From 41102d4cf592996ed6e1e5af117a0effdf3605e4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:42 +0100
Subject: [PATCH 1/2] gn: update to 0.0.20250113.
---
srcpkgs/gn/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gn/template b/srcpkgs/gn/template
index 0c8795645f6362..bffada998f7e94 100644
--- a/srcpkgs/gn/template
+++ b/srcpkgs/gn/template
@@ -1,8 +1,8 @@
# Template file for 'gn'
pkgname=gn
-version=0.0.20240706
+version=0.0.20250113
revision=1
-_ref=b3a0bff47dd81073bfe67a402971bad92e4f2423
+_ref=ed1abc107815210dc66ec439542bee2f6cbabc00
create_wrksrc=yes
hostmakedepends="python3 ninja"
short_desc="Meta-build system that generates build files for Ninja"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://gn.googlesource.com/gn"
distfiles="https://gn.googlesource.com/gn/+archive/${_ref}.tar.gz"
-checksum=@6cc1aea3aaf370d5c4eee864baebebbf17a546e78800c4c068bb1a14a445ab8d
+checksum=7633c7bd05d01e869211112bd339170e6b460f5b77b23f6928cbdf296c91afac
do_configure() {
cat <<-EOF >src/gn/last_commit_position.h
From d1dd574f770ad6dc4eac715329c46a91d25ece4f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:47 +0100
Subject: [PATCH 2/2] chromium: update to 134.0.6998.35.
---
...-v8-monotonic-pthread-cont_timedwait.patch | 24 -------------------
srcpkgs/chromium/patches/sndio.patch | 10 ++++----
srcpkgs/chromium/template | 11 ++++++---
3 files changed, 13 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
diff --git a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
deleted file mode 100644
index 56a4ad1c807e55..00000000000000
--- a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Use monotonic clock for pthread_cond_timedwait with musl too.
-
-diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
-index 5ea7083..c13027e 100644
---- a/v8/src/base/platform/condition-variable.cc
-+++ b/v8/src/base/platform/condition-variable.cc
-@@ -16,7 +16,7 @@ namespace base {
-
- ConditionVariable::ConditionVariable() {
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- pthread_condattr_t attr;
-@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
- &native_handle_, &mutex->native_handle(), &ts);
- #else
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index 060865aa60e2a6..b240ac3fed1fd5 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -1,13 +1,13 @@
diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
---- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200
-+++ - 2024-09-19 19:44:06.486438185 +0200
-@@ -66,6 +66,7 @@
- "USE_CRAS=$use_cras",
+--- a/media/BUILD.gn
++++ b/media/BUILD.gn
+@@ -69,6 +69,7 @@
"USE_PROPRIETARY_CODECS=$proprietary_codecs",
"ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture",
+ "USE_OPENSLES=$media_use_opensles",
+ "USE_SNDIO=$use_sndio",
]
-
+
if (enable_library_cdms) {
diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c6c4f79502a3cb..1e6981246fb8ea 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=133.0.6943.53
+version=134.0.6998.35
revision=1
archs="i686* x86_64* aarch64* armv7l*"
_llvmver=19
@@ -31,7 +31,7 @@ license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"
#distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz"
-checksum=433c8891a3d717994b0e9544334491888e835a4b813354eefacae05489c23d01
+checksum=d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7
lib32disabled=yes
@@ -93,6 +93,10 @@ post_patch() {
mkdir -p third_party/node/linux/node-linux-x64/bin
rm -f third_party/node/linux/node-linux-x64/bin/node
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
+ # Rust 1.86 ships adler2 but we need to change it to adler when
+ # using older Rust versions (idea for this borrowed from Gentoo^WArch)
+ sed -i 's/adler2/adler/' build/rust/std/BUILD.gn
}
_setup_clang() {
@@ -230,7 +234,8 @@ do_configure() {
'use_system_harfbuzz=false'
'use_system_libffi=true'
- 'use_qt=false'
+ 'use_qt5=false'
+ 'use_qt6=false'
'use_cups=true'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 134.0.6998.35.
2025-03-08 22:04 [PR PATCH] [ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686 Duncaen
` (2 preceding siblings ...)
2025-03-09 23:59 ` Duncaen
@ 2025-03-11 2:19 ` Duncaen
2025-03-11 2:20 ` [PR PATCH] [Merged]: " Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2025-03-11 2:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 392 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-134
https://github.com/void-linux/void-packages/pull/54630
chromium: update to 134.0.6998.35.
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] i686
A patch file from https://github.com/void-linux/void-packages/pull/54630.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-134-54630.patch --]
[-- Type: text/x-diff, Size: 5640 bytes --]
From 4b432ff2f80ecee81f2f3aa339e0619af4c80c5b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:42 +0100
Subject: [PATCH 1/2] gn: update to 0.0.20250113.
---
srcpkgs/gn/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gn/template b/srcpkgs/gn/template
index 0c8795645f6362..bffada998f7e94 100644
--- a/srcpkgs/gn/template
+++ b/srcpkgs/gn/template
@@ -1,8 +1,8 @@
# Template file for 'gn'
pkgname=gn
-version=0.0.20240706
+version=0.0.20250113
revision=1
-_ref=b3a0bff47dd81073bfe67a402971bad92e4f2423
+_ref=ed1abc107815210dc66ec439542bee2f6cbabc00
create_wrksrc=yes
hostmakedepends="python3 ninja"
short_desc="Meta-build system that generates build files for Ninja"
@@ -10,7 +10,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://gn.googlesource.com/gn"
distfiles="https://gn.googlesource.com/gn/+archive/${_ref}.tar.gz"
-checksum=@6cc1aea3aaf370d5c4eee864baebebbf17a546e78800c4c068bb1a14a445ab8d
+checksum=7633c7bd05d01e869211112bd339170e6b460f5b77b23f6928cbdf296c91afac
do_configure() {
cat <<-EOF >src/gn/last_commit_position.h
From d7119e05e0aa3a5dcf3539d57d795e1e768fca5f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Sat, 8 Mar 2025 23:03:47 +0100
Subject: [PATCH 2/2] chromium: update to 134.0.6998.35.
---
...-v8-monotonic-pthread-cont_timedwait.patch | 24 -------------------
srcpkgs/chromium/patches/sndio.patch | 10 ++++----
srcpkgs/chromium/template | 11 ++++++---
3 files changed, 13 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
diff --git a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
deleted file mode 100644
index 56a4ad1c807e55..00000000000000
--- a/srcpkgs/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Use monotonic clock for pthread_cond_timedwait with musl too.
-
-diff --git a/v8/src/base/platform/condition-variable.cc b/v8/src/base/platform/condition-variable.cc
-index 5ea7083..c13027e 100644
---- a/v8/src/base/platform/condition-variable.cc
-+++ b/v8/src/base/platform/condition-variable.cc
-@@ -16,7 +16,7 @@ namespace base {
-
- ConditionVariable::ConditionVariable() {
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- pthread_condattr_t attr;
-@@ -92,7 +92,7 @@ bool ConditionVariable::WaitFor(Mutex* mutex, const TimeDelta& rel_time) {
- &native_handle_, &mutex->native_handle(), &ts);
- #else
- #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \
-- (V8_OS_LINUX && V8_LIBC_GLIBC))
-+ V8_OS_LINUX)
- // On Free/Net/OpenBSD and Linux with glibc we can change the time
- // source for pthread_cond_timedwait() to use the monotonic clock.
- result = clock_gettime(CLOCK_MONOTONIC, &ts);
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index 060865aa60e2a6..b240ac3fed1fd5 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -1,13 +1,13 @@
diff -Naur chromium-83.0.4103.97.orig/media/BUILD.gn chromium-83.0.4103.97/media/BUILD.gn
---- chromium-129.0.6668.58/media/BUILD.gn 2024-09-18 00:00:12.319230000 +0200
-+++ - 2024-09-19 19:44:06.486438185 +0200
-@@ -66,6 +66,7 @@
- "USE_CRAS=$use_cras",
+--- a/media/BUILD.gn
++++ b/media/BUILD.gn
+@@ -69,6 +69,7 @@
"USE_PROPRIETARY_CODECS=$proprietary_codecs",
"ENABLE_GPU_CHANNEL_MEDIA_CAPTURE=$enable_gpu_channel_media_capture",
+ "USE_OPENSLES=$media_use_opensles",
+ "USE_SNDIO=$use_sndio",
]
-
+
if (enable_library_cdms) {
diff -Naur chromium-83.0.4103.97.orig/media/audio/BUILD.gn chromium-83.0.4103.97/media/audio/BUILD.gn
--- a/media/audio/BUILD.gn 2020-06-03 20:39:37.000000000 +0200
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index c6c4f79502a3cb..1e6981246fb8ea 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=133.0.6943.53
+version=134.0.6998.35
revision=1
archs="i686* x86_64* aarch64* armv7l*"
_llvmver=19
@@ -31,7 +31,7 @@ license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz"
#distfiles="https://chromium-tarballs.distfiles.gentoo.org/chromium-${version}.tar.xz"
-checksum=433c8891a3d717994b0e9544334491888e835a4b813354eefacae05489c23d01
+checksum=d77f09bfa9bda8bbc4638ead83339d5ec52e39032c5a7047060dfdf94b767be7
lib32disabled=yes
@@ -93,6 +93,10 @@ post_patch() {
mkdir -p third_party/node/linux/node-linux-x64/bin
rm -f third_party/node/linux/node-linux-x64/bin/node
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+
+ # Rust 1.86 ships adler2 but we need to change it to adler when
+ # using older Rust versions (idea for this borrowed from Gentoo^WArch)
+ sed -i 's/adler2/adler/' build/rust/std/BUILD.gn
}
_setup_clang() {
@@ -230,7 +234,8 @@ do_configure() {
'use_system_harfbuzz=false'
'use_system_libffi=true'
- 'use_qt=false'
+ 'use_qt5=false'
+ 'use_qt6=false'
'use_cups=true'
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: chromium: update to 134.0.6998.35.
2025-03-08 22:04 [PR PATCH] [ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686 Duncaen
` (3 preceding siblings ...)
2025-03-11 2:19 ` Duncaen
@ 2025-03-11 2:20 ` Duncaen
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2025-03-11 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
There's a merged pull request on the void-packages repository
chromium: update to 134.0.6998.35.
https://github.com/void-linux/void-packages/pull/54630
Description:
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] i686
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2025-03-11 2:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-08 22:04 [PR PATCH] [ci skip] * [x] x86_64-glibc * [x] x86_64-musl * [x] i686 Duncaen
2025-03-09 3:02 ` [PR PATCH] [Updated] chromium: update to 134.0.6998.35 Duncaen
2025-03-09 15:57 ` Duncaen
2025-03-09 23:59 ` Duncaen
2025-03-11 2:19 ` Duncaen
2025-03-11 2:20 ` [PR PATCH] [Merged]: " Duncaen
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).