From 1121d9dbb6747c6282f3b8082168aa6404790960 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 4 Mar 2024 04:20:00 +0000 Subject: [PATCH 1/4] libopus: 1.4 -> 1.5.1 Changelog: https://gitlab.xiph.org/xiph/opus/-/releases/v1.5.1 --- pkgs/development/libraries/libopus/default.nix | 10 ++-------- .../libraries/libopus/test-timeout.patch | 15 ++++----------- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index b2b095f5607e..913f041df07b 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -16,23 +16,17 @@ stdenv.mkDerivation rec { pname = "libopus"; - version = "1.4"; + version = "1.5.1"; src = fetchurl { url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "sha256-ybMrQlO+WuY9H/Fu6ga5S18PKVG3oCrO71jjo85JxR8="; + hash = "sha256-uEYQlZuNQXthGqEqIlZeCjcyCXxjidGQmNhEVD40D4U="; }; patches = [ ./fix-pkg-config-paths.patch # Some tests time out easily on slower machines ./test-timeout.patch - # Fix meson build for arm64. Remove with next release - # https://gitlab.xiph.org/xiph/opus/-/merge_requests/59 - (fetchpatch { - url = "https://gitlab.xiph.org/xiph/opus/-/commit/20c032d27c59d65b19b8ffbb2608e5282fe817eb.patch"; - hash = "sha256-2pX+0ay5PTyHL2plameBX2L1Q4aTx7V7RGiTdhNIuE4="; - }) ]; postPatch = '' diff --git a/pkgs/development/libraries/libopus/test-timeout.patch b/pkgs/development/libraries/libopus/test-timeout.patch index e20f12cc1d54..76025e648d8f 100644 --- a/pkgs/development/libraries/libopus/test-timeout.patch +++ b/pkgs/development/libraries/libopus/test-timeout.patch @@ -1,16 +1,9 @@ -diff --git a/tests/meson.build b/tests/meson.build -index 5f3ac9d..74b2de7 100644 --- a/tests/meson.build +++ b/tests/meson.build -@@ -1,8 +1,8 @@ +@@ -1,6 +1,5 @@ # Tests that link to libopus opus_tests = [ - ['test_opus_api'], -- ['test_opus_decode', [], 60], -- ['test_opus_encode', 'opus_encode_regressions.c', 120], -+ ['test_opus_api', [], 60], -+ ['test_opus_decode', [], 120], -+ ['test_opus_encode', 'opus_encode_regressions.c', 240], - ['test_opus_padding'], - ['test_opus_projection'], - ] + ['test_opus_decode', [], 120], + ['test_opus_encode', 'opus_encode_regressions.c', 240], + ['test_opus_extensions', [], 120], From 3f801b7a6589226ce8086908e61fefe22208b3df Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 4 Mar 2024 04:20:00 +0000 Subject: [PATCH 2/4] libopus: use finalAttrs pattern --- pkgs/development/libraries/libopus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 913f041df07b..8d062e7f1a37 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -14,12 +14,12 @@ , ffmpeg-headless }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libopus"; version = "1.5.1"; src = fetchurl { - url = "https://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; + url = "https://downloads.xiph.org/releases/opus/opus-${finalAttrs.version}.tar.gz"; hash = "sha256-uEYQlZuNQXthGqEqIlZeCjcyCXxjidGQmNhEVD40D4U="; }; @@ -59,9 +59,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open, royalty-free, highly versatile audio codec"; homepage = "https://opus-codec.org/"; - changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${version}"; + changelog = "https://gitlab.xiph.org/xiph/opus/-/releases/v${finalAttrs.version}"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ ]; }; -} +}) From 3e6487310ea0aa2be7a0b83bb7c83a6d6188bc9e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 4 Mar 2024 04:20:00 +0000 Subject: [PATCH 3/4] libopus: add pkg-config tester --- pkgs/development/libraries/libopus/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 8d062e7f1a37..cb5af8608507 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -12,6 +12,7 @@ # tests , ffmpeg-headless +, testers }: stdenv.mkDerivation (finalAttrs: { @@ -54,6 +55,11 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { inherit ffmpeg-headless; + + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "opus" ]; + }; }; meta = with lib; { From a7c5d5178ef02da322bdf6857095b635812b7afd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 4 Mar 2024 04:20:00 +0000 Subject: [PATCH 4/4] libopus: add passthru.updateScript --- pkgs/development/libraries/libopus/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index cb5af8608507..3592c537ac44 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchpatch , fetchurl +, gitUpdater , meson , python3 , ninja @@ -53,12 +54,19 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.isi686 && !stdenv.isAarch32; # test_unit_LPC_inv_pred_gain fails - passthru.tests = { - inherit ffmpeg-headless; + passthru = { + updateScript = gitUpdater { + url = "https://gitlab.xiph.org/xiph/opus.git"; + rev-prefix = "v"; + }; - pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - moduleNames = [ "opus" ]; + tests = { + inherit ffmpeg-headless; + + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + moduleNames = [ "opus" ]; + }; }; };