diff --git a/pkgs/by-name/or/orc/package.nix b/pkgs/by-name/or/orc/package.nix index ff7b71fbb4a8..4373c742ec9c 100644 --- a/pkgs/by-name/or/orc/package.nix +++ b/pkgs/by-name/or/orc/package.nix @@ -4,10 +4,10 @@ fetchurl, meson, ninja, - file, - docbook-xsl-nons, - gtk-doc ? null, - buildDevDoc ? gtk-doc != null, + # FIXME: hotdoc errors out due to issues discovering libclang paths + # See https://github.com/NixOS/nixpkgs/issues/514723 + hotdoc, + buildDevDoc ? false, # for passthru.tests gnuradio, @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "orc"; - version = "0.4.41"; + version = "0.4.42"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/orc/orc-${finalAttrs.version}.tar.xz"; - hash = "sha256-yxv9T2VSic05vARkLVl76d5UJ2I/CGHB/BnAjZhGf6I="; + hash = "sha256-fskSq1mvPMl4dMRWpWqK4e7FIMOF7ER+ihArK9EiyQw="; }; postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) '' @@ -38,7 +38,10 @@ stdenv.mkDerivation (finalAttrs: { ''; mesonFlags = [ - (lib.mesonEnable "gtk_doc" buildDevDoc) + (lib.mesonEnable "examples" false) + (lib.mesonEnable "benchmarks" false) + (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck) + (lib.mesonEnable "hotdoc" buildDevDoc) ]; nativeBuildInputs = [ @@ -46,9 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ninja ] ++ lib.optionals buildDevDoc [ - gtk-doc - file - docbook-xsl-nons + hotdoc ]; # https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41 @@ -77,6 +78,6 @@ stdenv.mkDerivation (finalAttrs: { bsd2 ]; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tmarkus ]; }; }) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 1b704e101443..a29f2edff208 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-bad"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${finalAttrs.version}.tar.xz"; - hash = "sha256-EQ+4J5Xw5Wmx4nsSq5aZ01x3YuH/TblTNdasjRRCrz0="; + hash = "sha256-MytzIPMMYPLVlBRG0DudBeN4HywlYb776IcYvXd/Dkc="; }; patches = [ @@ -134,6 +134,12 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + separateDebugInfo = true; + + __structuredAttrs = true; + # Argument list too long + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -311,6 +317,7 @@ stdenv.mkDerivation (finalAttrs: { "-Dwasapi=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwasapi2=disabled" # not packaged in nixpkgs as of writing / no Windows support "-Dwpe=disabled" # required `wpe-webkit` library not packaged in nixpkgs as of writing + "-Dwpe2=disabled" "-Dgs=disabled" # depends on `google-cloud-cpp` "-Donnx=disabled" # depends on `libonnxruntime` not packaged in nixpkgs as of writing "-Dopenaptx=enabled" # since gstreamer-1.20.1 `libfreeaptx` is supported for circumventing the dubious license conflict with `libopenaptx` @@ -326,6 +333,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "webrtcdsp" webrtcAudioProcessingSupport) (lib.mesonEnable "isac" webrtcAudioProcessingSupport) ] + ++ lib.mapAttrsToList lib.mesonEnable { + mpeghdec = false; # mpeghdec not packaged + tflite = false; + } ++ lib.optionals (!stdenv.hostPlatform.isLinux) [ "-Ddoc=disabled" # needs gstcuda to be enabled which is Linux-only ] @@ -385,9 +396,6 @@ stdenv.mkDerivation (finalAttrs: { ] ); - # Argument list too long - strictDeps = true; - postPatch = '' patchShebangs \ scripts/extract-release-date-from-doap-file.py @@ -416,7 +424,7 @@ stdenv.mkDerivation (finalAttrs: { }; }; - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 6b1b2671e381..a2a478c76ff2 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-base"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -61,9 +61,10 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${finalAttrs.version}.tar.xz"; - hash = "sha256-/FD4hdQfXQQHzgh27HI12ee4LUjbL0vHLF8kSkrHkmM="; + hash = "sha256-qJiv1XZhcrAEnmeBVY4GiQmL+HudgrhGxlLlccAdYNg="; }; + __structuredAttrs = true; strictDeps = true; depsBuildBuild = [ pkg-config @@ -190,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { glEnabled = enableGl; waylandEnabled = enableWayland; - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 05409199e303..d50923558017 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gstreamer"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "bin" @@ -52,13 +52,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${finalAttrs.version}.tar.xz"; - hash = "sha256-LgvRktBDjqYGpvdqlcjhZUIWdlb/7Cwrw6r27gg3+/Y="; + hash = "sha256-9a3H6PRIwQJgs7JaoQHJ1UBnTI2aVMK3eobQTys7UN0="; }; depsBuildBuild = [ pkg-config ]; + __structuredAttrs = true; strictDeps = true; nativeBuildInputs = [ meson @@ -144,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: { tests = { pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/libraries/gstreamer/devtools/default.nix b/pkgs/development/libraries/gstreamer/devtools/default.nix index d9c788cfdd59..e856bd59b233 100644 --- a/pkgs/development/libraries/gstreamer/devtools/default.nix +++ b/pkgs/development/libraries/gstreamer/devtools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-devtools"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-devtools/gst-devtools-${finalAttrs.version}.tar.xz"; - hash = "sha256-Vl9IU4jJSYr+v3gAQYPN/xATEhEoZBqlbtql6pRBK+I="; + hash = "sha256-EdTxGIY506l2IDkGW7t7LDCbeo7Mb6Su0SJFVovwDbM="; }; cargoDeps = rustPlatform.fetchCargoVendor { @@ -46,9 +46,14 @@ stdenv.mkDerivation (finalAttrs: { cargoRoot ; name = "gst-devtools-${finalAttrs.version}"; - hash = "sha256-sqN1IBkbrT3pQqUQKU2pr8G1t4kNMKk0NR7NH7dTvAE="; + hash = "sha256-5VYzDwAMyVN2HR/sS8rCwTR7UW/tt60AS7wZMjx+w74="; }; + separateDebugInfo = true; + + __structuredAttrs = true; + strictDeps = true; + depsBuildBuild = [ pkg-config ]; @@ -91,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = let - updateSource = directoryListingUpdater { }; + updateSource = directoryListingUpdater { odd-unstable = true; }; updateLockfile = { command = [ diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 743c0e475e9a..e41fa069923b 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-editing-services"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -32,9 +32,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${finalAttrs.version}.tar.xz"; - hash = "sha256-o26HkAtErBYIYS8tYW/AMvnX2SAyfE0jGv+2/pNJcU0="; + hash = "sha256-b361Xlhxjd5bWGn2Ge2Q6/Owz6A3bBacG4P8dzgRkUo="; }; + separateDebugInfo = true; + + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -78,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 9c531daf1486..4a689f5d82c7 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -78,7 +78,7 @@ assert raspiCameraSupport -> hostSupportsRaspiCamera; stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-good"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${finalAttrs.version}.tar.xz"; - hash = "sha256-AB3rCHbV10PNNEir90onrew/2FABL8sbAJlIYb1sEUU="; + hash = "sha256-yCXqc3xZzqDkoMQdojiARf9d0y0WIiCsk6eoLuSgTmE="; }; patches = [ @@ -97,6 +97,9 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + separateDebugInfo = true; + + __structuredAttrs = true; strictDeps = true; depsBuildBuild = [ pkg-config ]; @@ -292,7 +295,7 @@ stdenv.mkDerivation (finalAttrs: { }; }; - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix index 14a7a877828b..9bd3f34d49da 100644 --- a/pkgs/development/libraries/gstreamer/icamerasrc/default.nix +++ b/pkgs/development/libraries/gstreamer/icamerasrc/default.nix @@ -34,6 +34,11 @@ stdenv.mkDerivation { export STRIP_VIRTUAL_CHANNEL_CAMHAL=ON ''; + separateDebugInfo = true; + + __structuredAttrs = true; + strictDeps = true; + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 05319b971754..ecff969ca150 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-libav"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -28,9 +28,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${finalAttrs.version}.tar.xz"; - hash = "sha256-m7PSaB7w3pLRsanZVRhiNu4i5k83Lbm/wNIuLQ3xmGU="; + hash = "sha256-vRel3yh0p6WLy697lAIjN5rZYTYk246teD2wPnS7kEs="; }; + separateDebugInfo = true; + + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -65,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 182433745fd4..b71da6b03adb 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-rtsp-server"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -28,9 +28,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-th1DBNjOqqoboTn7HOk18E8ac9fhgkPAoFsvsEMFQG8="; + hash = "sha256-v7Z4BUK/DUAnNiMq6ubFoblDxEV3W/QDBby4bKcHBaA="; }; + separateDebugInfo = true; + + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -67,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 3f225da93ed1..279dbb12b173 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gst-plugins-ugly"; - version = "1.26.11"; + version = "1.28.4"; outputs = [ "out" @@ -36,9 +36,14 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${finalAttrs.version}.tar.xz"; - hash = "sha256-v5yfcu43SCXP1DhowoW8sBcA3yWEBp51169FX+SCRPg="; + hash = "sha256-VIbNFFxa9DJZ/TfKylnQSOKmfdsHCC6o9Q7w8CqF+KU="; }; + separateDebugInfo = true; + + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -104,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: { }; }; - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 903be8f1e245..e5796cc6a9e8 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -48,6 +48,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8S+TAnPHodPg1/hblP+dE3nRYqzMky6Mo9OJk+0n/Kw="; }; + separateDebugInfo = true; + + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ meson ninja @@ -87,8 +92,6 @@ stdenv.mkDerivation (finalAttrs: { apple-sdk_gstreamer ]; - strictDeps = true; - mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users (lib.mesonEnable "doc" enableDocumentation) @@ -104,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index 797f0a320a9d..45c25c2550a6 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "gst-python"; - version = "1.26.11"; + version = "1.28.4"; pyproject = false; @@ -32,14 +32,13 @@ buildPythonPackage rec { src = fetchurl { url = "https://gstreamer.freedesktop.org/src/gst-python/gst-python-${version}.tar.xz"; - hash = "sha256-ETFrp2m1bSbYsUZMcZipkkyurkgTT321kXH68ac9xDY="; + hash = "sha256-xOs4JyC0RD+4AaU0GN/wvUzXR4cW1c7Uk1BKZ1tNCf0="; }; - # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4322 - postPatch = '' - substituteInPlace testsuite/meson.build \ - --replace-fail "['gstinit', 'test_gst_init.py']," "" - ''; + patches = [ + # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/9918#note_3530752 + ./fix-test-plugin-imports.patch + ]; # Python 2.x is not supported. disabled = !isPy3k; @@ -96,13 +95,13 @@ buildPythonPackage rec { ''; passthru = { - updateScript = directoryListingUpdater { }; + updateScript = directoryListingUpdater { odd-unstable = true; }; }; meta = { homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; license = lib.licenses.lgpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tmarkus ]; }; } diff --git a/pkgs/development/python-modules/gst-python/fix-test-plugin-imports.patch b/pkgs/development/python-modules/gst-python/fix-test-plugin-imports.patch new file mode 100644 index 000000000000..a08142a85a03 --- /dev/null +++ b/pkgs/development/python-modules/gst-python/fix-test-plugin-imports.patch @@ -0,0 +1,22 @@ +diff --git a/subprojects/gst-python/testsuite/test_plugin.py b/subprojects/gst-python/testsuite/test_plugin.py +index 3ab299d54c..4ed1e85c82 100644 +--- a/testsuite/test_plugin.py ++++ b/testsuite/test_plugin.py +@@ -18,14 +18,14 @@ + # License along with this library; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +-from gi.repository import Gst +-import gi +-from common import TestCase, unittest + import overrides_hack + overrides_hack + ++from common import TestCase, unittest + ++import gi + gi.require_version("Gst", "1.0") ++from gi.repository import Gst + + + class TestPlugin(TestCase):