diff options
author | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2024-03-22 16:41:59 +0100 |
commit | 46a88117a05c3469af5d99433af140c3de8ca088 (patch) | |
tree | d7f0557756d8f07a3081b3498c05ddc5a8ad429d /nixpkgs/pkgs/applications/video | |
parent | e97457545cea0b2ca421da257c83d8f1ef451d85 (diff) | |
parent | a343533bccc62400e8a9560423486a3b6c11a23b (diff) | |
download | nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.gz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.bz2 nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.lz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.xz nixlib-46a88117a05c3469af5d99433af140c3de8ca088.tar.zst nixlib-46a88117a05c3469af5d99433af140c3de8ca088.zip |
Merge commit 'a343533bccc62400e8a9560423486a3b6c11a23b'
Diffstat (limited to 'nixpkgs/pkgs/applications/video')
11 files changed, 68 insertions, 22 deletions
diff --git a/nixpkgs/pkgs/applications/video/avidemux/default.nix b/nixpkgs/pkgs/applications/video/avidemux/default.nix index 06951debf5ac..c2b6d5be7325 100644 --- a/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, pkg-config +{ stdenv, lib, fetchurl, fetchpatch, cmake, pkg-config , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi , makeWrapper, libXext, libGLU, qttools, qtbase, wrapQtAppsHook @@ -37,6 +37,16 @@ stdenv.mkDerivation rec { ./bootstrap_logging.patch ]; + postPatch = '' + cp ${fetchpatch { + # Backport fix for binutils-2.41. + name = "binutils-2.41.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; + hash = "sha256-s9PcYbt0mFb2wvgMcFL1J+2OS6Sxyd2wYkGzLr2qd9M="; + stripLen = 1; + }} avidemux_core/ffmpeg_package/patches/ + ''; + nativeBuildInputs = [ yasm cmake pkg-config makeWrapper ] ++ lib.optional withQT wrapQtAppsHook; diff --git a/nixpkgs/pkgs/applications/video/catt/default.nix b/nixpkgs/pkgs/applications/video/catt/default.nix index 8b1c74ee66cc..608236d68830 100644 --- a/nixpkgs/pkgs/applications/video/catt/default.nix +++ b/nixpkgs/pkgs/applications/video/catt/default.nix @@ -4,7 +4,25 @@ , python3 }: -python3.pkgs.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + pychromecast = super.pychromecast.overridePythonAttrs (_: rec { + version = "13.1.0"; + + src = fetchPypi { + pname = "PyChromecast"; + inherit version; + hash = "sha256-COYai1S9IRnTyasewBNtPYVjqpfgo7V4QViLm+YMJnY="; + }; + + postPatch = ""; + }); + }; + }; +in + +python.pkgs.buildPythonApplication rec { pname = "catt"; version = "0.12.11"; format = "pyproject"; @@ -22,11 +40,11 @@ python3.pkgs.buildPythonApplication rec { }) ]; - nativeBuildInputs = with python3.pkgs; [ + nativeBuildInputs = with python.pkgs; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python.pkgs; [ click ifaddr pychromecast diff --git a/nixpkgs/pkgs/applications/video/filebot/default.nix b/nixpkgs/pkgs/applications/video/filebot/default.nix index fd779bf0bf81..738bd9418f00 100644 --- a/nixpkgs/pkgs/applications/video/filebot/default.nix +++ b/nixpkgs/pkgs/applications/video/filebot/default.nix @@ -10,11 +10,11 @@ let }; in stdenv.mkDerivation (finalAttrs: { pname = "filebot"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { url = "https://web.archive.org/web/20230917142929/https://get.filebot.net/filebot/FileBot_${finalAttrs.version}/FileBot_${finalAttrs.version}-portable.tar.xz"; - hash = "sha256-+5I0t67asbCwaMCuqI/ixRHNAdcLTziuYOfepVThoPk="; + hash = "sha256-1TkCV3Cjg/5YZODceV5mQDsPYk09IU7+UHwPRwt2vAQ="; }; unpackPhase = "tar xvf $src"; diff --git a/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix b/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix index 7f03d813388d..890567d5d6d5 100644 --- a/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix +++ b/nixpkgs/pkgs/applications/video/kodi/addons/mediathekview/default.nix @@ -20,6 +20,6 @@ buildKodiAddon rec { homepage = "https://github.com/mediathekview/plugin.video.mediathekview"; description = "Access media libraries of German speaking broadcasting stations"; license = licenses.mit; - maintainers = teams.kodi.members ++ [ lib.maintainers.dschrempf ]; + maintainers = teams.kodi.members; }; } diff --git a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix index ec84aa9ff6b3..f97b53b60937 100644 --- a/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix +++ b/nixpkgs/pkgs/applications/video/kodi/unwrapped.nix @@ -1,4 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, makeWrapper +{ stdenv, lib, fetchFromGitHub +, fetchpatch +, autoconf, automake, libtool, makeWrapper , pkg-config, cmake, yasm, python3Packages , libxcrypt, libgcrypt, libgpg-error, libunistring , boost, avahi, lame @@ -39,15 +41,15 @@ assert usbSupport -> !udevSupport; # libusb-compat-0_1 won't be used if udev is assert gbmSupport || waylandSupport || x11Support; let - kodiReleaseDate = "20240109"; - kodiVersion = "20.3"; + kodiReleaseDate = "20240302"; + kodiVersion = "20.5"; rel = "Nexus"; kodi_src = fetchFromGitHub { owner = "xbmc"; repo = "xbmc"; rev = "${kodiVersion}-${rel}"; - hash = "sha256-OMm8WhTQiEZvu8jHOUp2zT4Xd4NU3svMobW2k8AAtNI="; + hash = "sha256-R/tzk3ZarJ4BTR312p2lTLezeCEsqdQH54ROsNIoJZA="; }; # see https://github.com/xbmc/xbmc/blob/${kodiVersion}-${rel}/tools/depends/target/ to get suggested versions for all dependencies @@ -63,6 +65,14 @@ let rev = "${version}-${rel}-Alpha1"; sha256 = "sha256-EQHmmWnDw+/udKYq7Nrf00nL7I5XWUtmzdauDryfTII="; }; + patches = [ + # Backport fix for binutils-2.41. + (fetchpatch { + name = "binutils-2.41.patch"; + url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/effadce6c756247ea8bae32dc13bb3e6f464f0eb"; + hash = "sha256-vlBUMJ1bORQHRNpuzc5iXsTWwS/CN5BmGIA8g7H7mJE="; + }) + ]; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt diff --git a/nixpkgs/pkgs/applications/video/media-downloader/default.nix b/nixpkgs/pkgs/applications/video/media-downloader/default.nix index 2b9244186e76..b0a40aaa8a34 100644 --- a/nixpkgs/pkgs/applications/video/media-downloader/default.nix +++ b/nixpkgs/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.2.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-hQLrs4RyHUtcG03h0nCn3uMsHEskGKMVwUkcssGZQLs="; + hash = "sha256-+vPGfPncb8f5c9OiBmpMvvDh3X6ZMHPbyngcDfrP9qQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix b/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix index c30c450a28c0..d6c5389b3277 100644 --- a/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix +++ b/nixpkgs/pkgs/applications/video/mpv/scripts/mpvacious.nix @@ -9,13 +9,13 @@ buildLua rec { pname = "mpvacious"; - version = "0.25"; + version = "0.26"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "mpvacious"; rev = "v${version}"; - sha256 = "sha256-XTnib4cguWFEvZtmsLfkesbjFbkt2YoyYLT587ajyUM="; + sha256 = "sha256-QPLJC6SxocvOPeY6qI8q+EyXNGVef3J/Z38W0/rzFCg="; }; passthru.updateScript = gitUpdater { rev-prefix = "v"; diff --git a/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix b/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix index 7a51720ec5d8..46e425992c15 100644 --- a/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix +++ b/nixpkgs/pkgs/applications/video/multiviewer-for-f1/default.nix @@ -23,15 +23,15 @@ , xorg }: let - id = "123219506"; + id = "154421934"; in stdenvNoCC.mkDerivation rec { pname = "multiviewer-for-f1"; - version = "1.26.2"; + version = "1.31.3"; src = fetchurl { url = "https://releases.multiviewer.dev/download/${id}/multiviewer-for-f1_${version}_amd64.deb"; - sha256 = "sha256-nibPVqc4B3PHF/3wR5FsYZGVkkReQjy+4glfdnBysSU="; + sha256 = "sha256-lFES+ukkI/GqKQdZwtaB+ov0hqAyFZ2N533LBKJ9oXg="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/video/mythtv/default.nix b/nixpkgs/pkgs/applications/video/mythtv/default.nix index 0f355577a6a4..deea5c1cb493 100644 --- a/nixpkgs/pkgs/applications/video/mythtv/default.nix +++ b/nixpkgs/pkgs/applications/video/mythtv/default.nix @@ -28,6 +28,14 @@ mkDerivation rec { stripLen = 1; hash = "sha256-JfRME00YNNjl6SKs1HBa0wBa/lR/Rt3zbQtWhsC36JM="; }) + + # Bachport the build against binutils-2.41 + (fetchpatch { + name = "binutils-2.41.patch"; + url = "https://github.com/MythTV/mythtv/commit/f9f9bba62ee2743c816cb2b9634b6b4397e5e2e3.patch"; + stripLen = 1; + hash = "sha256-IcXgBtfqPZ42inYFe7l8mWvKUV13S/YEQAHcOFaDivI="; + }) ]; setSourceRoot = "sourceRoot=$(echo */mythtv)"; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index 2016637ccd9e..3f037d916aa2 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-cz4Qk56e9CC//a+7pz5rcTxPlMwDwSAKfmgMyBZI4mo="; + sha256 = "sha256-3xMCMsjnEF5aNKBNMhSMAgKuaDnNP+3+uN1u76+Te+8="; }; nativeBuildInputs = [ cmake ]; diff --git a/nixpkgs/pkgs/applications/video/obs-studio/plugins/waveform/default.nix b/nixpkgs/pkgs/applications/video/obs-studio/plugins/waveform/default.nix index ff5c52380de7..4bbcc6555536 100644 --- a/nixpkgs/pkgs/applications/video/obs-studio/plugins/waveform/default.nix +++ b/nixpkgs/pkgs/applications/video/obs-studio/plugins/waveform/default.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation rec { pname = "waveform"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { fetchSubmodules = true; owner = "phandasm"; repo = "waveform"; rev = "v${version}"; - sha256 = "sha256-DR3+ZBbWoGybUvDwVXLvarp+IGsTPl9Y0mFe739Ar8E="; + sha256 = "sha256-NcBtj+5X9tPH853a6oXzQCBH26hx8Yt17WjP9ryvgmc="; }; nativeBuildInputs = [ cmake pkg-config ]; |