aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gnu/packages/arcan.scm2
-rw-r--r--gnu/packages/astronomy.scm4
-rw-r--r--gnu/packages/audio.scm8
-rw-r--r--gnu/packages/education.scm2
-rw-r--r--gnu/packages/emulators.scm8
-rw-r--r--gnu/packages/game-development.scm2
-rw-r--r--gnu/packages/games.scm4
-rw-r--r--gnu/packages/gnunet.scm2
-rw-r--r--gnu/packages/graphics.scm2
-rw-r--r--gnu/packages/image-processing.scm4
-rw-r--r--gnu/packages/julia-jll.scm2
-rw-r--r--gnu/packages/kde-multimedia.scm2
-rw-r--r--gnu/packages/kodi.scm2
-rw-r--r--gnu/packages/linphone.scm2
-rw-r--r--gnu/packages/linux.scm3
-rw-r--r--gnu/packages/mp3.scm2
-rw-r--r--gnu/packages/music.scm2
-rw-r--r--gnu/packages/qt.scm2
-rw-r--r--gnu/packages/rdesktop.scm2
-rw-r--r--gnu/packages/video.scm23
20 files changed, 43 insertions, 37 deletions
diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm
index c25d64903c..7483777ff0 100644
--- a/gnu/packages/arcan.scm
+++ b/gnu/packages/arcan.scm
@@ -123,7 +123,7 @@
(files '("share/arcan/scripts")))))
(inputs
`(("apr" ,apr)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype)
("glib" ,glib)
("glu" ,glu)
diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm
index c59f4d02a4..f99dbcbf06 100644
--- a/gnu/packages/astronomy.scm
+++ b/gnu/packages/astronomy.scm
@@ -813,7 +813,7 @@ astronomical fields. SkyMaker is part of the EFIGI
(native-inputs
(list pkg-config))
(inputs
- (list gtkmm-3 libskry ffmpeg))
+ (list gtkmm-3 libskry ffmpeg-4))
(home-page "https://github.com/GreatAttractor/stackistry")
(synopsis "Astronomical lucky imaging/image stacking tool")
(description
@@ -1714,7 +1714,7 @@ arrays with NumPy as its only dependency.")
(copy-recursively "include" include))
#t)))))
(inputs
- (list ffmpeg))
+ (list ffmpeg-4))
(home-page "https://github.com/GreatAttractor/libskry")
(synopsis "Astronimical lucky imaging library")
(description
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e480ce9e58..5e471d34e9 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -603,7 +603,11 @@ Filter) modules follow the convention of 1V / Octave.")
"--enable-samplerate"
"--enable-avcodec")))
(inputs
- (list jack-1 libsndfile libsamplerate fftwf ffmpeg)) ; for libavcodec
+ (list jack-1
+ libsndfile
+ libsamplerate
+ ffmpeg-4 ;for libavcodec
+ fftwf))
(native-inputs
(list pkg-config))
(home-page "https://aubio.org/")
@@ -4442,7 +4446,7 @@ simplified, although really accurate, measuring tools.")
,home-page))
#t))))
(build-system gnu-build-system)
- (inputs (list ffmpeg sox))
+ (inputs (list ffmpeg-4 sox))
(synopsis "Tool to adjust loudness of media files")
(description
"BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index c0f7778c1c..0e3dd08c23 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -547,7 +547,7 @@ specialized device.")
(inputs
(list alsa-lib
coreutils-minimal ;for patched 'env' shebang
- ffmpeg
+ ffmpeg-4
freetype
lame
libass
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 5054ae3da5..11d1cda46f 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -323,7 +323,7 @@ console.")
bluez
curl
eudev
- ffmpeg
+ ffmpeg-4
font-wqy-microhei
freetype
glew
@@ -1471,7 +1471,7 @@ as RetroArch.")
"--disable-builtinminiupnpc")))))))
(inputs
`(("alsa-lib" ,alsa-lib)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype)
("libxinerama" ,libxinerama)
("libxkbcommon" ,libxkbcommon)
@@ -2035,7 +2035,7 @@ assembler, and debugger for the Intel 8085 microprocessor.
(list libcdio
sdl2
gtk+
- ffmpeg
+ ffmpeg-4
libxv
libarchive
pulseaudio))
@@ -2322,7 +2322,7 @@ elseif(FALSE)"))
(native-inputs (list pkg-config python))
(inputs (list bash
cityhash
- ffmpeg
+ ffmpeg-4
glew
glslang
libpng
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 4a0435045b..8fec474d0b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2665,7 +2665,7 @@ utilities frequently used in roguelikes.")
`(("alsa-lib" ,alsa-lib)
("curl" ,curl)
("freetype" ,freetype)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg)
("libpng" ,libpng)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index d8c5a34a41..4c5f28a55c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -8478,7 +8478,7 @@ to download and install them in @file{$HOME/.stepmania-X.Y/Songs} directory.")
(native-inputs
(list pkg-config))
(inputs
- (list cairo ffmpeg pango sdl2 sdl2-image))
+ (list cairo ffmpeg-4 pango sdl2 sdl2-image))
(home-page "https://github.com/fmang/oshu/")
(synopsis "Rhythm game in which you click on circles")
(description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game,
@@ -9318,7 +9318,7 @@ play with up to four players simultaneously. It has network support.")
(string-append "../hedgewars-src-" #$version)
(install-file "misc/hedgewars.png" icons))))))))
(inputs
- (list ffmpeg
+ (list ffmpeg-4
freeglut
ghc-entropy
ghc-hslogger
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm
index b477fee537..c98ceefad7 100644
--- a/gnu/packages/gnunet.scm
+++ b/gnu/packages/gnunet.scm
@@ -100,7 +100,7 @@
`(("exiv2" ,exiv2)
("bzip2" ,bzip2)
("flac" ,flac)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("file" ,file) ;libmagic, for the MIME plug-in
("glib" ,glib)
("giflib" ,giflib)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index efe1deede4..4642dfbe36 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1308,7 +1308,7 @@ visual effects work for film.")
("jasper" ,jasper)
("librsvg" ,librsvg)
("libxrandr" ,libxrandr)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("mesa" ,mesa)))
(synopsis "High-performance real-time graphics toolkit")
(description
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index fb45e9b141..ab796d7719 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -620,7 +620,7 @@ integrates with various databases on GUI toolkits such as Qt and Tk.")
(sha256
(base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26"))))))
(inputs
- (list ffmpeg
+ (list ffmpeg-4
gtk+
gtkglext
hdf5
@@ -925,7 +925,7 @@ recalculates.")
double-conversion
eigen
expat
- ffmpeg
+ ffmpeg-4
freetype
gdal
gl2ps
diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm
index 594c36b6ce..2b0f644736 100644
--- a/gnu/packages/julia-jll.scm
+++ b/gnu/packages/julia-jll.scm
@@ -254,7 +254,7 @@ build tree Yggdrasil.")
;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$")))))))
(inputs
- (list ffmpeg))
+ (list ffmpeg-4))
(propagated-inputs
(list julia-jllwrappers
julia-bzip2-jll
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 9fb3572909..d635eca26d 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -334,7 +334,7 @@ This package is part of the KDE multimedia module.")
(native-inputs
(list docbook-xsl
extra-cmake-modules
- ffmpeg
+ ffmpeg-4
kdoctools
libxslt
python-wrapper
diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm
index 402ee221c5..18791359f2 100644
--- a/gnu/packages/kodi.scm
+++ b/gnu/packages/kodi.scm
@@ -399,7 +399,7 @@ alternatives. In compilers, this can reduce the cascade of secondary errors.")
("dcadec" ,dcadec)
("dbus" ,dbus)
("eudev" ,eudev)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("flac" ,flac)
("flatbuffers" ,flatbuffers)
("fmt" ,fmt-7)
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 7b5efeb588..130097ef40 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -645,7 +645,7 @@ API. It also comprises a simple HTTP/HTTPS client implementation.")
("bcg729" ,bcg729)
("bcmatroska2" ,bcmatroska2)
("bctoolbox" ,bctoolbox)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("glew" ,glew)
("glu" ,glu)
("glx" ,mesa-utils)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c476940eed..9ea77069ca 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8991,7 +8991,7 @@ types and interfaces and translates so that the X server can use them.")
(list alsa-lib
dbus
eudev
- ffmpeg
+ ffmpeg-4
gstreamer
gst-plugins-base
libva
@@ -9035,6 +9035,7 @@ of Linux application development.")
(modify-inputs (package-native-inputs pipewire)
(prepend python-docutils)))
(inputs (modify-inputs (package-inputs pipewire)
+ (replace "ffmpeg" ffmpeg)
(prepend avahi
bluez
jack-2
diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm
index e2b112832b..03e4485618 100644
--- a/gnu/packages/mp3.scm
+++ b/gnu/packages/mp3.scm
@@ -643,7 +643,7 @@ command-line tool.")
(inputs
;; requires one of FFmpeg (prefered), FFTW3 or vDSP
;; use the same ffmpeg version as for acoustid-fingerprinter
- (list ffmpeg boost))
+ (list ffmpeg-4 boost))
(home-page "https://acoustid.org/chromaprint")
(synopsis "Audio fingerprinting library")
(description "Chromaprint is a library for calculating audio
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 026bb22770..e3cb67b413 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6806,7 +6806,7 @@ choice.")
(list alsa-lib
boost
curl
- ffmpeg
+ ffmpeg-4
lame
libev
libmicrohttpd
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 519a7d1548..6406fd5c49 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2546,7 +2546,7 @@ using the Enchant spell-checking library.")
cups-minimal
curl
dbus
- ffmpeg
+ ffmpeg-4
fontconfig
harfbuzz
icu4c
diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm
index 12a1d3e9eb..84a07e6ba9 100644
--- a/gnu/packages/rdesktop.scm
+++ b/gnu/packages/rdesktop.scm
@@ -101,7 +101,7 @@ to remotely control a user's Windows desktop.")
(inputs
`(("alsa-lib" ,alsa-lib)
("cups" ,cups)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("libjpeg" ,libjpeg-turbo)
("libusb" ,libusb)
("libx11" ,libx11)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a2cbc53f8c..a15c86ee07 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -273,7 +273,7 @@
python-wrapper))
(inputs
(list alsa-lib
- ffmpeg
+ ffmpeg-4
freetype
imagemagick
lame
@@ -450,7 +450,7 @@ as a joint effort between the BBC and Fluendo.")
(list gettext-minimal doxygen pkg-config))
(inputs
(list alsa-lib
- ffmpeg
+ ffmpeg-4
gtk+-2
lame
libdv
@@ -1876,7 +1876,7 @@ audio/video codec library.")
(format #t "setting LD_LIBRARY_PATH to ~s~%" path)
(setenv "LD_LIBRARY_PATH" path)))))))))
-(define-public ffmpeg ffmpeg-4)
+(define-public ffmpeg ffmpeg-5)
(define-public ffmpeg-for-stepmania
(hidden-package
@@ -1923,7 +1923,7 @@ audio/video codec library.")
(native-inputs
(list pkg-config))
(inputs
- (list ffmpeg libjpeg-turbo libpng gvfs))
+ (list ffmpeg-4 libjpeg-turbo libpng gvfs))
(arguments
`(#:configure-flags (list "-DENABLE_GIO=ON" "-DENABLE_THUMBNAILER=ON")))
(home-page "https://github.com/dirkvdb/ffmpegthumbnailer")
@@ -2102,7 +2102,7 @@ streaming protocols.")
(inputs
`(("alsa-lib" ,alsa-lib)
("cdparanoia" ,cdparanoia)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("giflib" ,giflib)
@@ -3296,6 +3296,7 @@ tools, XML authoring components, and an extensible plug-in based API.")
,@(package-arguments mlt)))
(inputs
(modify-inputs (package-inputs mlt)
+ (replace "ffmpeg" ffmpeg-4)
(replace "gtk+" gtk+-2)))))
(define-public v4l-utils
@@ -3409,7 +3410,7 @@ be used for realtime video capture via Linux-specific APIs.")
bash-minimal
curl
eudev
- ffmpeg
+ ffmpeg-4
fontconfig
freetype
glib
@@ -3679,7 +3680,7 @@ making @dfn{screencasts}.")
;; As a result, they are omitted. Please add them back if problems appear.
(inputs
(list alsa-lib
- ffmpeg
+ ffmpeg-4
glu
jack-1
libxi
@@ -3872,7 +3873,7 @@ supported players in addition to this package.")
(inputs
`(("bzip2" ,bzip2)
("dbus-glib" ,dbus-glib)
- ("ffmpeg" ,ffmpeg)
+ ("ffmpeg" ,ffmpeg-4)
("fontconfig" ,fontconfig)
("freetype" ,freetype)
("glib" ,glib)
@@ -4313,7 +4314,7 @@ and ITU-T H.222.0.")
(inputs
(list zlib))
(propagated-inputs
- (list ffmpeg))
+ (list ffmpeg-4))
(native-inputs
(list pkg-config))
(synopsis "Cross-platform wrapper around ffmpeg/libav")
@@ -4743,7 +4744,7 @@ create smoother and stable videos.")
(list alsa-lib zlib))
(propagated-inputs ;all referenced in installed headers
(list cppzmq
- ffmpeg
+ ffmpeg-4
imagemagick
jsoncpp
libopenshot-audio
@@ -4968,7 +4969,7 @@ speed and correctness.")
"01qbcgfl3g9kfwn1jf1z9pdj3bvf5lmg71d1vwkcllc2az24bjqp"))))
(build-system meson-build-system)
(native-inputs (list libdrm pkg-config))
- (inputs (list ffmpeg pulseaudio wayland wayland-protocols))
+ (inputs (list ffmpeg-4 pulseaudio wayland wayland-protocols))
(home-page "https://github.com/atomnuker/wlstream")
(synopsis "Screen capture tool for Wayland sessions")
(description "Wlstream is a screen capture tool for recording audio and
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-15 16:10:15 +0000