Merge #218309: ffmpeg: ffmpeg_4 → ffmpeg_5

...into staging
This commit is contained in:
Vladimír Čunát 2023-03-16 11:11:31 +01:00
commit 0f9354bfee
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
65 changed files with 115 additions and 105 deletions

View File

@ -15,7 +15,7 @@
, musepackSupport ? true, libmpc, libmpcdec, taglib
, vorbisSupport ? true, libvorbis
, speexSupport ? true, speex
, ffmpegSupport ? true, ffmpeg
, ffmpegSupport ? true, ffmpeg_4
, sndfileSupport ? true, libsndfile
, wavpackSupport ? true, wavpack
# Misc
@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
++ lib.optionals musepackSupport [ libmpc libmpcdec taglib ]
++ lib.optional vorbisSupport libvorbis
++ lib.optional speexSupport speex
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional ffmpegSupport ffmpeg_4
++ lib.optional sndfileSupport libsndfile
++ lib.optional wavpackSupport wavpack
# Misc

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg }:
{ lib, stdenv, fetchFromGitHub, cmake, eigen, ffmpeg_4 }:
stdenv.mkDerivation {
pname = "musly";
version = "unstable-2017-04-26";
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825";
};
nativeBuildInputs = [ cmake ];
buildInputs = [ eigen ffmpeg ];
buildInputs = [ eigen ffmpeg_4 ];
fixupPhase = lib.optionalString stdenv.isDarwin ''
install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly
install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg, wxGTK32, gtk3, wrapGAppsHook }:
{ lib, stdenv, fetchFromGitHub, autoreconfHook, intltool, pkg-config, ffmpeg_4, wxGTK32, gtk3, wrapGAppsHook }:
stdenv.mkDerivation rec {
pname = "spek";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
buildInputs = [ ffmpeg wxGTK32 gtk3 ];
buildInputs = [ ffmpeg_4 wxGTK32 gtk3 ];
meta = with lib; {
description = "Analyse your audio files by showing their spectrogram";

View File

@ -30,7 +30,7 @@
, expat
, libid3tag
, libopus
, ffmpeg
, ffmpeg_4
, soundtouch
, pcre
, portaudio
@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
buildInputs = [
alsa-lib
expat
ffmpeg
ffmpeg_4
file
flac
glib

View File

@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.bitcoinunlimited.info/";
maintainers = with maintainers; [ DmitryTsygankov ];
license = licenses.mit;
broken = stdenv.isDarwin;
broken = true;
platforms = platforms.unix;
};
}

View File

@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
license = licenses.mit;
maintainers = with maintainers; [ edwtjo offline ];
platforms = platforms.unix;
broken = true;
};
}

View File

@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
'';
meta = with lib; {
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = true;
description = "An open source crypto-currency focused on fast private transactions";
longDescription = ''
PIVX is an MIT licensed, open source, blockchain-based cryptocurrency with

View File

@ -1,4 +1,4 @@
{ expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg
{ expat, fetchFromGitHub, ffmpeg_4, fontconfig, freetype, libarchive, libjpeg
, libGLU, libGL, openal, pkg-config, sfml, lib, stdenv, zlib
}:
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
expat ffmpeg fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib
expat ffmpeg_4 fontconfig freetype libarchive libjpeg libGLU libGL openal sfml zlib
];
meta = with lib; {

View File

@ -20,7 +20,7 @@
, enableCubeb ? true, libpulseaudio
, enableFfmpegAudioDecoder ? true
, enableFfmpegVideoDumper ? true
, ffmpeg
, ffmpeg_4
, useDiscordRichPresence ? true, rapidjson
, enableFdk ? false, fdk_aac
}:
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
++ lib.optional enableSdl2 SDL2
++ lib.optional enableQtTranslation qttools
++ lib.optional enableCubeb libpulseaudio
++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg
++ lib.optional (enableFfmpegAudioDecoder || enableFfmpegVideoDumper) ffmpeg_4
++ lib.optional useDiscordRichPresence rapidjson
++ lib.optional enableFdk fdk_aac;

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, autoreconfHook, intltool, pkg-config, gtk3, SDL2, xorg
, wrapGAppsHook, libcdio, nasm, ffmpeg, file
, wrapGAppsHook, libcdio, nasm, ffmpeg_4, file
, fetchpatch }:
stdenv.mkDerivation rec {
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ];
buildInputs = [
gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg file
gtk3 SDL2 xorg.libXv xorg.libXtst libcdio nasm ffmpeg_4 file
xorg.libXxf86vm
];

