Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[24.05] gst_all_1.*: 1.24.3 -> 1.24.10 #365245

Merged
merged 13 commits into from
Dec 24, 2024
49 changes: 49 additions & 0 deletions pkgs/development/libraries/gstreamer/bad/darwin-old-sdk-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
From 816f2ccad16413a4961a0001fc02d8874d4fde47 Mon Sep 17 00:00:00 2001
From: Alessandro Bono <[email protected]>
Date: Wed, 10 Jul 2024 15:33:34 +0200
Subject: [PATCH] vtdec: Use kVTVideoDecoderReferenceMissingErr only when
defined

The enum value is declared present since macOS 10.8+[1]. Howerver,
the compilation now fails with the 10.15 SDK:
```
../sys/applemedia/vtdec.c:1219:12: error: use of undeclared identifier 'kVTVideoDecoderReferenceMissingErr'; did you mean 'kVTVideoDecoderMalfunctionErr'?
case kVTVideoDecoderReferenceMissingErr:
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
kVTVideoDecoderMalfunctionErr
/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/System/Library/Frameworks/VideoToolbox.framework/Headers/VTErrors.h:40:2: note: 'kVTVideoDecoderMalfunctionErr' declared here
kVTVideoDecoderMalfunctionErr = -12911, // c.f. -8960
^
1 error generated.
```

Put the enum usage under #ifdef. When missing, the behavior will be
the same as before commit a5c437c6430cdce603e46e09400beb4c5b9f5374.

