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.

Sign up for GitHub

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

ffmpeg_4: almost drop #336401

Merged
merged 17 commits into from
Aug 27, 2024
Merged

ffmpeg_4: almost drop #336401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2ae3a0f
xjadeo: unpin FFmpeg 4
emilazy Jul 13, 2024
ff64007
pangolin: unpin FFmpeg 4
emilazy Jul 13, 2024
5e13c41
vulkan-cts: unpin FFmpeg 4
emilazy Jul 13, 2024
f96d098
sumo: unpin FFmpeg 4
emilazy Jul 13, 2024
4d77d90
ultrastardx: unpin FFmpeg 4
emilazy Jul 13, 2024
d62b72d
libsForQt5.ffmpegthumbs: unpin FFmpeg 4
emilazy Aug 3, 2024
a3d7229
megasync: unpin FFmpeg 4
emilazy Aug 3, 2024
426ea95
alephone: pin FFmpeg 6
emilazy Jul 13, 2024
8c533c3
olive-editor: pin FFmpeg 6
emilazy Jul 14, 2024
2f5176c
guvcview: 2.0.6 -> 2.1.0
emilazy Jul 15, 2024
b2b7066
octavePackages.video: 2.0.2 -> 2.1.1
emilazy Jul 14, 2024
e1c2ff5
rustplayer: unstable-2022-12-04 -> 1.1.2-unstable-2024-07-14
emilazy Jul 14, 2024
44a2680
electricsheep: 3.0.2-2019-10-05 -> 3.0.2-unstable-2024-02-13
emilazy Jul 14, 2024
f7d69fb
untrunc-anthowlock: 0-unstable-2021-11-21 -> 0-unstable-2024-08-14
emilazy Jul 21, 2024
2a75dd1
webcamoid: add upstream patch for FFmpeg 7
emilazy Jul 21, 2024
bc8cde2
guacamole-server: add upstream patch for FFmpeg 7
emilazy Jul 21, 2024
778806c
ffmpeg_4: discourage further use
emilazy Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/applications/kde/ffmpegthumbs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
SuperSandro2000 marked this conversation as resolved.
Show resolved Hide resolved
mkDerivation, lib,
extra-cmake-modules,
ffmpeg_4, kio, taglib
ffmpeg_7, kio, taglib
}:

mkDerivation {
Expand All @@ -11,5 +11,5 @@ mkDerivation {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ ffmpeg_4 kio taglib ];
buildInputs = [ ffmpeg_7 kio taglib ];
}
4 changes: 2 additions & 2 deletions pkgs/applications/science/networking/sumo/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_4, fox_1_6, gdal,
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_7, fox_1_6, gdal,
git, gl2ps, gpp , gtest, jdk, libGL, libGLU, libX11, libjpeg,
libpng, libtiff, libxcrypt, openscenegraph , proj, python3,
python3Packages, stdenv, swig, xercesc, xorg, zlib }:
Expand All @@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2
eigen
ffmpeg_4
ffmpeg_7
fox_1_6
gdal
gl2ps
Expand Down
4 changes: 2 additions & 2 deletions pkgs/applications/video/olive-editor/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, which
, frei0r
, opencolorio
, ffmpeg_4
, ffmpeg_6
, CoreFoundation
, cmake
, wrapQtAppsHook
Expand Down Expand Up @@ -70,7 +70,7 @@ stdenv.mkDerivation {
];

buildInputs = [
ffmpeg_4
ffmpeg_6
frei0r
opencolorio
openimageio'
Expand Down
14 changes: 11 additions & 3 deletions pkgs/applications/video/webcamoid/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake
{ lib, fetchFromGitHub, fetchpatch2, pkg-config, libxcb, mkDerivation, cmake
, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
, ffmpeg_4, gst_all_1, libpulseaudio, alsa-lib, jack2
, ffmpeg_7, gst_all_1, libpulseaudio, alsa-lib, jack2
, v4l-utils }:
mkDerivation rec {
pname = "webcamoid";
Expand All @@ -13,10 +13,18 @@ mkDerivation rec {
owner = "webcamoid";
};

patches = [
# Update mediawriterffmpeg.cpp for ffmpeg-7.0
(fetchpatch2 {
url = "https://github.com/webcamoid/webcamoid/commit/b4864f13ec8c2ec93ebb5c13d9293cf9c02c93fd.patch?full_index=1";
hash = "sha256-QasfVocxAzRMME03JFRfz7QQYXQGq4TSFiBsKL1g/wU=";
})
];

buildInputs = [
libxcb
qtbase qtdeclarative qtquickcontrols qtquickcontrols2
ffmpeg_4
ffmpeg_7
gst_all_1.gstreamer gst_all_1.gst-plugins-base
alsa-lib libpulseaudio jack2
v4l-utils
Expand Down
4 changes: 2 additions & 2 deletions pkgs/by-name/al/alephone/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
alsa-lib,
boost,
curl,
ffmpeg_4,
ffmpeg_6,
icoutils,
libGLU,
libmad,
Expand Down Expand Up @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
alsa-lib
boost
curl
ffmpeg_4
ffmpeg_6
libGLU
libmad
libogg
Expand Down
Loading