View File

@ -4,7 +4,7 @@
, SDL2
, cmake
, copyDesktopItems
, ffmpeg
, ffmpeg_4
, glew
, libffi
, libsForQt5
@ -59,7 +59,7 @@ stdenv.mkDerivation (self: {
buildInputs = [
SDL2
ffmpeg
ffmpeg_4
(glew.override { enableEGL = forceWayland; })
libzip
snappy

View File

@ -7,6 +7,7 @@
, curl
, fetchFromGitHub
, ffmpeg
, ffmpeg_4
, fluidsynth
, gettext
, hexdump
@ -755,7 +756,7 @@ in
ppsspp = mkLibretroCore {
core = "ppsspp";
extraNativeBuildInputs = [ cmake pkg-config python3 ];
extraBuildInputs = [ libGLU libGL libzip ffmpeg snappy xorg.libX11 ];
extraBuildInputs = [ libGLU libGL libzip ffmpeg_4 snappy xorg.libX11 ];
makefile = "Makefile";
cmakeFlags = [
"-DLIBRETRO=ON"

View File

@ -24,7 +24,7 @@
, boost
, eigen
, exiv2
, ffmpeg
, ffmpeg_4
, flex
, graphviz
, imagemagick
@ -70,7 +70,7 @@ mkDerivation rec {
boost
eigen
exiv2
ffmpeg
ffmpeg_4
flex
graphviz
imagemagick

View File

@ -72,5 +72,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
homepage = "http://www.pawfal.org/fluxus/";
maintainers = [ maintainers.brainrape ];
broken = true;
};
}

View File

@ -78,5 +78,6 @@ clangStdenv.mkDerivation rec {
platforms = platforms.linux;
mainProgram = "decoder";
maintainers = with maintainers; [ zendo ];
broken = true;
};
}

View File

@ -16,7 +16,7 @@
, kwayland
, lz4
, xxHash
, ffmpeg
, ffmpeg_4
, openalSoft
, minizip
, libopus
@ -132,7 +132,7 @@ stdenv.mkDerivation rec {
qtsvg
lz4
xxHash
ffmpeg
ffmpeg_4
openalSoft
minizip
libopus

View File

@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, cmake, zlib, libglvnd, libGLU, wrapQtAppsHook
, sshSupport ? true, openssl, libssh
, tetgenSupport ? true, tetgen
, ffmpegSupport ? true, ffmpeg
, ffmpegSupport ? true, ffmpeg_4
, dicomSupport ? false, dcmtk
, withModelRepo ? true
, withCadFeatures ? false
@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib libglvnd libGLU openssl libssh ]
++ lib.optional sshSupport openssl
++ lib.optional tetgenSupport tetgen
++ lib.optional ffmpegSupport ffmpeg
++ lib.optional ffmpegSupport ffmpeg_4
++ lib.optional dicomSupport dcmtk
;

View File

@ -1,4 +1,4 @@
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg, fox_1_6, gdal,
{ lib, bzip2, cmake, eigen, fetchFromGitHub, ffmpeg_4, 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 }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [
bzip2
eigen
ffmpeg
ffmpeg_4
fox_1_6
gdal
gl2ps

View File

@ -32,7 +32,8 @@ stdenv.mkDerivation rec {
meta = with lib; {
# error: unsupported option '-fsanitize=safe-stack' for target 'x86_64-apple-darwin'
broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
# broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
broken = true; # sendmsg.c:(.text+0x1099): undefined reference to `pthread_yield'
homepage = "https://syncterm.bbsdev.net/";
description = "BBS terminal emulator";
maintainers = with maintainers; [ embr ];

View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg, glew, libass, openal, qtbase }:
{ mkDerivation, lib, fetchurl, pkg-config, ffmpeg_4, glew, libass, openal, qtbase }:
mkDerivation rec {
pname = "bino";
@ -11,7 +11,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg glew libass openal qtbase ];
buildInputs = [ ffmpeg_4 glew libass openal qtbase ];
enableParallelBuilding = true;

View File

@ -8,7 +8,7 @@
, dvdplusrwtools
, enca
, cdrkit
, ffmpeg
, ffmpeg_4
, gettext
, gtk2
, gtkmm2
@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
dvdauthor
dvdplusrwtools
enca
ffmpeg
ffmpeg_4
gtk2
gtkmm2
libdvdread
@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
# fix iso authoring
install -Dt $out/share/bombono/resources/scons_authoring tools/scripts/SConsTwin.py
wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg dvdauthor cdrkit ]}
wrapProgram $out/bin/bombono-dvd --prefix PATH : ${lib.makeBinPath [ ffmpeg_4 dvdauthor cdrkit ]}
'';
meta = with lib; {

View File

@ -9,7 +9,7 @@
, makeWrapper
, tesseract4
, leptonica
, ffmpeg
, ffmpeg_4
}:
stdenv.mkDerivation rec {
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
buildInputs = [ zlib ]
++ lib.optional (!stdenv.isLinux) libiconv
++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ];
++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg_4 ];
cmakeFlags = [
# file RPATH_CHANGE could not write new RPATH:

View File

@ -7,7 +7,7 @@
, docbook-xsl-nons
, dvdauthor
, dvdplusrwtools
, ffmpeg
, ffmpeg_4
, flex
, fontconfig
, gettext
@ -61,7 +61,7 @@ in stdenv.mkDerivation rec {
cdrtools
dvdauthor
dvdplusrwtools
ffmpeg
ffmpeg_4
fontconfig
glib
libexif

View File

@ -1,4 +1,4 @@
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg
{ config, lib, stdenv, fetchurl, fetchsvn, pkg-config, freetype, yasm, ffmpeg_4
, aalibSupport ? true, aalib
, fontconfigSupport ? true, fontconfig, freefont_ttf
, fribidiSupport ? true, fribidi
@ -87,7 +87,7 @@ stdenv.mkDerivation rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config yasm ];
buildInputs = with lib;
[ freetype ffmpeg ]
[ freetype ffmpeg_4 ]
++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, pkg-config, which, qmake, wrapQtAppsHook
, qtmultimedia, frei0r, opencolorio_1, ffmpeg-full, CoreFoundation }:
, qtmultimedia, frei0r, opencolorio_1, ffmpeg_4, CoreFoundation }:
stdenv.mkDerivation rec {
pname = "olive-editor";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
ffmpeg-full
ffmpeg_4
frei0r
opencolorio_1
qtmultimedia

View File

@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
maintainers = with maintainers; [ ckie ];
platforms = with platforms; linux;
broken = true;
};
}

View File

@ -1,4 +1,4 @@
{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg, libjack2, libX11, libXext, libXinerama, qtx11extras
{ lib, stdenv, mkDerivation, fetchFromGitHub, alsa-lib, ffmpeg_4, libjack2, libX11, libXext, libXinerama, qtx11extras
, libXfixes, libGLU, libGL, pkg-config, libpulseaudio, libv4l, qtbase, qttools, cmake, ninja
}:
@ -30,7 +30,7 @@ mkDerivation rec {
nativeBuildInputs = [ pkg-config cmake ninja ];
buildInputs = [
alsa-lib ffmpeg libjack2 libX11 libXext libXfixes libXinerama libGLU libGL
alsa-lib ffmpeg_4 libjack2 libX11 libXext libXfixes libXinerama libGLU libGL
libpulseaudio libv4l qtbase qttools qtx11extras
];

View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub, pkg-config, libxcb, mkDerivation, cmake
, qtbase, qtdeclarative, qtquickcontrols, qtquickcontrols2
, ffmpeg-full, gst_all_1, libpulseaudio, alsa-lib, jack2
, ffmpeg_4, gst_all_1, libpulseaudio, alsa-lib, jack2
, v4l-utils }:
mkDerivation rec {
pname = "webcamoid";
@ -16,7 +16,7 @@ mkDerivation rec {
buildInputs = [
libxcb
qtbase qtdeclarative qtquickcontrols qtquickcontrols2
ffmpeg-full
ffmpeg_4
gst_all_1.gstreamer gst_all_1.gst-plugins-base
alsa-lib libpulseaudio jack2
v4l-utils

View File

@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Plus;
maintainers = with maintainers; [ doronbehar ];
platforms = platforms.linux;
broken = true;
};
}

View File

@ -13,7 +13,7 @@
# '';
# See also <https://nixos.org/nixpkgs/manual/#sec-language-gnome>.
, gtkSupport ? true, glib, gtk3
, videoSupport ? true, ffmpeg, libmpeg2
, videoSupport ? true, ffmpeg_4, libmpeg2
}:
stdenv.mkDerivation rec {
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
] ++ lib.optionals gstreamerSupport
([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1)
++ lib.optionals gtkSupport [ glib gtk3 ]
++ lib.optionals videoSupport [ ffmpeg libmpeg2 ];
++ lib.optionals videoSupport [ ffmpeg_4 libmpeg2 ];
configureFlags = [
"--disable-ltdl-install"

View File

@ -10,7 +10,7 @@
, libX11
, libass
, openal
, ffmpeg
, ffmpeg_4
, libuchardet
, alsa-lib
, libpulseaudio
@ -30,7 +30,7 @@ mkDerivation rec {
libX11
libass
openal
ffmpeg
ffmpeg_4
libuchardet
alsa-lib
libpulseaudio

View File

@ -2,7 +2,7 @@
, bzrtp
, cmake
, fetchFromGitLab
, ffmpeg
, ffmpeg_4
, glew
, gsm
, lib
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
bzrtp
ortp
ffmpeg
ffmpeg_4
glew
libX11
libXext

View File

@ -60,5 +60,6 @@ stdenv.mkDerivation rec {
license = licenses.boost;
maintainers = with maintainers; [ oxij ];
platforms = platforms.unix;
broken = true;
};
}

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkg-config, doxygen, libGL, glew
, xorg, ffmpeg, libjpeg, libpng, libtiff, eigen
, xorg, ffmpeg_4, libjpeg, libpng, libtiff, eigen
, Carbon ? null, Cocoa ? null
}:
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
libGL
glew
xorg.libX11
ffmpeg
ffmpeg_4
libjpeg
libpng
libtiff

View File

@ -5,7 +5,7 @@
, aalib
, alsa-lib
, autoconf
, ffmpeg
, ffmpeg_4
, flac
, libGL
, libGLU
@ -42,12 +42,6 @@ stdenv.mkDerivation rec {
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/010-xine-lib-libcaca-0.99.beta20-fix.patch";
sha256 = "088141x1yp84y09x3s01v21yzas2bwavxz9v30z5hyq6c3syrmgr";
})
# Fix build with ffmpeg 5.0 ; remove for xine-lib 1.2.12
(fetchpatch {
name = "xine-lib-ffmpeg-5.0-fix.patch";
url = "https://raw.githubusercontent.com/archlinux/svntogit-community/209ae10d59d29c13633b75aa327cf937f3ff0725/trunk/020-xine-lib-ffmpeg-5.0-fix.patch";
sha256 = "15ff15bqxq1nqqazfbmfq6swrdjr2raxyq7hx6k0r61izhf0g8ld";
})
];
nativeBuildInputs = [
@ -58,7 +52,7 @@ stdenv.mkDerivation rec {
buildInputs = [
aalib
alsa-lib
ffmpeg
ffmpeg_4 # xine-lib 1.2.12 should support ffmpeg_5
flac
libGL
libGLU

View File

@ -3,7 +3,7 @@
, lib
, fetchurl
, pkg-config
, ffmpeg
, ffmpeg_4
}:
buildOctavePackage rec {
@ -20,7 +20,7 @@ buildOctavePackage rec {
];
propagatedBuildInputs = [
ffmpeg
ffmpeg_4
];
meta = with lib; {

View File

@ -207,5 +207,6 @@ buildPythonPackage rec {
homepage = "https://beam.apache.org/";
license = licenses.asl20;
maintainers = with maintainers; [ ndl ];
broken = true;
};
}

View File

@ -1,7 +1,7 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, ffmpeg
, ffmpeg_4
, future
, pytest-mock
, pytestCheckHook
@ -36,7 +36,7 @@ buildPythonPackage rec {
patches = [
(substituteAll {
src = ./ffmpeg-location.patch;
inherit ffmpeg;
ffmpeg = ffmpeg_4;
})
];

View File

@ -53,5 +53,6 @@ buildPythonPackage rec {
homepage = "https://github.com/soft-matter/pims";
license = licenses.bsd3;
maintainers = with maintainers; [ costrouc ];
broken = true;
};
}

View File

@ -53,5 +53,6 @@ buildPythonPackage rec {
homepage = "https://github.com/fabioz/PyDev.Debugger";
license = licenses.epl10;
maintainers = with maintainers; [ onny ];
broken = true;
};
}

View File

@ -48,5 +48,6 @@ buildPythonPackage rec {
platforms = platforms.linux;
license = with licenses; [ gpl3 lgpl3 ];
maintainers = with maintainers; [ matejc ftrvxmtrx ] ++ teams.enlightenment.members;
broken = true;
};
}

View File

@ -46,6 +46,6 @@ buildPythonPackage rec {
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
maintainers = with lib.maintainers; [ smaret ];
broken = true;
};
}

View File

@ -159,5 +159,6 @@ buildPythonPackage rec {
homepage = "https://sunpy.org";
license = licenses.bsd2;
maintainers = with maintainers; [ costrouc ];
broken = true;
};
}

