Skip to content
Snippets Groups Projects
Commit e528298b authored by Jan Beich's avatar Jan Beich
Browse files

multimedia/helvum: update to 0.4.0

Changes:	https://gitlab.freedesktop.org/pipewire/helvum/-/releases/0.4.0
Reported by:	GitLab (notify releases)
parent 3199ade1
No related branches found
No related tags found
No related merge requests found
PORTNAME= helvum
DISTVERSION= 0.3.4
PORTREVISION= 11
DISTVERSION= 0.4.0
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
......@@ -18,7 +17,7 @@ USE_GITLAB= yes
USE_GNOME= cairo gtk40
GL_SITE= https://gitlab.freedesktop.org
GL_ACCOUNT= ryuukyu
GL_COMMIT= 094681637ec8f9f2acdb993230e10da88aa3fedb
GL_COMMIT= 69257ffa09e9ac844d22d85e288b97ac98b37665
MAKE_ENV= ${CARGO_ENV}
PLIST_FILES= bin/${PORTNAME}
......
CARGO_CRATES= aho-corasick-0.7.15 \
ansi_term-0.12.1 \
anyhow-1.0.53 \
arrayvec-0.5.2 \
atty-0.2.14 \
autocfg-1.0.1 \
bindgen-0.59.2 \
CARGO_CRATES= anyhow-1.0.69 \
autocfg-1.1.0 \
bindgen-0.64.0 \
bitflags-1.3.2 \
bitvec-0.19.6 \
cairo-rs-0.15.1 \
cairo-sys-rs-0.15.1 \
cc-1.0.72 \
cairo-rs-0.17.0 \
cairo-sys-rs-0.17.0 \
cc-1.0.79 \
cexpr-0.6.0 \
cfg-expr-0.8.1 \
cfg-expr-0.9.1 \
cfg-if-0.1.10 \
cfg-expr-0.11.0 \
cfg-if-1.0.0 \
clang-sys-1.3.0 \
clap-2.34.0 \
clang-sys-1.4.0 \
cookie-factory-0.3.2 \
either-1.6.1 \
env_logger-0.9.0 \
errno-0.2.8 \
errno-0.3.0 \
errno-dragonfly-0.1.2 \
field-offset-0.3.4 \
funty-1.1.0 \
futures-channel-0.3.19 \
futures-core-0.3.19 \
futures-executor-0.3.19 \
futures-io-0.3.19 \
futures-task-0.3.19 \
futures-util-0.3.19 \
gdk-pixbuf-0.15.4 \
gdk-pixbuf-sys-0.15.1 \
gdk4-0.4.6 \
gdk4-sys-0.4.2 \
gio-0.15.4 \
gio-sys-0.15.4 \
glib-0.15.4 \
glib-macros-0.15.3 \
glib-sys-0.15.4 \
glob-0.3.0 \
gobject-sys-0.15.1 \
graphene-rs-0.15.1 \
graphene-sys-0.15.1 \
gsk4-0.4.6 \
gsk4-sys-0.4.2 \
gtk4-0.4.6 \
gtk4-macros-0.4.3 \
gtk4-sys-0.4.5 \
heck-0.3.3 \
heck-0.4.0 \
hermit-abi-0.1.19 \
humantime-2.1.0 \
itertools-0.10.3 \
futures-channel-0.3.26 \
futures-core-0.3.26 \
futures-executor-0.3.26 \
futures-io-0.3.26 \
futures-macro-0.3.26 \
futures-task-0.3.26 \
futures-util-0.3.26 \
gdk-pixbuf-0.17.0 \
gdk-pixbuf-sys-0.17.0 \
gdk4-0.6.0 \
gdk4-sys-0.6.0 \
gio-0.17.0 \
gio-sys-0.17.0 \
glib-0.17.0 \
glib-macros-0.17.0 \
glib-sys-0.17.0 \
glob-0.3.1 \
gobject-sys-0.17.0 \
graphene-rs-0.17.0 \
graphene-sys-0.17.0 \
gsk4-0.6.0 \
gsk4-sys-0.6.0 \
gtk4-0.6.0 \
gtk4-macros-0.6.0 \
gtk4-sys-0.6.0 \
hashbrown-0.12.3 \
heck-0.4.1 \
indexmap-1.9.2 \
lazy_static-1.4.0 \
lazycell-1.3.0 \
lexical-core-0.7.6 \
libc-0.2.116 \
libloading-0.7.3 \
libspa-0.4.1 \
libspa-sys-0.4.1 \
log-0.4.14 \
memchr-2.3.4 \
libc-0.2.139 \
libspa-0.6.0 \
libspa-sys-0.6.0 \
log-0.4.17 \
memchr-2.5.0 \
memoffset-0.6.5 \
memoffset-0.7.1 \
minimal-lexical-0.2.1 \
nix-0.14.1 \
nom-6.2.1 \
nom-7.1.0 \
once_cell-1.9.0 \
pango-0.15.2 \
pango-sys-0.15.1 \
nix-0.26.2 \
nom-7.1.3 \
nom8-0.2.0 \
once_cell-1.17.0 \
pango-0.17.0 \
pango-sys-0.17.0 \
peeking_take_while-0.1.2 \
pest-2.1.3 \
pin-project-lite-0.2.8 \
pest-2.5.5 \
pin-project-lite-0.2.9 \
pin-utils-0.1.0 \
pipewire-0.4.1 \
pipewire-sys-0.4.1 \
pkg-config-0.3.24 \
proc-macro-crate-1.1.0 \
pipewire-0.6.0 \
pipewire-sys-0.6.0 \
pkg-config-0.3.26 \
proc-macro-crate-1.3.0 \
proc-macro-error-1.0.4 \
proc-macro-error-attr-1.0.4 \
proc-macro2-1.0.36 \
quote-1.0.15 \
radium-0.5.3 \
regex-1.4.6 \
regex-syntax-0.6.25 \
proc-macro2-1.0.51 \
quote-1.0.23 \
regex-1.7.1 \
regex-syntax-0.6.28 \
rustc-hash-1.1.0 \
rustc_version-0.3.3 \
ryu-1.0.9 \
semver-0.11.0 \
semver-parser-0.10.2 \
serde-1.0.136 \
serde-1.0.152 \
shlex-1.1.0 \
signal-0.7.0 \
slab-0.4.5 \
smallvec-1.8.0 \
slab-0.4.7 \
smallvec-1.10.0 \
static_assertions-1.1.0 \
strsim-0.8.0 \
strum-0.21.0 \
strum_macros-0.21.1 \
syn-1.0.86 \
system-deps-3.2.0 \
system-deps-6.0.1 \
tap-1.0.1 \
termcolor-1.1.2 \
textwrap-0.11.0 \
thiserror-1.0.30 \
thiserror-impl-1.0.30 \
toml-0.5.8 \
ucd-trie-0.1.3 \
unicode-segmentation-1.8.0 \
unicode-width-0.1.9 \
unicode-xid-0.2.2 \
vec_map-0.8.2 \
version-compare-0.0.11 \
version-compare-0.1.0 \
syn-1.0.107 \
system-deps-6.0.3 \
thiserror-1.0.38 \
thiserror-impl-1.0.38 \
toml-0.5.11 \
toml_datetime-0.5.1 \
toml_edit-0.18.1 \
ucd-trie-0.1.5 \
unicode-ident-1.0.6 \
version-compare-0.1.1 \
version_check-0.9.4 \
void-1.0.2 \
which-4.2.4 \
winapi-0.3.9 \
winapi-i686-pc-windows-gnu-0.4.0 \
winapi-util-0.1.5 \
winapi-x86_64-pc-windows-gnu-0.4.0 \
wyz-0.2.0
windows-sys-0.45.0 \
windows-targets-0.42.1 \
windows_aarch64_gnullvm-0.42.1 \
windows_aarch64_msvc-0.42.1 \
windows_i686_gnu-0.42.1 \
windows_i686_msvc-0.42.1 \
windows_x86_64_gnu-0.42.1 \
windows_x86_64_gnullvm-0.42.1 \
windows_x86_64_msvc-0.42.1
This diff is collapsed.
https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/merge_requests/108
error[E0277]: the trait bound `i32: From<u32>` is not satisfied
--> cargo-crates/pipewire-0.4.1/src/loop_.rs:414:50
|
414 | tv_nsec: duration.subsec_nanos().into(),
| ^^^^ the trait `From<u32>` is not implemented for `i32`
|
= help: the following implementations were found:
<i32 as From<NonZeroI32>>
<i32 as From<bool>>
<i32 as From<i16>>
<i32 as From<i8>>
and 3 others
= note: required because of the requirements on the impl of `Into<i32>` for `u32`
--- cargo-crates/pipewire-0.4.1/src/loop_.rs.orig 1973-11-29 21:33:09 UTC
+++ cargo-crates/pipewire-0.4.1/src/loop_.rs
@@ -411,7 +411,7 @@ where
fn duration_to_timespec(duration: Duration) -> spa_sys::timespec {
spa_sys::timespec {
tv_sec: duration.as_secs().try_into().expect("Duration too long"),
- tv_nsec: duration.subsec_nanos().into(),
+ tv_nsec: duration.subsec_nanos() as libc::c_long,
}
}
https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/commit/f1dd2f9f3086
error[E0425]: cannot find function `eventfd` in crate `libc`
--> cargo-crates/pipewire-0.4.1/src/channel.rs:220:34
|
220 | let eventfd = unsafe { libc::eventfd(0, libc::EFD_CLOEXEC) };
| ^^^^^^^ not found in `libc`
--- cargo-crates/pipewire-0.4.1/src/channel.rs.orig 1973-11-29 21:33:09 UTC
+++ cargo-crates/pipewire-0.4.1/src/channel.rs
@@ -217,7 +217,17 @@ where
{
// Manually open an eventfd that we can use to signal the loop thread to check for messages
// via an IoSource.
+ #[cfg(target_os = "linux")]
let eventfd = unsafe { libc::eventfd(0, libc::EFD_CLOEXEC) };
+ #[cfg(target_os = "freebsd")]
+ let eventfd = {
+ // Added in FreeBSD 13, libc crate doesn't target that yet
+ use std::os::raw::{c_int, c_uint};
+ extern "C" {
+ pub fn eventfd(name: c_uint, flags: c_int) -> c_int;
+ }
+ unsafe { eventfd(0, 0x00100000) }
+ };
if eventfd == -1 {
panic!("Failed to create eventfd: {}", errno::errno())
}
......@@ -14,9 +14,9 @@ error[E0425]: cannot find function `pw_deinit` in crate `pw_sys`
165 | pw_sys::pw_deinit()
| ^^^^^^^^^ not found in `pw_sys`
--- cargo-crates/pipewire-0.4.1/src/lib.rs.orig 1973-11-29 21:33:09 UTC
+++ cargo-crates/pipewire-0.4.1/src/lib.rs
@@ -153,7 +153,7 @@ pub mod prelude {
--- cargo-crates/pipewire-0.6.0/src/lib.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/pipewire-0.6.0/src/lib.rs
@@ -154,7 +154,7 @@ pub fn init() {
pub fn init() {
use once_cell::sync::OnceCell;
static INITIALIZED: OnceCell<()> = OnceCell::new();
......@@ -25,7 +25,7 @@ error[E0425]: cannot find function `pw_deinit` in crate `pw_sys`
}
/// Deinitialize PipeWire
@@ -162,7 +162,7 @@ pub fn init() {
@@ -163,7 +163,7 @@ pub unsafe fn deinit() {
/// This must only be called once during the lifetime of the process, once no PipeWire threads
/// are running anymore and all PipeWire resources are released.
pub unsafe fn deinit() {
......@@ -34,8 +34,8 @@ error[E0425]: cannot find function `pw_deinit` in crate `pw_sys`
}
#[cfg(test)]
--- cargo-crates/pipewire-sys-0.4.1/build.rs.orig 1973-11-29 21:33:09 UTC
+++ cargo-crates/pipewire-sys-0.4.1/build.rs
--- cargo-crates/pipewire-sys-0.6.0/build.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/pipewire-sys-0.6.0/build.rs
@@ -19,6 +19,7 @@ fn main() {
// included header files changed.
.parse_callbacks(Box::new(bindgen::CargoCallbacks))
......@@ -44,8 +44,8 @@ error[E0425]: cannot find function `pw_deinit` in crate `pw_sys`
.allowlist_function("pw_.*")
.allowlist_type("pw_.*")
.allowlist_var("pw_.*")
--- cargo-crates/pipewire-sys-0.4.1/src/lib.rs.orig 1973-11-29 21:33:09 UTC
+++ cargo-crates/pipewire-sys-0.4.1/src/lib.rs
--- cargo-crates/pipewire-sys-0.6.0/src/lib.rs.orig 2006-07-24 01:21:28 UTC
+++ cargo-crates/pipewire-sys-0.6.0/src/lib.rs
@@ -20,8 +20,8 @@ mod tests {
#[test]
fn init() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment