gnu: ffmpeg: Promote version 5 to the default.

* gnu/packages/video.scm (ffmpeg): Alias to FFMPEG-5.
(mlt-6)[inpust]: Replace "ffmpeg" with FFMPEG-4.
(transcode, libquicktime, ffmpegthumbnailer, mplayer, obs,
simplescreenrecorder, handbrake, ffms2, libopenshot, wlstream)[inputs]: Change
from FFMPEG to FFMPEG-4.
* gnu/packages/arcan.scm (arcan)[inputs]: Likewise.
* gnu/packages/astronomy.scm (stackistry, libskry)[inputs]: Likewise.
* gnu/packages/audio.scm (aubio, bs1770gain)[inputs]: Likewise.
* gnu/packages/education.scm (openboard)[inputs]: Likewise.
* gnu/packages/emulators.scm (dolphin-emu, retroarch, pcsxr, ppsspp)[inputs]:
Likewise.
* gnu/packages/game-development.scm (warsow-qfusion)[inputs]: Likewise.
* gnu/packages/games.scm (oshu, hedgewars)[inputs]: Likewise.
* gnu/packages/gnunet.scm (libextractor)[inputs]: Likewise.
* gnu/packages/graphics.scm (openscenegraph)[inputs]: Likewise.
* gnu/packages/image-processing.scm (opencv, paraview-5.9)[inputs]: Likewise.
* gnu/packages/julia-jll.scm (julia-ffmpeg-jll)[inputs]: Likewise.
* gnu/packages/kde-multimedia.scm (kid3)[inputs]: Likewise.
* gnu/packages/kodi.scm (kodi)[inputs]: Likewise.
* gnu/packages/linphone.scm (mediastreamer2)[inputs]: Likewise.
* gnu/packages/linux.scm (pipewire)[inputs]: Likewise.
(pipewire-0.3)[inputs]: Replace "ffmpeg" with FFMPEG.
* gnu/packages/mp3.scm (chromaprint)[inputs]: Change from FFMPEG to FFMPEG-4.
* gnu/packages/music.scm (musikcube)[inputs]: Likewise.
* gnu/packages/rdesktop.scm (freerdp)[inputs]: Likewise.
* gnu/packages/qt.scm (qtwebengine-5)[inputs]: Likewise.
This commit is contained in:
Marius Bakke 2022-12-12 14:27:05 +01:00
parent bf9d119e32
commit 79564bf997
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
20 changed files with 43 additions and 37 deletions

View file