View File

@ -83,6 +83,7 @@ buildPythonPackage rec {
description = "Cross platform GUI toolkit for Python, Phoenix version";
homepage = "http://wxpython.org/";
license = lib.licenses.wxWindows;
broken = true;
};
}

View File

@ -142,5 +142,6 @@ buildPythonPackage rec {
homepage = "http://wxpython.org/";
license = licenses.wxWindows;
maintainers = with maintainers; [ tfmoraes ];
broken = true;
};
}

View File

@ -45,5 +45,6 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/dfranx/SHADERed";
license = with licenses; [ mit ];
maintainers = with maintainers; [ Scriptkiddi ];
broken = true;
};
}

View File

@ -1,4 +1,4 @@
{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg, freeglut
{ stdenv, SDL2_image, SDL2_ttf, SDL2_net, fpc, ghcWithPackages, ffmpeg_4, freeglut
, lib, fetchurl, cmake, pkg-config, lua5_1, SDL2, SDL2_mixer
, zlib, libpng, libGL, libGLU, physfs
, qtbase, qttools, wrapQtAppsHook
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
SDL2_ttf SDL2_net SDL2 SDL2_mixer SDL2_image
fpc lua5_1
llvm # hard-requirement on aarch64, for some reason not strictly necessary on x86-64
ffmpeg freeglut physfs
ffmpeg_4 freeglut physfs
qtbase
] ++ lib.optional withServer ghc;

View File

@ -41,5 +41,6 @@ in stdenv.mkDerivation rec {
license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc;
maintainers = with maintainers; [ lheckemann ];
platforms = [ "x86_64-linux" "i686-linux" ];
broken = true;
};
}

