From nobody Sun Apr 13 20:22:37 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZbMKp0w5Sz5sdb0; Sun, 13 Apr 2025 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZbMKp0CxTz3tTT; Sun, 13 Apr 2025 20:22:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744575758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3JYPesubFrBs1SpVLeg7N51pTnBiYo7XHxRp2n9bdbw=; b=M8ZVlmzrZVFNFMKDP612yMKW1BET5V+DYE3xyuCxgyROxVoHyhhQO309iVZ2UH9O3T/a9H RkcHql2QZAw3pHAq/oLihdiEj/iS4eUpYD8DDJXNASH0kE8rBTOB5+E6wT+hZ1RfWmOdkD Wx4Otfmj7oliBk2FxWl/ZiuWhS76kllHs3HK+b5QaLhQwVZdpOQ6SO4IYbSDs2fCl+1rkf bFEecOs8YqRjXtPYkU+/YakKBJqt+Gj84kv+xe5YSxnZI39URcdwMNZ1gFEhD9idFNtkp4 qAw3GYNXRRl7SoHN5lC8puvpsPo3D2+b0criOuWdfxGm7cvGABIsiuOuv8pUJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744575758; a=rsa-sha256; cv=none; b=Q3WHJxyo5kTNPAcD0qhullXh/31ZCyMIQXXyAvl3DIT51/a2VqtKUh2dEtDr9SYaaZ7DQX qSJF1oQJ1FHp8Z7vCGc4tiHMzuy8UkadY4HF55NBKKc9WkjlBRsbZkD+V+WcDWeQaRQsPY OI/D8jigoJ67tr9q5+qhZMnCsYlWDdqWyR1D4p/I7Imv46TmexwqDWju7SmJprjvqpEA0p WF1U6e09kVocerEQgunT0AJia/OqAvq+bLZeoKUyZRHz11vxDxSJQLw6Owubmy9vjDy8TH FnoYIwRgCDySBO/CY8Wo+6Z1y5vN7jz/LcZQsdfL2/M+kJpD3WU4yPsfS0F64g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744575758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3JYPesubFrBs1SpVLeg7N51pTnBiYo7XHxRp2n9bdbw=; b=H5l8BRUuejuQoaYSy3x8IAjnausVMr06TbrQ0suvvw1sFRzyxtkwfhSvCrFM2YFMdoz82Q 75a6iQmdCt5mTCCJS23zKMEkLsxZEsc4sa7xrP5RMde5AtrxxFdhZuWo7LHl52r8n6/Yta LQ2BAZi2QFieN9WjhoHXovYa04qNY80kDNfpNNa1fhU5Df5bK5SsyAHaWPQrsus7skmf07 Ia0lVWw6v6gY/TMMrshA1aUlRlqLoaECvD0wU6dzT0/v2/S961/AHCRis0zsTJ/XJJtmIj fXytxW4i792keF0k1Lc/ajUcBesGQv4ePb////smgHEeDUcVvLDDw91ZHhGW7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZbMKn6hb9z39r; Sun, 13 Apr 2025 20:22:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53DKMbCs051675; Sun, 13 Apr 2025 20:22:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53DKMbvf051672; Sun, 13 Apr 2025 20:22:37 GMT (envelope-from git) Date: Sun, 13 Apr 2025 20:22:37 GMT Message-Id: <202504132022.53DKMbvf051672@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: b60be1185c1b - main - audio/shortwave: Add missing patches from last commit List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b60be1185c1b413104884c01b31949f0adb8adb0 Auto-Submitted: auto-generated The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=b60be1185c1b413104884c01b31949f0adb8adb0 commit b60be1185c1b413104884c01b31949f0adb8adb0 Author: Bernhard Froehlich AuthorDate: 2025-04-13 20:21:57 +0000 Commit: Bernhard Froehlich CommitDate: 2025-04-13 20:21:57 +0000 audio/shortwave: Add missing patches from last commit --- audio/shortwave/files/patch-Cargo.toml | 10 ++++++ audio/shortwave/files/patch-meson.build | 15 ++++++++ .../shortwave/files/patch-src_api_cover__loader.rs | 40 ++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/audio/shortwave/files/patch-Cargo.toml b/audio/shortwave/files/patch-Cargo.toml new file mode 100644 index 000000000000..48ac761b7f66 --- /dev/null +++ b/audio/shortwave/files/patch-Cargo.toml @@ -0,0 +1,10 @@ +--- Cargo.toml.orig 2025-02-05 10:44:30 UTC ++++ Cargo.toml +@@ -17,7 +17,6 @@ futures-util = "0.3" + diesel = { version = "2.2", features = ["sqlite", "r2d2"] } + diesel_migrations = "2.2" + futures-util = "0.3" +-glycin = { version = "2.0", features = ["gdk4"] } + indexmap = "2.7" + Inflector = "0.11" + language-tags = "0.3" diff --git a/audio/shortwave/files/patch-meson.build b/audio/shortwave/files/patch-meson.build new file mode 100644 index 000000000000..f8c9ae7d237a --- /dev/null +++ b/audio/shortwave/files/patch-meson.build @@ -0,0 +1,15 @@ +--- meson.build.orig 2025-02-05 10:44:30 UTC ++++ meson.build +@@ -19,8 +19,10 @@ dependency('shumate-1.0', version: '>= 1.3') + dependency('shumate-1.0', version: '>= 1.3') + + # Required by glycin crate +-dependency('lcms2', version: '>= 2.12.0') +-dependency('libseccomp', version: '>= 2.5.0') ++if host_machine.system() == 'linux' ++ dependency('lcms2', version: '>= 2.12.0') ++ dependency('libseccomp', version: '>= 2.5.0') ++endif + + dependency('gstreamer-1.0', version: '>= 1.16') + dependency('gstreamer-base-1.0', version: '>= 1.16') diff --git a/audio/shortwave/files/patch-src_api_cover__loader.rs b/audio/shortwave/files/patch-src_api_cover__loader.rs new file mode 100644 index 000000000000..cb4f3baf003e --- /dev/null +++ b/audio/shortwave/files/patch-src_api_cover__loader.rs @@ -0,0 +1,40 @@ +--- src/api/cover_loader.rs.orig 2025-02-05 10:44:30 UTC ++++ src/api/cover_loader.rs +@@ -22,7 +22,6 @@ use gdk::RGBA; + use async_compat::CompatExt; + use futures_util::StreamExt; + use gdk::RGBA; +-use glycin::Loader; + use gtk::gio::{Cancelled, File}; + use gtk::graphene::Rect; + use gtk::prelude::TextureExt; +@@ -88,9 +87,7 @@ impl CoverRequest { + async fn cover_bytes(&self) -> Result<(gdk::Texture, Vec)> { + self.download_tmp_file().compat().await?; + +- let loader = Loader::new(self.tmp_file.clone()); +- let image = loader.load().await?; +- let texture = image.next_frame().await?.texture(); ++ let texture = Self::load_texture(&self.tmp_file).await?; + + let snapshot = gtk::Snapshot::new(); + snapshot_thumbnail(&snapshot, texture, self.size as f32); +@@ -106,6 +103,18 @@ impl CoverRequest { + + let png_bytes = texture.save_to_png_bytes().to_vec(); + Ok((texture, png_bytes)) ++ } ++ ++ #[cfg(target_os = "linux")] ++ async fn load_texture(file: &gio::File) -> Result { ++ let loader = glycin::Loader::new(file.clone()); ++ let image = loader.load().await?; ++ Ok(image.next_frame().await?.texture()) ++ } ++ ++ #[cfg(target_os = "freebsd")] ++ async fn load_texture(file: &gio::File) -> Result { ++ Ok(gdk::Texture::from_file(file)?) + } + + async fn download_tmp_file(&self) -> Result<()> {