[1] https://developer.apple.com/documentation/videotoolbox/kvtvideodecoderreferencemissingerr?language=objc
---
sys/applemedia/vtdec.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/sys/applemedia/vtdec.c b/sys/applemedia/vtdec.c
index 57fcbf9928a5..517c15365b52 100644
--- a/sys/applemedia/vtdec.c
+++ b/sys/applemedia/vtdec.c
@@ -1216,12 +1216,14 @@ gst_vtdec_session_output_callback (void *decompression_output_ref_con,

if (status != noErr) {
switch (status) {
+#ifdef kVTVideoDecoderReferenceMissingErr
case kVTVideoDecoderReferenceMissingErr:
/* ReferenceMissingErr is not critical, when it occurs the frame
* usually has the kVTDecodeInfo_FrameDropped flag set. Log only for debugging purposes. */
GST_DEBUG_OBJECT (vtdec, "ReferenceMissingErr when decoding frame %d",
frame->decode_frame_number);
break;
+#endif
#ifndef HAVE_IOS
case codecBadDataErr: /* SW decoder on macOS uses a different code from the hardware one... */
#endif
--
GitLab

9 changes: 7 additions & 2 deletions pkgs/development/libraries/gstreamer/bad/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,13 @@

stdenv.mkDerivation rec {
pname = "gst-plugins-bad";
version = "1.24.3";
version = "1.24.10";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-6Q8mx9ycdvSqWZt1jP1tjBDWoLnLJluiw8m984iFWPg=";
hash = "sha256-FwfjEDlQybrtNkqK8roEldaxE/zTbhBi3aX1grj4kE0=";
};

patches = [
Expand All @@ -127,6 +127,11 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit (addOpenGLRunpath) driverLink;
})

# vtdec: Use kVTVideoDecoderReferenceMissingErr only when defined
# <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7157>
# TODO: Remove this when the build with the newer SDK works.
./darwin-old-sdk-fix.patch
];

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/base/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@

stdenv.mkDerivation (finalAttrs: {
pname = "gst-plugins-base";
version = "1.24.3";
version = "1.24.10";

outputs = [ "out" "dev" ];

src = let
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-8QlDl+qnky8G5X67sHWqM6osduS3VjChawLI1K9Ggy4=";
hash = "sha256-69V7G+kkxuJPMn3VW6udj7quvl4dyPynhBgqsrEtI+s=";
};

strictDeps = true;
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/core/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

stdenv.mkDerivation (finalAttrs: {
pname = "gstreamer";
version = "1.24.3";
version = "1.24.10";

outputs = [
"bin"
Expand All @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-EiXvSjKfrhytxexyfaskmtVn6AcoeUk1Yc65HtNKpBQ=";
hash = "sha256-n8RbGjMuj4EvCelcKBzXWWn20WgtBiqBXbDnvAR1GP0=";
};

depsBuildBuild = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/devtools/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

stdenv.mkDerivation rec {
pname = "gst-devtools";
version = "1.24.3";
version = "1.24.10";

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-uREUov2Vj0Ks9EEYbofivsk1OO81qfgkgREZc2D/sjc=";
hash = "sha256-KYNTcUiwqNUrrSo/TJ3MqAj9WqEvzO4lrMSkJ38HgOw=";
};

outputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/ges/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

stdenv.mkDerivation rec {
pname = "gst-editing-services";
version = "1.24.3";
version = "1.24.10";

outputs = [
"out"
Expand All @@ -27,7 +27,7 @@ stdenv.mkDerivation rec {

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-z3QyFWiLATkFzSyff+3aIeLTTIRDQJkMbqJdEKA3KT8=";
hash = "sha256-bwCxG05eNMKjLWTfUh3Kd1GdYm/MXjhjwCGL0SNn4XQ=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/good/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ assert raspiCameraSupport -> (stdenv.isLinux && stdenv.isAarch32);

stdenv.mkDerivation rec {
pname = "gst-plugins-good";
version = "1.24.3";
version = "1.24.10";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-FQ+RTmHcBWALaLiMoQPHzCJxMBWOOJ6p6hWfQFCi67A=";
hash = "sha256-/OdI+mbXqO4fsmFInlnQHj+nh2I9bVw1BoQW/nzQrLM=";
};

patches = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/libav/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

stdenv.mkDerivation rec {
pname = "gst-libav";
version = "1.24.3";
version = "1.24.10";

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-2cWxUkaKRcH6g1FBBCIJCnGScHrXTS4aQ2f1JU4YjZE=";
hash = "sha256-TPLi2CBOVLqK+VGai5t/+m6VGnCHr6Df6DwSXUm7tfs=";
};

outputs = [ "out" "dev" ];
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/rtsp-server/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@

stdenv.mkDerivation rec {
pname = "gst-rtsp-server";
version = "1.24.3";
version = "1.24.10";

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-YmKOzKeLj1tRxZpNYCxl6SBf/FDDyDzWH6sfY0i2NWU=";
hash = "sha256-2yHf3Xvy5xhWTVVzeK2lNYtBHv4qPonp8Ph6dFN+Ktw=";
};

outputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/ugly/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

stdenv.mkDerivation rec {
pname = "gst-plugins-ugly";
version = "1.24.3";
version = "1.24.10";

outputs = [ "out" "dev" ];

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-TJUTQcTGSGMLb+EjTsET2B3S0khSm/K1R44K0HfIDtM=";
hash = "sha256-nfb9haclYkHvuyX4SzN1deOzRSZvXas4STceRpR3nxg=";
};

nativeBuildInputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/libraries/gstreamer/vaapi/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@

stdenv.mkDerivation rec {
pname = "gstreamer-vaapi";
version = "1.24.3";
version = "1.24.10";

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/${pname}/${pname}-${version}.tar.xz";
hash = "sha256-hF8u/g3KjasjTd6PsJHaLNBqnSpoNCK1bctoiVT5Bw4=";
hash = "sha256-IVk9veXGvNz+mRld7748P02gHLhfjsEKrpQ4h9Odikw=";
};

outputs = [
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/gst-python/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

buildPythonPackage rec {
pname = "gst-python";
version = "1.24.3";
version = "1.24.10";

format = "other";

Expand All @@ -26,7 +26,7 @@ buildPythonPackage rec {

src = fetchurl {
url = "https://gstreamer.freedesktop.org/src/gst-python/${pname}-${version}.tar.xz";
hash = "sha256-7Ns+K6lOosgrk6jHFdWn4E+XJqiDjAprF2lJKP0ehZU=";
hash = "sha256-E1vPi28UaLwx5WYECf6O04EJ8B3sRHQ1FKovprOGMwk";
};

# Python 2.x is not supported.
Expand Down
Loading