View File

@ -11,7 +11,7 @@
, openal
, SDL2
, boost
, ffmpeg
, ffmpeg_4
, Cocoa
, OpenAL }:
@ -35,7 +35,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ cmake ];
buildInputs = [
sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg
sfml libGLU libGL bullet glm libmad openal SDL2 boost ffmpeg_4
] ++ lib.optionals stdenv.isDarwin [ OpenAL Cocoa ];
meta = with lib; {

View File

@ -5,7 +5,7 @@
, aubio
, boost
, cmake
, ffmpeg
, ffmpeg_4
, gettext
, git
, glew
@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
SDL2
aubio
boost
ffmpeg
ffmpeg_4
glew
glibmm
glm

View File

@ -87,5 +87,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Plus;
maintainers = with maintainers; [ qknight domenkozar sorki ];
platforms = [ "x86_64-linux" ];
broken = true;
};
}

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, nasm
, gtk2, glib, ffmpeg, alsa-lib, libmad, libogg, libvorbis
, gtk2, glib, ffmpeg_4, alsa-lib, libmad, libogg, libvorbis
, glew, libpulseaudio, udev
}:
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake nasm ];
buildInputs = [
gtk2 glib ffmpeg alsa-lib libmad libogg libvorbis
gtk2 glib ffmpeg_4 alsa-lib libmad libogg libvorbis
glew libpulseaudio udev
];