@ -123,7 +123,7 @@ (define-public arcan
(files '("share/arcan/scripts"))))) (files '("share/arcan/scripts")))))
(inputs (inputs
`(("apr" ,apr) `(("apr" ,apr)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype) ("freetype" ,freetype)
("glib" ,glib) ("glib" ,glib)
("glu" ,glu) ("glu" ,glu)

View file

@ -813,7 +813,7 @@ (define-public stackistry
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list gtkmm-3 libskry ffmpeg)) (list gtkmm-3 libskry ffmpeg-4))
(home-page "https://github.com/GreatAttractor/stackistry") (home-page "https://github.com/GreatAttractor/stackistry")
(synopsis "Astronomical lucky imaging/image stacking tool") (synopsis "Astronomical lucky imaging/image stacking tool")
(description (description
@ -1714,7 +1714,7 @@ (define-public libskry
(copy-recursively "include" include)) (copy-recursively "include" include))
#t))))) #t)))))
(inputs (inputs
(list ffmpeg)) (list ffmpeg-4))
(home-page "https://github.com/GreatAttractor/libskry") (home-page "https://github.com/GreatAttractor/libskry")
(synopsis "Astronimical lucky imaging library") (synopsis "Astronimical lucky imaging library")
(description (description

View file

@ -603,7 +603,11 @@ (define-public aubio
"--enable-samplerate" "--enable-samplerate"
"--enable-avcodec"))) "--enable-avcodec")))
(inputs (inputs
(list jack-1 libsndfile libsamplerate fftwf ffmpeg)) ; for libavcodec (list jack-1
libsndfile
libsamplerate
ffmpeg-4 ;for libavcodec
fftwf))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(home-page "https://aubio.org/") (home-page "https://aubio.org/")
@ -4442,7 +4446,7 @@ (define-public bs1770gain
,home-page)) ,home-page))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list ffmpeg sox)) (inputs (list ffmpeg-4 sox))
(synopsis "Tool to adjust loudness of media files") (synopsis "Tool to adjust loudness of media files")
(description (description
"BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its "BS1770GAIN is a loudness scanner compliant with ITU-R BS.1770 and its

View file

@ -547,7 +547,7 @@ (define-public openboard
(inputs (inputs
(list alsa-lib (list alsa-lib
coreutils-minimal ;for patched 'env' shebang coreutils-minimal ;for patched 'env' shebang
ffmpeg ffmpeg-4
freetype freetype
lame lame
libass libass

View file

@ -323,7 +323,7 @@ (define-public dolphin-emu
bluez bluez
curl curl
eudev eudev
ffmpeg ffmpeg-4
font-wqy-microhei font-wqy-microhei
freetype freetype
glew glew
@ -1471,7 +1471,7 @@ (define-public retroarch
"--disable-builtinminiupnpc"))))))) "--disable-builtinminiupnpc")))))))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("freetype" ,freetype) ("freetype" ,freetype)
("libxinerama" ,libxinerama) ("libxinerama" ,libxinerama)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
@ -2035,7 +2035,7 @@ (define-public pcsxr
(list libcdio (list libcdio
sdl2 sdl2
gtk+ gtk+
ffmpeg ffmpeg-4
libxv libxv
libarchive libarchive
pulseaudio)) pulseaudio))
@ -2322,7 +2322,7 @@ (define-public ppsspp
(native-inputs (list pkg-config python)) (native-inputs (list pkg-config python))
(inputs (list bash (inputs (list bash
cityhash cityhash
ffmpeg ffmpeg-4
glew glew
glslang glslang
libpng libpng

View file

@ -2665,7 +2665,7 @@ (define-public warsow-qfusion
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("curl" ,curl) ("curl" ,curl)
("freetype" ,freetype) ("freetype" ,freetype)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libogg" ,libogg) ("libogg" ,libogg)
("libpng" ,libpng) ("libpng" ,libpng)

View file

@ -8478,7 +8478,7 @@ (define-public oshu
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list cairo ffmpeg pango sdl2 sdl2-image)) (list cairo ffmpeg-4 pango sdl2 sdl2-image))
(home-page "https://github.com/fmang/oshu/") (home-page "https://github.com/fmang/oshu/")
(synopsis "Rhythm game in which you click on circles") (synopsis "Rhythm game in which you click on circles")
(description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game, (description "@i{oshu!} is a minimalist variant of the @i{osu!} rhythm game,
@ -9318,7 +9318,7 @@ (define-public hedgewars
(string-append "../hedgewars-src-" #$version) (string-append "../hedgewars-src-" #$version)
(install-file "misc/hedgewars.png" icons)))))))) (install-file "misc/hedgewars.png" icons))))))))
(inputs (inputs
(list ffmpeg (list ffmpeg-4
freeglut freeglut
ghc-entropy ghc-entropy
ghc-hslogger ghc-hslogger

View file

@ -100,7 +100,7 @@ (define-public libextractor
`(("exiv2" ,exiv2) `(("exiv2" ,exiv2)
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("flac" ,flac) ("flac" ,flac)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("file" ,file) ;libmagic, for the MIME plug-in ("file" ,file) ;libmagic, for the MIME plug-in
("glib" ,glib) ("glib" ,glib)
("giflib" ,giflib) ("giflib" ,giflib)

View file

@ -1308,7 +1308,7 @@ (define-public openscenegraph
("jasper" ,jasper) ("jasper" ,jasper)
("librsvg" ,librsvg) ("librsvg" ,librsvg)
("libxrandr" ,libxrandr) ("libxrandr" ,libxrandr)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("mesa" ,mesa))) ("mesa" ,mesa)))
(synopsis "High-performance real-time graphics toolkit") (synopsis "High-performance real-time graphics toolkit")
(description (description

View file

@ -620,7 +620,7 @@ (define-public opencv
(sha256 (sha256
(base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26")))))) (base32 "0ga0l4ranp1834gxgp487ll1amvmssa02l2nk5ja5w0rx4d8hh26"))))))
(inputs (inputs
(list ffmpeg (list ffmpeg-4
gtk+ gtk+
gtkglext gtkglext
hdf5 hdf5
@ -925,7 +925,7 @@ (define-public paraview-5.9
double-conversion double-conversion
eigen eigen
expat expat
ffmpeg ffmpeg-4
freetype freetype
gdal gdal
gl2ps gl2ps

View file

@ -254,7 +254,7 @@ (define-public julia-ffmpeg-jll
;; There's a Julia file for each platform, override them all ;; There's a Julia file for each platform, override them all
(find-files "src/wrappers/" "\\.jl$"))))))) (find-files "src/wrappers/" "\\.jl$")))))))
(inputs (inputs
(list ffmpeg)) (list ffmpeg-4))
(propagated-inputs (propagated-inputs
(list julia-jllwrappers (list julia-jllwrappers
julia-bzip2-jll julia-bzip2-jll

View file

@ -334,7 +334,7 @@ (define-public kid3
(native-inputs (native-inputs
(list docbook-xsl (list docbook-xsl
extra-cmake-modules extra-cmake-modules
ffmpeg ffmpeg-4
kdoctools kdoctools
libxslt libxslt
python-wrapper python-wrapper

View file

@ -399,7 +399,7 @@ (define-public kodi
("dcadec" ,dcadec) ("dcadec" ,dcadec)
("dbus" ,dbus) ("dbus" ,dbus)
("eudev" ,eudev) ("eudev" ,eudev)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("flac" ,flac) ("flac" ,flac)
("flatbuffers" ,flatbuffers) ("flatbuffers" ,flatbuffers)
("fmt" ,fmt-7) ("fmt" ,fmt-7)

View file

@ -645,7 +645,7 @@ (define-public mediastreamer2
("bcg729" ,bcg729) ("bcg729" ,bcg729)
("bcmatroska2" ,bcmatroska2) ("bcmatroska2" ,bcmatroska2)
("bctoolbox" ,bctoolbox) ("bctoolbox" ,bctoolbox)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("glew" ,glew) ("glew" ,glew)
("glu" ,glu) ("glu" ,glu)
("glx" ,mesa-utils) ("glx" ,mesa-utils)

View file

@ -8991,7 +8991,7 @@ (define-public pipewire
(list alsa-lib (list alsa-lib
dbus dbus
eudev eudev
ffmpeg ffmpeg-4
gstreamer gstreamer
gst-plugins-base gst-plugins-base
libva libva
@ -9035,6 +9035,7 @@ (define-public pipewire-0.3
(modify-inputs (package-native-inputs pipewire) (modify-inputs (package-native-inputs pipewire)
(prepend python-docutils))) (prepend python-docutils)))
(inputs (modify-inputs (package-inputs pipewire) (inputs (modify-inputs (package-inputs pipewire)
(replace "ffmpeg" ffmpeg)
(prepend avahi (prepend avahi
bluez bluez
jack-2 jack-2

View file

@ -643,7 +643,7 @@ (define-public chromaprint
(inputs (inputs
;; requires one of FFmpeg (prefered), FFTW3 or vDSP ;; requires one of FFmpeg (prefered), FFTW3 or vDSP
;; use the same ffmpeg version as for acoustid-fingerprinter ;; use the same ffmpeg version as for acoustid-fingerprinter
(list ffmpeg boost)) (list ffmpeg-4 boost))
(home-page "https://acoustid.org/chromaprint") (home-page "https://acoustid.org/chromaprint")
(synopsis "Audio fingerprinting library") (synopsis "Audio fingerprinting library")
(description "Chromaprint is a library for calculating audio (description "Chromaprint is a library for calculating audio

View file

@ -6806,7 +6806,7 @@ (define-public musikcube
(list alsa-lib (list alsa-lib
boost boost
curl curl
ffmpeg ffmpeg-4
lame lame
libev libev
libmicrohttpd libmicrohttpd

View file

@ -2546,7 +2546,7 @@ (define-public qtwebengine-5
cups-minimal cups-minimal
curl curl
dbus dbus
ffmpeg ffmpeg-4
fontconfig fontconfig
harfbuzz harfbuzz
icu4c icu4c

View file

@ -101,7 +101,7 @@ (define-public freerdp
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("cups" ,cups) ("cups" ,cups)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("libjpeg" ,libjpeg-turbo) ("libjpeg" ,libjpeg-turbo)
("libusb" ,libusb) ("libusb" ,libusb)
("libx11" ,libx11) ("libx11" ,libx11)

View file

@ -273,7 +273,7 @@ (define-public transcode
python-wrapper)) python-wrapper))
(inputs (inputs
(list alsa-lib (list alsa-lib
ffmpeg ffmpeg-4
freetype freetype
imagemagick imagemagick
lame lame
@ -450,7 +450,7 @@ (define-public libquicktime
(list gettext-minimal doxygen pkg-config)) (list gettext-minimal doxygen pkg-config))
(inputs (inputs
(list alsa-lib (list alsa-lib
ffmpeg ffmpeg-4
gtk+-2 gtk+-2
lame lame
libdv libdv
@ -1876,7 +1876,7 @@ (define-public ffmpeg-2.8
(format #t "setting LD_LIBRARY_PATH to ~s~%" path) (format #t "setting LD_LIBRARY_PATH to ~s~%" path)
(setenv "LD_LIBRARY_PATH" path))))))))) (setenv "LD_LIBRARY_PATH" path)))))))))
(define-public ffmpeg ffmpeg-4) (define-public ffmpeg ffmpeg-5)
(define-public ffmpeg-for-stepmania (define-public ffmpeg-for-stepmania
(hidden-package (hidden-package
@ -1923,7 +1923,7 @@ (define-public ffmpegthumbnailer
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list ffmpeg libjpeg-turbo libpng gvfs)) (list ffmpeg-4 libjpeg-turbo libpng gvfs))
(arguments (arguments
`(#:configure-flags (list "-DENABLE_GIO=ON" "-DENABLE_THUMBNAILER=ON"))) `(#:configure-flags (list "-DENABLE_GIO=ON" "-DENABLE_THUMBNAILER=ON")))
(home-page "https://github.com/dirkvdb/ffmpegthumbnailer") (home-page "https://github.com/dirkvdb/ffmpegthumbnailer")
@ -2102,7 +2102,7 @@ (define-public mplayer
(inputs (inputs
`(("alsa-lib" ,alsa-lib) `(("alsa-lib" ,alsa-lib)
("cdparanoia" ,cdparanoia) ("cdparanoia" ,cdparanoia)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("giflib" ,giflib) ("giflib" ,giflib)
@ -3296,6 +3296,7 @@ (define-public mlt-6
,@(package-arguments mlt))) ,@(package-arguments mlt)))
(inputs (inputs
(modify-inputs (package-inputs mlt) (modify-inputs (package-inputs mlt)
(replace "ffmpeg" ffmpeg-4)
(replace "gtk+" gtk+-2))))) (replace "gtk+" gtk+-2)))))
(define-public v4l-utils (define-public v4l-utils
@ -3409,7 +3410,7 @@ (define-public obs
bash-minimal bash-minimal
curl curl
eudev eudev
ffmpeg ffmpeg-4
fontconfig fontconfig
freetype freetype
glib glib
@ -3679,7 +3680,7 @@ (define-public simplescreenrecorder
;; As a result, they are omitted. Please add them back if problems appear. ;; As a result, they are omitted. Please add them back if problems appear.
(inputs (inputs
(list alsa-lib (list alsa-lib
ffmpeg ffmpeg-4
glu glu
jack-1 jack-1
libxi libxi
@ -3872,7 +3873,7 @@ (define-public handbrake
(inputs (inputs
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)
("dbus-glib" ,dbus-glib) ("dbus-glib" ,dbus-glib)
("ffmpeg" ,ffmpeg) ("ffmpeg" ,ffmpeg-4)
("fontconfig" ,fontconfig) ("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("glib" ,glib) ("glib" ,glib)
@ -4313,7 +4314,7 @@ (define-public ffms2
(inputs (inputs
(list zlib)) (list zlib))
(propagated-inputs (propagated-inputs
(list ffmpeg)) (list ffmpeg-4))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(synopsis "Cross-platform wrapper around ffmpeg/libav") (synopsis "Cross-platform wrapper around ffmpeg/libav")
@ -4743,7 +4744,7 @@ (define-public libopenshot
(list alsa-lib zlib)) (list alsa-lib zlib))
(propagated-inputs ;all referenced in installed headers (propagated-inputs ;all referenced in installed headers
(list cppzmq (list cppzmq
ffmpeg ffmpeg-4
imagemagick imagemagick
jsoncpp jsoncpp
libopenshot-audio libopenshot-audio
@ -4968,7 +4969,7 @@ (define-public wlstream
"01qbcgfl3g9kfwn1jf1z9pdj3bvf5lmg71d1vwkcllc2az24bjqp")))) "01qbcgfl3g9kfwn1jf1z9pdj3bvf5lmg71d1vwkcllc2az24bjqp"))))
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (list libdrm pkg-config)) (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") (home-page "https://github.com/atomnuker/wlstream")
(synopsis "Screen capture tool for Wayland sessions") (synopsis "Screen capture tool for Wayland sessions")
(description "Wlstream is a screen capture tool for recording audio and (description "Wlstream is a screen capture tool for recording audio and