View File

@ -14,7 +14,7 @@
, SDL2_gfx
, SDL2_mixer
, SDL2_net, SDL2_ttf
, ffmpeg
, ffmpeg_4
, sqlite
, zlib
, libX11
@ -26,7 +26,7 @@ let
sharedLibs = [
pcre portaudio freetype
SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf
sqlite lua zlib libX11 libGLU libGL ffmpeg
sqlite lua zlib libX11 libGLU libGL ffmpeg_4
];
in stdenv.mkDerivation rec {
@ -48,9 +48,8 @@ in stdenv.mkDerivation rec {
# ultrastardx binds to libffmpeg (and sublibs), specifying a very restrictive
# upper bounds on the minor versions of .so files.
# We can assume ffmpeg wont break any major ABI compatibility, since their
# patch version seems to always stay at 100,
# and their minor version changes quite frequently.
# We can assume ffmpeg_4 wont break any major ABI compatibility, since it's
# effectively EOL
sed \
-e 's/^ LIBAVCODEC_MAX_VERSION_MINOR.*$/ LIBAVCODEC_MAX_VERSION_MINOR = 1000;/' \
-i src/lib/ffmpeg-4.0/avcodec.pas

View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, wxGTK32
, ffmpeg
, ffmpeg_4
, lua5_1
, curl
, libpng
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = [
wxGTK32
ffmpeg
ffmpeg_4
lua5_1
curl
libpng

View File

@ -5,7 +5,7 @@
, pkg-config
, portaudio
, SDL2
, ffmpeg
, ffmpeg_4
, udev
, libusb1
, libv4l
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
buildInputs = [
SDL2
alsa-lib
ffmpeg
ffmpeg_4
libusb1
libv4l
portaudio

View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, gitUpdater
, pkg-config
, ffmpeg
, ffmpeg_4
}:
buildGoModule rec {
@ -21,7 +21,7 @@ buildGoModule rec {
proxyVendor = true;
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg ];
buildInputs = [ ffmpeg_4 ];
passthru.updateScript = gitUpdater {
rev-prefix = "v";

View File

@ -7,7 +7,7 @@
, perl
, openssl
, zlib
, ffmpeg
, ffmpeg_4
, libvpx
, libopus
, libuuid
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;
nativeBuildInputs = [ bc pkg-config perl ];
buildInputs = [ openssl srt zlib ffmpeg libvpx libopus srtp jemalloc pcre2 libuuid hiredis ];
buildInputs = [ openssl srt zlib ffmpeg_4 libvpx libopus srtp jemalloc pcre2 libuuid hiredis ];
preBuild = ''
patchShebangs core/colorg++

View File

@ -14,7 +14,7 @@
, bzip2
, dbus
, dtv-scan-tables
, ffmpeg
, ffmpeg_4
, gettext
, gnutar
, gzip
@ -64,7 +64,7 @@ in stdenv.mkDerivation {
avahi
bzip2
dbus
ffmpeg
ffmpeg_4 # depends on libav
gettext
gzip
libiconv

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg }:
{ lib, stdenv, fetchurl, fetchpatch, cmake, pkg-config, qt4, taglib, chromaprint, ffmpeg_4 }:
stdenv.mkDerivation rec {
pname = "acoustid-fingerprinter";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ qt4 taglib chromaprint ffmpeg ];
buildInputs = [ qt4 taglib chromaprint ffmpeg_4 ];
cmakeFlags = [ "-DTAGLIB_MIN_VERSION=${lib.getVersion taglib}" ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg, libebur128
{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, ffmpeg_4, libebur128
, libresample, taglib, zlib }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ ffmpeg libebur128 libresample taglib zlib ];
buildInputs = [ ffmpeg_4 libebur128 libresample taglib zlib ];
postInstall = ''
sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm"

View File

@ -2,7 +2,7 @@
, fetchFromGitHub
, fetchurl
, cmake
, ffmpeg
, ffmpeg_4
, libdrm
, libglvnd
, libffi
@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
buildInputs = [
ffmpeg
ffmpeg_4
libdrm
libffi
libglvnd

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg, libjpeg, libpng, pkg-config }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg_4, libjpeg, libpng, pkg-config }:
stdenv.mkDerivation rec {
pname = "harvid";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [ ffmpeg libjpeg libpng ];
buildInputs = [ ffmpeg_4 libjpeg libpng ];
makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, ffmpeg, libui }:
{ lib, stdenv, fetchFromGitHub, ffmpeg_4, libui }:
stdenv.mkDerivation {
pname = "untrunc-anthwlock";
@ -11,7 +11,7 @@ stdenv.mkDerivation {
sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp";
};
buildInputs = [ ffmpeg libui ];
buildInputs = [ ffmpeg_4 libui ];
buildPhase = ''
runHook preBuild

View File

@ -1,4 +1,4 @@
{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg, freetype, libGLU
{ lib, stdenv, autoreconfHook, fetchFromGitHub, ffmpeg_4, freetype, libGLU
, libjack2, liblo, libX11, libXv, pkg-config, portmidi, xorg }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
ffmpeg
ffmpeg_4
libjack2
libX11
xorg.libXext

View File

@ -19870,9 +19870,9 @@ with pkgs;
# update to ffmpeg
# Packages which use ffmpeg as a library, should pin to the relevant major
# version number which the upstream support.
ffmpeg = ffmpeg_4;
ffmpeg-headless = ffmpeg_4-headless;
ffmpeg-full = ffmpeg_4-full;
ffmpeg = ffmpeg_5;
ffmpeg-headless = ffmpeg_5-headless;
ffmpeg-full = ffmpeg_5-full;
ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };