From 5723c511c2d162e86b6d22592f90faf387c6daaf Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 28 Sep 2022 15:45:49 +0300 Subject: gnu: ffmpeg-5: Update to 5.1.2. * gnu/packages/video.scm (ffmpeg-5): Update to 5.1.2. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f07fe192ed..01c9ae186a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1575,14 +1575,14 @@ operate properly.") (define-public ffmpeg-5 (package (name "ffmpeg") - (version "5.1.1") + (version "5.1.2") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0d84pjmlb5ss1yybxic3wlyrr31wcsg29ysqx5qiwlcnqkw3zgwm")))) + "1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1")))) (build-system gnu-build-system) (inputs (append -- cgit v1.2.3 From 034f68bac3940420d6776f58522d6380023bb407 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 29 Sep 2022 21:53:35 +0800 Subject: gnu: qtwayland: Rename to qtwayland-5. Automated via: git grep -l qtwayland | xargs sed 's/\qtwayland\b/\0-5/g' -i git checkout NEWS Signed-off-by: Maxim Cournoyer --- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 4 ++-- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 61cbf19bc4..059667ee5d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1068,7 +1068,7 @@ protocols used in KDE Plasma.") (native-inputs (list extra-cmake-modules pkg-config)) (inputs - (list qtbase-5 qtwayland wayland wayland-protocols)) + (list qtbase-5 qtwayland-5 wayland wayland-protocols)) (arguments `(#:tests? #f ; FIXME tests require weston to run ; weston requires wayland flags in mesa diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 39716187fd..064f5f7278 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -177,7 +177,7 @@ call it if it is not associated to a terminal.") (list libxkbcommon qtbase-5 qtdeclarative-5 - qtwayland + qtwayland-5 wayland wayland-protocols)) (home-page "https://invent.kde.org/plasma/layer-shell-qt") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8c94d613d6..f6e5a37472 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -220,7 +220,7 @@ window managers, that don't provide Qt integration by themselves.") (list cmake-shared extra-cmake-modules pkg-config)) (inputs `(("qtbase" ,qtbase-5) - ("qtwayland" ,qtwayland) + ("qtwayland" ,qtwayland-5) ("wayland" ,wayland) ("xkbcommon" ,libxkbcommon))) (synopsis "Material Decoration for Qt") @@ -1450,7 +1450,7 @@ record media, and manage a collection of media content. It also contains a set of plugins for interacting with pulseaudio and GStreamer.") (license (package-license qtbase)))) -(define-public qtwayland +(define-public qtwayland-5 (package (inherit qtsvg-5) (name "qtwayland") (version "5.15.2") diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 2df68ccca7..82c9227ba8 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -502,7 +502,7 @@ Telegram project, for its use in telegram desktop client.") qtbase-5 qtimageformats qtsvg-5 - qtwayland + qtwayland-5 range-v3 rlottie-for-telegram-desktop rnnoise diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 01c9ae186a..ca6148b078 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3385,7 +3385,7 @@ be used for realtime video capture via Linux-specific APIs.") qtbase-5 qtsvg-5 qtx11extras - qtwayland + qtwayland-5 speexdsp v4l-utils wayland -- cgit v1.2.3 From 730f7c096df36f087a7cf9d289cd0f0bece1a5c2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 30 Sep 2022 12:43:44 +0300 Subject: gnu: rav1e: Force building with rust edition 2018. * gnu/packages/video.scm (rav1e)[arguments]: Add phase to force all input crates to be built with rust edition 2018. --- gnu/packages/video.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ca6148b078..6a14a85b74 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5285,6 +5285,12 @@ result in several formats: (substitute* "Cargo.toml" ;; Allow using more recent versions of (("~3.1.2") "~3")))) + (add-after 'configure 'force-rust-edition-2018 + (lambda* (#:key vendor-dir #:allow-other-keys) + ;; Force all the dependencies to not be higher than edition 2018. + (with-fluids ((%default-port-encoding #f)) + (substitute* (find-files vendor-dir "Cargo.toml") + (("edition = \\\"2021\\\"") "edition = \"2018\""))))) (replace 'build (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) -- cgit v1.2.3 From 782c7455e1ea3785e8c7e9b300d55c9ebb441a35 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 2 Oct 2022 23:15:55 +0200 Subject: gnu: ffmpeg@4: Build against SDL2 2.0 so 'ffplay' gets built. Fixes . Reported by Zhu Zihao . * gnu/packages/sdl.scm (sdl2-2.0): New variable. * gnu/packages/video.scm (ffmpeg-4)[inputs]: New field. --- gnu/packages/sdl.scm | 14 ++++++++++++++ gnu/packages/video.scm | 2 ++ 2 files changed, 16 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index 2523889a8d..2a10ff3962 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -155,6 +155,20 @@ joystick, and graphics hardware.") wayland-protocols))) (license license:bsd-3))) +(define-public sdl2-2.0 + (package + (inherit sdl2) + (name "sdl2") + (version "2.0.14") + (source (origin + (method url-fetch) + (uri + (string-append "https://libsdl.org/release/SDL2-" + version ".tar.gz")) + (sha256 + (base32 + "1g1jahknv5r4yhh1xq5sf0md20ybdw1zh1i15lry26sq39bmn8fq")))))) + (define-public libmikmod (package (name "libmikmod") diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6a14a85b74..5568c5be8b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1772,6 +1772,8 @@ audio/video codec library.") (sha256 (base32 "14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg")))) + (inputs (modify-inputs (package-inputs ffmpeg-5) + (replace "sdl2" sdl2-2.0))) (arguments (substitute-keyword-arguments (package-arguments ffmpeg-5) ((#:configure-flags flags ''()) -- cgit v1.2.3 From b86867417fa76384eae76fcef099cf4d133bb20d Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Sun, 2 Oct 2022 00:56:44 +0200 Subject: gnu: celluloid: Do not install icon cache. Fixes . * gnu/packages/video.scm (celluloid)[arguments]: Add phase disable-postinstall-script so postinstall-script does nothing. Build with glib-or-gtk meson option. [native-inputs]: Remove desktop-file-utils, gtk:bin. Signed-off-by: Efraim Flashner --- gnu/packages/video.scm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5568c5be8b..e6da6ce04f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -785,12 +785,18 @@ old-fashioned output methods with powerful ascii-art renderer.") (sha256 (base32 "0ns9xh582c8kajw4v2x5ap5jfiba3gxywqc2klc0v6fc3id1gqii")))) (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-postinstall-script + (lambda _ + (setenv "DESTDIR" "/")))))) (native-inputs (list - desktop-file-utils ; for update-desktop-database intltool `(,glib "bin") ; for glib-compile-resources - `(,gtk "bin") ; for gtk-update-icon-cache pkg-config python-wrapper)) ; for generate-authors.py (inputs -- cgit v1.2.3 From 27a3a5d193c9c2660c51aa389f642fd08d956dd1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 9 Oct 2022 21:42:09 +0200 Subject: gnu: svt-hevc: Mark as supported on x86_64-linux only. This package fails to build on i686-linux: it makes use of SSE2 and related intrinsics not supported on i686. * gnu/packages/video.scm (svt-hevc)[supported-systems]: Remove "i686-linux". * gnu/packages/gstreamer.scm (gst-plugins-bad)[inputs]: Adjust condition accordingly. --- gnu/packages/gstreamer.scm | 6 +++--- gnu/packages/video.scm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 5017da1091..6e2902d76a 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -889,9 +889,9 @@ model to base your own plug-in on, here it is.") ("soundtouch" ,soundtouch) ("spandsp" ,spandsp) ("srt" ,srt) - ,@(if (target-x86?) - `(("svthevcenc" ,svt-hevc)) - '()) + ,@(if (target-x86-64?) + `(("svthevcenc" ,svt-hevc)) + '()) ("tinyalsa" ,tinyalsa) ("transcode" ,transcode) ("usrsctp" ,usrsctp) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e6da6ce04f..876f0c66cb 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -335,7 +335,7 @@ the SVT-HEVC encoder, it is possible to spread video encoding processing across multiple Intel's Xeon processors to achieve a real advantage of processing efficiency.") (home-page "https://01.org/svt") - (supported-systems '("x86_64-linux" "i686-linux")) + (supported-systems '("x86_64-linux")) (license (license:non-copyleft "file:///LICENSE.md")))) (define-public mediasdk -- cgit v1.2.3 From 72865a2e8a2a1d0e49f21f358484ac8c85338a15 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 16 Oct 2022 13:26:53 +0200 Subject: gnu: ffmpeg: Don't mention libfaac. * gnu/packages/video.scm (ffmpeg-5): Remove comment mentioning faac. --- gnu/packages/video.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 01627bf583..d5ab7ba64c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1644,7 +1644,6 @@ operate properly.") ;; --enable-libcelt enable CELT decoding via libcelt [no] ;; --enable-libdc1394 enable IIDC-1394 grabbing using libdc1394 ;; and libraw1394 [no] - ;; --enable-libfaac enable AAC encoding via libfaac [no] ;; --enable-libfdk-aac enable AAC de/encoding via libfdk-aac [no] ;; --enable-libflite enable flite (voice synthesis) support via ;; libflite [no] -- cgit v1.2.3 From 1229979232259d6e9cef5af8e8dfd362fdd5374f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 16 Oct 2022 13:27:32 +0200 Subject: gnu: transcode: Build without faac. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (transcode)[#:configure-flags]: Remove “--enable-faac”. [inputs]: Remove faac. --- gnu/packages/video.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d5ab7ba64c..9fb17cf5ba 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -250,7 +250,6 @@ "--enable-libquicktime" "--enable-lzo" "--enable-a52" - "--enable-faac" "--enable-libxml2" ;;; XXX: Not available. ;"--enable-ibp" @@ -274,7 +273,6 @@ python-wrapper)) (inputs (list alsa-lib - faac ffmpeg freetype imagemagick -- cgit v1.2.3 From 32be0431ff1e3aaedde3dc5fff46fdb89348579f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:02 +0200 Subject: gnu: mpv: Remove trailing #t from phases. * gnu/packages/video.scm (mpv)[arguments]: Don't explicitly return #t from phases. --- gnu/packages/video.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9fb17cf5ba..43686034ba 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2226,15 +2226,13 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ;; and passed as linker flags, but the order in which they are added ;; varies. See . ;; Set PYTHONHASHSEED as a workaround for deterministic results. - (setenv "PYTHONHASHSEED" "1") - #t)) + (setenv "PYTHONHASHSEED" "1"))) (add-before 'configure 'setup-waf (lambda* (#:key inputs #:allow-other-keys) (let ((waf (assoc-ref inputs "waf"))) (copy-file (string-append waf "/bin/waf") "waf")) - (setenv "CC" "gcc") - #t))) + (setenv "CC" "gcc")))) #:configure-flags (list "--enable-libmpv-shared" "--enable-cdda" "--enable-dvdnav" -- cgit v1.2.3 From 51aac125f0c17c6bdb1cb9c4534494a68714a5f8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:01 +0200 Subject: gnu: mpv: Remove input labels. * gnu/packages/video.scm (mpv)[inputs]: Remove input labels. [arguments]: Use SEARCH-INPUT-FILE instead. --- gnu/packages/video.scm | 104 ++++++++++++++++++++++++------------------------- 1 file changed, 51 insertions(+), 53 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 43686034ba..a9c1debc08 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2168,58 +2168,15 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (sha256 (base32 "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk")))) (build-system waf-build-system) - (native-inputs - (list perl ; for zsh completion file - pkg-config python-docutils)) - ;; Missing features: libguess, V4L2 - (inputs - `(("alsa-lib" ,alsa-lib) - ("enca" ,enca) - ("ffmpeg" ,ffmpeg) - ("jack" ,jack-1) - ("ladspa" ,ladspa) - ("lcms" ,lcms) - ("libass" ,libass) - ("libbluray" ,libbluray) - ("libcaca" ,libcaca) - ("libbs2b" ,libbs2b) - ("libcdio-paranoia" ,libcdio-paranoia) - ("libdvdread" ,libdvdread) - ("libdvdnav" ,libdvdnav) - ("libjpeg" ,libjpeg-turbo) - ("libva" ,libva) - ("libvdpau" ,libvdpau) - ("libx11" ,libx11) - ("libxext" ,libxext) - ("libxinerama" ,libxinerama) - ("libxrandr" ,libxrandr) - ("libxscrnsaver" ,libxscrnsaver) - ("libxv" ,libxv) - ;; XXX: lua > 5.2 is not currently supported; see - ;; waftools/checks/custom.py - ("lua" ,lua-5.2) - ("mesa" ,mesa) - ("mpg123" ,mpg123) - ("pulseaudio" ,pulseaudio) - ("rsound" ,rsound) - ("shaderc" ,shaderc) - ("vulkan-headers" ,vulkan-headers) - ("vulkan-loader" ,vulkan-loader) - ("waf" ,python-waf) - ("wayland" ,wayland) - ("wayland-protocols" ,wayland-protocols) - ("libxkbcommon" ,libxkbcommon) - ("yt-dlp" ,yt-dlp) - ("zlib" ,zlib))) (arguments '(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((ytdl (assoc-ref inputs "yt-dlp"))) - (substitute* "player/lua/ytdl_hook.lua" - (("\"yt-dlp\",") - (string-append "\"" ytdl "/bin/yt-dlp\",")))))) + (substitute* "player/lua/ytdl_hook.lua" + (("\"yt-dlp\",") + (string-append + "\"" (search-input-file inputs "bin/yt-dlp") "\","))))) (add-before 'configure 'build-reproducibly (lambda _ ;; Somewhere in the build system library dependencies are enumerated @@ -2227,18 +2184,59 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ;; varies. See . ;; Set PYTHONHASHSEED as a workaround for deterministic results. (setenv "PYTHONHASHSEED" "1"))) - (add-before - 'configure 'setup-waf - (lambda* (#:key inputs #:allow-other-keys) - (let ((waf (assoc-ref inputs "waf"))) - (copy-file (string-append waf "/bin/waf") "waf")) - (setenv "CC" "gcc")))) + (add-before 'configure 'set-up-waf + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (search-input-file inputs "/bin/waf") "waf") + (setenv "CC" "gcc")))) #:configure-flags (list "--enable-libmpv-shared" "--enable-cdda" "--enable-dvdnav" "--disable-build-date") ;; No check function defined. #:tests? #f)) + (native-inputs + (list perl ; for zsh completion file + pkg-config python-docutils)) + ;; Missing features: libguess, V4L2. + (inputs + (list alsa-lib + enca + ffmpeg + jack-1 + ladspa + lcms + libass + libbluray + libcaca + libbs2b + libcdio-paranoia + libdvdread + libdvdnav + libjpeg-turbo + libva + libvdpau + libx11 + libxext + libxkbcommon + libxinerama + libxrandr + libxscrnsaver + libxv + ;; XXX: lua > 5.2 is not currently supported; see + ;; waftools/checks/custom.py + lua-5.2 + mesa + mpg123 + pulseaudio + python-waf + rsound + shaderc + vulkan-headers + vulkan-loader + wayland + wayland-protocols + yt-dlp + zlib)) (home-page "https://mpv.io/") (synopsis "Audio and video player") (description "mpv is a general-purpose audio and video player. It is a -- cgit v1.2.3 From 9eea2db6aeb73a2f81d12a1334e200aa560ef5e2 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:01 +0200 Subject: gnu: mpv: Use G-expressions. * gnu/packages/video.scm (mpv)[arguments]: Rewrite as G-expressions. --- gnu/packages/video.scm | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a9c1debc08..522894ec44 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2169,31 +2169,33 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (base32 "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk")))) (build-system waf-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "player/lua/ytdl_hook.lua" - (("\"yt-dlp\",") - (string-append - "\"" (search-input-file inputs "bin/yt-dlp") "\","))))) - (add-before 'configure 'build-reproducibly - (lambda _ - ;; Somewhere in the build system library dependencies are enumerated - ;; and passed as linker flags, but the order in which they are added - ;; varies. See . - ;; Set PYTHONHASHSEED as a workaround for deterministic results. - (setenv "PYTHONHASHSEED" "1"))) - (add-before 'configure 'set-up-waf - (lambda* (#:key inputs #:allow-other-keys) - (copy-file (search-input-file inputs "/bin/waf") "waf") - (setenv "CC" "gcc")))) - #:configure-flags (list "--enable-libmpv-shared" - "--enable-cdda" - "--enable-dvdnav" - "--disable-build-date") - ;; No check function defined. - #:tests? #f)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "player/lua/ytdl_hook.lua" + (("\"yt-dlp\",") + (string-append + "\"" (search-input-file inputs "bin/yt-dlp") "\","))))) + (add-before 'configure 'build-reproducibly + (lambda _ + ;; Somewhere in the build system library dependencies are enumerated + ;; and passed as linker flags, but the order in which they are added + ;; varies. See . + ;; Set PYTHONHASHSEED as a workaround for deterministic results. + (setenv "PYTHONHASHSEED" "1"))) + (add-before 'configure 'set-up-waf + (lambda* (#:key inputs #:allow-other-keys) + (copy-file (search-input-file inputs "bin/waf") "waf") + (setenv "CC" "gcc")))) + #:configure-flags + #~(list "--enable-libmpv-shared" + "--enable-cdda" + "--enable-dvdnav" + "--disable-build-date") + ;; No check function defined. + #:tests? #f)) (native-inputs (list perl ; for zsh completion file pkg-config python-docutils)) -- cgit v1.2.3 From 188acd0aacf5172c4323a748f130e66216854aa6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 16 Oct 2022 02:00:01 +0200 Subject: gnu: mpv: Prepare for cross-compilation. * gnu/packages/video.scm (mpv)[arguments]: Use CC-FOR-TARGET. --- gnu/packages/video.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 522894ec44..ccbfc76126 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2188,7 +2188,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (add-before 'configure 'set-up-waf (lambda* (#:key inputs #:allow-other-keys) (copy-file (search-input-file inputs "bin/waf") "waf") - (setenv "CC" "gcc")))) + (setenv "CC" #$(cc-for-target))))) #:configure-flags #~(list "--enable-libmpv-shared" "--enable-cdda" -- cgit v1.2.3 From 5197b07e0e32d284ed2db51746adffcb3f9297f2 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 30 Oct 2022 22:44:09 +0200 Subject: gnu: mpv-mpris: Update to 0.9. * gnu/packages/video.scm (mpv-mpris): Update to 0.9. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ccbfc76126..69f86b7906 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2328,7 +2328,7 @@ images and image hosting sites.") (define-public mpv-mpris (package (name "mpv-mpris") - (version "0.6") + (version "0.9") (source (origin (method git-fetch) @@ -2337,7 +2337,7 @@ images and image hosting sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "03gldk149i2108w3ylyfmci77kdq4whdzfavh7hjviwyj534101r")))) + (base32 "1c7avpzcd3sry3q7g5spcl3ywybpjzl2gjarmnlrp74k4nhbprcm")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From a7f7079b4735093bb72e028d4c7f8940bd8e1b15 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 30 Oct 2022 02:00:01 +0100 Subject: gnu: yt-dlp: Update to 2022.10.04. * gnu/packages/video.scm (yt-dlp): Update to 2022.10.04. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 69f86b7906..a75be99b58 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2492,7 +2492,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2022.09.01") + (version "2022.10.04") (source (origin (method git-fetch) @@ -2501,7 +2501,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0h46624zdqhjf79m78303v00m2r013yaccanv0010rls17v7y6pq")))) + (base32 "0g2nvslzb9yx2axv6yqxdcdh49ckyipyy9apx1lx6bg6y9rjvx6v")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) (not (%current-target-system))) -- cgit v1.2.3 From be25e992f4611c9476cd3243ac5cd58356aca0e9 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 29 Oct 2022 11:54:56 -0300 Subject: gnu: shotcut: Update to 22.10.25. * gnu/packages/video.scm (shotcut): Update to 22.10.25. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a75be99b58..2478b6bb90 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4819,7 +4819,7 @@ transitions, and effects and then export your film to many common formats.") (define-public shotcut (package (name "shotcut") - (version "22.06.23") + (version "22.10.25") (source (origin (method git-fetch) @@ -4828,7 +4828,7 @@ transitions, and effects and then export your film to many common formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1kvhcblzjdjiv3jggdx41djq9pz6a9hg4ilgcwin13gb19ir7dcc")))) + (base32 "12n179d1ymmzvlx5rzwmd89gwaa731b4y66nfl8wlr88wss4mncm")))) (build-system qt-build-system) (arguments `(#:tests? #f ;there are no tests -- cgit v1.2.3 From 0d3fbfa347e5798cc066ed4a1bd1557c7858c4de Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 2 Nov 2022 11:54:33 -0400 Subject: gnu: Add libvpx-next. * gnu/packages/video.scm (libvpx-next): New variable. --- gnu/packages/video.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2478b6bb90..cf260d71a3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2406,6 +2406,22 @@ To load this plugin, specify the following option when starting mpv: (license license:bsd-3) (home-page "https://www.webmproject.org/"))) +;;; TODO: Merge into libvpx on staging. +(define-public libvpx-next + (package + (inherit libvpx) + (name "libvpx") + (version "1.12.0") + (source (origin + (inherit (package-source libvpx)) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm")))))) + (define-public youtube-dl (package (name "youtube-dl") -- cgit v1.2.3 From 03d4c76be30ef280209539f32ba573b4961a7641 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 2 Nov 2022 11:54:42 -0400 Subject: gnu: Add libx264-next. * gnu/packages/video.scm (libx264-next): New variable. --- gnu/packages/video.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cf260d71a3..c95bb02507 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -977,6 +977,27 @@ H.264 (MPEG-4 AVC) video streams.") "file://extras/cl.h" "See extras/cl.h in the distribution.")))))) +;;; TODO: Merge into libx264 on staging. +(define-public libx264-next + ;; There are no tags in the repository, so we take the version number from + ;; the X264_BUILD variable defined in x264.h. + (let ((version "164") + (commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab") + (revision "0")) + (package + (inherit libx264) + (name "libx264") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://code.videolan.org/videolan/x264.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq"))))))) + (define-public mkvtoolnix (package (name "mkvtoolnix") -- cgit v1.2.3 From 451d2802f6471d1a5f2eea08ae7ce2ad8747f797 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 3 Nov 2022 15:06:55 -0400 Subject: gnu: fmt: Update to 9.1.0. * gnu/packages/pretty-print.scm (fmt): Update to 9.1.0. (fmt-8): New variable. * gnu/packages/hyperledger.scm (hyperledger-iroha) [snippet]: Delete trailing #t. [native-inputs]: Re-indent. Replace fmt with fmt-8. * gnu/packages/networking.scm (opendht) [inputs]: Replace fmt with fmt-8. * gnu/packages/storage.scm (ceph): Likewise. * gnu/packages/video.scm (mkvtoolnix): Likewise. * gnu/packages/aidc.scm (zxing-cpp): Likewise. * gnu/packages/wm.scm (waybar): Likewise. * gnu/packages/geo.scm (osm2pgsql): Likewise. * gnu/packages/graphics.scm (openimageio): Likewise. * gnu/packages/build-tools.scm (bear): Likewise. * gnu/packages/networking.scm (restinio): Likewise. --- gnu/packages/aidc.scm | 3 +-- gnu/packages/build-tools.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/hyperledger.scm | 9 ++++++--- gnu/packages/networking.scm | 4 ++-- gnu/packages/pretty-print.scm | 30 ++++++++++++++++++++---------- gnu/packages/storage.scm | 2 +- gnu/packages/video.scm | 2 +- gnu/packages/wm.scm | 2 +- 10 files changed, 35 insertions(+), 23 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index 5e77ae3c5a..b0fc1b30d9 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -64,8 +64,7 @@ (base32 "1yl2cpaqiv1g4nq9v0xfj1vd5faz55k4541vz6hsffvcxgn9nmc5")))) (build-system cmake-build-system) - (native-inputs - (list fmt googletest)) + (native-inputs (list fmt-8 googletest)) (synopsis "C++ port of ZXing") (description "ZXing-CPP is a barcode scanning library.") (home-page "https://github.com/nu-book/zxing-cpp") diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 376c4d3486..9cd11f08ea 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -135,7 +135,7 @@ makes a few sacrifices to acquire fast full and incremental build times.") (invoke "ctest"))))))) (inputs `(("c-ares" ,c-ares) - ("fmt" ,fmt) + ("fmt" ,fmt-8) ("grpc" ,grpc) ("json-modern-cxx" ,json-modern-cxx) ("protobuf" ,protobuf) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index dc5a77e820..9895756864 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1384,7 +1384,7 @@ based on the Osmium library.") (list boost bzip2 expat - fmt + fmt-8 libosmium lua postgresql diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 8ac4a8dc6e..e15a533f5b 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1251,7 +1251,7 @@ with strong support for multi-part, multi-channel use cases.") (list pkg-config)) (inputs `(("boost" ,boost) - ("fmt" ,fmt) + ("fmt" ,fmt-8) ("libheif" ,libheif) ("libpng" ,libpng) ("libjpeg" ,libjpeg-turbo) diff --git a/gnu/packages/hyperledger.scm b/gnu/packages/hyperledger.scm index 2a4b87e927..45436da7db 100644 --- a/gnu/packages/hyperledger.scm +++ b/gnu/packages/hyperledger.scm @@ -166,8 +166,7 @@ link-time. New implementations can be added as well.") ;; https://github.com/hyperledger/iroha/commit/4dc710d2e9a067af866771318f673c7392797e48 ;; Backport unversioned fmt dependency, remove next update: (substitute* "libs/logger/logger.hpp" - (("fmt::v5") "fmt")) - #t)))) + (("fmt::v5") "fmt")))))) (build-system cmake-build-system) (arguments `(#:configure-flags @@ -179,7 +178,11 @@ link-time. New implementations can be added as well.") #:test-target ".")) ;; https://github.com/hyperledger/iroha/blob/master/vcpkg/VCPKG_DEPS_LIST (native-inputs - (list fmt googletest rapidjson rxcpp spdlog)) + (list fmt-8 + googletest + rapidjson + rxcpp + spdlog)) (inputs (list boost gflags diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index cd095a0ed8..b0393a7e69 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3649,7 +3649,7 @@ communication over HTTP.") pcre2 sobjectizer)) (propagated-inputs - (list asio fmt http-parser)) + (list asio fmt-8 http-parser)) (arguments `(#:configure-flags '("-DRESTINIO_INSTALL=on") #:tests? #f ; TODO: The tests are called from the root CMakelist, need RESTINIO_TEST=on. @@ -3737,7 +3737,7 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (chmod dhtcluster #o555) (wrap-program dhtcluster `("GUIX_PYTHONPATH" prefix (,site-packages))))))))) - (inputs (list bash-minimal fmt readline)) + (inputs (list bash-minimal fmt-8 readline)) (propagated-inputs (list msgpack ;included in several installed headers restinio ;included in opendht/http.h diff --git a/gnu/packages/pretty-print.scm b/gnu/packages/pretty-print.scm index 6dcf1675c4..7bc54c4a0b 100644 --- a/gnu/packages/pretty-print.scm +++ b/gnu/packages/pretty-print.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2022 Zhu Zihao +;;; Copyright © 2022 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -166,28 +167,37 @@ different programming languages.") (define-public fmt (package (name "fmt") - (version "8.1.1") + (version "9.1.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" version "/fmt-" version ".zip")) (sha256 - (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3")))) + (base32 "15n9yi6xzzs7g9rm87kg8y5yhl2zrqj3bjr845saa63f6swlrsyc")))) (build-system cmake-build-system) - (arguments - '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) - (native-inputs - (list unzip)) + (arguments '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON"))) + (native-inputs (list unzip)) (home-page "https://fmt.dev") (synopsis "Small and fast C++ formatting library") - (description - "@code{fmt} (formerly @code{cppformat}) is a formatting library for C++. -It can be used as a safe alternative to @code{printf} or as a fast alternative -to @code{IOStreams}.") + (description "@code{fmt} (formerly @code{cppformat}) is a formatting +library for C++. It can be used as a safe alternative to @code{printf} or as +a fast alternative to @code{IOStreams}.") ;; The library is bsd-2, but documentation and tests include other licenses. (license (list bsd-2 bsd-3 psfl)))) +(define-public fmt-8 + (package + (inherit fmt) + (version "8.1.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/fmtlib/fmt/releases/download/" + version "/fmt-" version ".zip")) + (sha256 + (base32 "0p8f82ijqa57sk72hjf0qviv1wwinmns0p87wiv2v8fvisnqnxr3")))))) + (define-public fmt-8.0 (package (inherit fmt) diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 86ae1c883f..9d360e8eb3 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -201,7 +201,7 @@ ("cryptsetup" ,cryptsetup) ("expat" ,expat) ("fcgi" ,fcgi) - ("fmt" ,fmt) + ("fmt" ,fmt-8) ("fuse" ,fuse) ("icu4c" ,icu4c) ("jemalloc" ,jemalloc) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c95bb02507..c8f3c6f8a5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1029,7 +1029,7 @@ H.264 (MPEG-4 AVC) video streams.") libebml file flac - fmt + fmt-8 libdvdread libmatroska libogg diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index eedd339c6c..54e1c9c016 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1734,7 +1734,7 @@ display a clock or apply image manipulation techniques to the background image." (base32 "15fy21cipih80amv78g7g4k2gylf107phbv0fjacn3w3n0i3cf2k")))) (build-system meson-build-system) (inputs (list date - fmt + fmt-8 gtk-layer-shell gtkmm-3 jsoncpp -- cgit v1.2.3 From 3ff0a976e8f9e3792b39b5968cb9ff066eb4ba60 Mon Sep 17 00:00:00 2001 From: dan Date: Sun, 13 Nov 2022 13:46:45 +0800 Subject: gnu: mpv: Update to 0.35.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mpv): Update to 0.35.0. Signed-off-by: 宋文武 --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c8f3c6f8a5..4b688fb2e4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2179,7 +2179,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.34.1") + (version "0.35.0") (source (origin (method git-fetch) (uri (git-reference @@ -2187,7 +2187,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12qxwm1ww5vhjddl8yvj1xa0n1fi9z3lmzwhaiday2v59ca0qgsk")))) + (base32 "1jnk1arwhf82s6q90jp70izk1wy0bkx3lr3il2jgbqsp355l6wsk")))) (build-system waf-build-system) (arguments (list -- cgit v1.2.3 From 8eb8c732dd61bce7436070dab5de28d3d0cefa54 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Fri, 4 Nov 2022 22:37:49 -0400 Subject: gnu: wf-recorder: Update to 0.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (wf-recorder): Update to 0.3.0. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4b688fb2e4..c394c65442 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5391,7 +5391,7 @@ can also directly record to WebM or MP4 if you prefer.") (define-public wf-recorder (package (name "wf-recorder") - (version "0.2.1") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -5400,7 +5400,7 @@ can also directly record to WebM or MP4 if you prefer.") (file-name (git-file-name name version)) (sha256 (base32 - "1cw6kpcbl33wh95pvy32xrsrm6kkk1awccr3phyh885xjs3b3iim")))) + "18csvix8fdqir52q729rgcy355xy2ngvmr05l1abflpbvsklbn52")))) (build-system meson-build-system) (native-inputs (list pkg-config)) -- cgit v1.2.3 From 78f03567f44f704dfbc03cb64368aa42a01e78ad Mon Sep 17 00:00:00 2001 From: Martin Marshall Date: Fri, 18 Nov 2022 23:49:35 -0500 Subject: gnu: mpv: Add libxpresent input. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes . Reported by Jorge P. de Morais Neto and Kristian Lein-Mathisen . * gnu/packages/video.scm (mpv)[inputs]: Add libxpresent. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c394c65442..16488f8a35 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2242,6 +2242,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") libxext libxkbcommon libxinerama + libxpresent libxrandr libxscrnsaver libxv -- cgit v1.2.3 From 9e4f89df57f6364b90459d8418bf84e9bbf40215 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 27 Nov 2022 12:53:03 +0200 Subject: gnu: yt-dlp: Update to 2022.11.11. * gnu/packages/video.scm (yt-dlp): Update to 2022.11.11. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 16488f8a35..70a9cd4033 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2530,7 +2530,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2022.10.04") + (version "2022.11.11") (source (origin (method git-fetch) @@ -2539,7 +2539,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0g2nvslzb9yx2axv6yqxdcdh49ckyipyy9apx1lx6bg6y9rjvx6v")))) + (base32 "00dng4x7xbxp6w76dqkfzzhf2dh3s9pgfd0axs7qar20clj717py")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) (not (%current-target-system))) -- cgit v1.2.3 From 3cff7bfa9b46f1b73381df79a6f2aaa55a332126 Mon Sep 17 00:00:00 2001 From: Jessica Tallon Date: Tue, 15 Nov 2022 22:02:33 +0100 Subject: gnu: Add svtplay-dl. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (svtplay-dl): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 70a9cd4033..297252d1ae 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5606,3 +5606,27 @@ VCS, by default, makes screenshots the same size as the video, see the manual for details on how to change this.") (home-page "http://p.outlyer.net/vcs/") (license license:lgpl2.1+))) + +(define-public svtplay-dl + (package + (name "svtplay-dl") + (version "4.14") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spaam/svtplay-dl") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1wdrdszalvhv80m5jizbvjz4jc08acmbpxcsslyfb5cwh842in8m")))) + (build-system python-build-system) + (inputs (list ffmpeg python-pyaml python-requests python-pysocks + python-cryptography)) + (home-page "https://svtplay-dl.se/") + (synopsis "Download or stream SVT Play's (and others) TV programmes") + (description + "@code{svtplay-dl} allows downloading TV programmes from various Swedish +broadcasters including SVT Play, Sveriges Radio, TV4 Play, along with many +others.") + (license license:expat))) -- cgit v1.2.3 From 168afe297630c6b2dd9f1fa029541cced9117ca1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 30 Nov 2022 11:52:44 +0100 Subject: gnu: svt-av1: Update to 1.3.0. * gnu/packages/video.scm (svt-av1): Update to 1.3.0. [supported-systems]: Remove. [description]: Update. --- gnu/packages/video.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 297252d1ae..6e0a1e313c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5120,7 +5120,7 @@ transcode or reformat the videos in any way, producing perfect backups.") (define-public svt-av1 (package (name "svt-av1") - (version "0.9.1") + (version "1.3.0") (source (origin (method git-fetch) @@ -5129,10 +5129,8 @@ transcode or reformat the videos in any way, producing perfect backups.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "02fchq2vlxcxzbrss72xl9vrxzysdy39d5i159bmg3qa45ngd2iw")))) + (base32 "0blnla32yz665bx0xyx8lrjs2wqd2xhpbqwwpz72mq7zf341j8vv")))) (build-system cmake-build-system) - ;; SVT-AV1 only supports 64-bit Intel-compatible CPUs. - (supported-systems '("x86_64-linux")) (arguments ;; The test suite tries to download test data and git clone a 3rd-party ;; fork of libaom. Skip it. @@ -5150,7 +5148,8 @@ transcode or reformat the videos in any way, producing perfect backups.") (synopsis "AV1 video codec") (description "SVT-AV1 is an AV1 codec implementation. The encoder is a work-in-progress, aiming to support video-on-demand and live streaming -applications. It only supports Intel-compatible CPUs (x86).") +applications with high performance requirements. It mainly targets +Intel-compatible CPUs (x86), but has limited support for other architectures.") (home-page "https://gitlab.com/AOMediaCodec/SVT-AV1") (license license:bsd-2))) -- cgit v1.2.3 From b1ec9f36008cae036e99b1b5eb28d7f6e181898f Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 26 Nov 2022 08:40:47 -0300 Subject: gnu: mlt: Update to 7.12.0. * gnu/packages/video.scm (mlt): Update to 7.12.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6e0a1e313c..57c7d8a7d1 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3198,7 +3198,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (define-public mlt (package (name "mlt") - (version "7.8.0") + (version "7.12.0") (source (origin (method git-fetch) @@ -3207,7 +3207,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01589xpx1vgx1l1zjg553nbjks5wy31rdvyq1sjnbp9w7p7nzjdg")))) + (base32 "182i6fgn9aiskj62kj10cxf5wh233a241n7qvh0l95il01zmpfb3")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 0a9f2f44d4cfcac4de33a3a49a815c72385ed5f4 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 3 Dec 2022 09:50:28 -0300 Subject: gnu: shotcut: Update to 22.11.25. * gnu/packages/video.scm (shotcut): Update to 22.11.25. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 57c7d8a7d1..5a6d6827b9 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4857,7 +4857,7 @@ transitions, and effects and then export your film to many common formats.") (define-public shotcut (package (name "shotcut") - (version "22.10.25") + (version "22.11.25") (source (origin (method git-fetch) @@ -4866,7 +4866,7 @@ transitions, and effects and then export your film to many common formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12n179d1ymmzvlx5rzwmd89gwaa731b4y66nfl8wlr88wss4mncm")))) + (base32 "01qv0lb57kgmi5shcnhjwf47vqvbyjndxx6v7ha3sh4x5r8x0mrn")))) (build-system qt-build-system) (arguments `(#:tests? #f ;there are no tests -- cgit v1.2.3 From 85ea2dfc4cafca62a6543a74f10f6d30e4e1abbd Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 13:27:03 +0100 Subject: gnu: vapoursynth: Update to 61. * gnu/packages/video.scm (vapoursynth): Update to 61. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5a6d6827b9..d35a07d877 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3039,7 +3039,7 @@ capabilities.") (define-public vapoursynth (package (name "vapoursynth") - (version "53") + (version "61") (source (origin (method git-fetch) (uri (git-reference @@ -3048,7 +3048,7 @@ capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "0qcsfkpkry0cmvi60khjwvfz4fqhy23nqmn4pb9qrwll26sn9dcr")))) + "0v0dp3hydqzam0dp2d9zbrccrsvhy6n61s4v7ca2qbw69vpsm594")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit v1.2.3 From 3dc667b6f81ef32d041cfd6b6abceb078d1e02c3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 13:27:30 +0100 Subject: gnu: vapoursynth: Remove input labels. * gnu/packages/video.scm (vapoursynth)[native-inputs]: Remove labels. --- gnu/packages/video.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d35a07d877..1f9b2dff7a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3063,12 +3063,12 @@ capabilities.") (wrap-program (string-append out "/bin/vspipe") `("PYTHONPATH" ":" = (,site))))))))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("cython" ,python-cython) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("yasm" ,yasm))) + (list autoconf + automake + python-cython + libtool + pkg-config + yasm)) (inputs (list ffmpeg libass python tesseract-ocr zimg)) (home-page "http://www.vapoursynth.com/") -- cgit v1.2.3 From dce40ccc47ea43d2243e58d166c512a993ef5181 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 13:30:41 +0100 Subject: gnu: motion: Update to 4.5.0. * gnu/packages/video.scm (motion): Update to 4.5.0. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1f9b2dff7a..06024cc3e2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4548,7 +4548,7 @@ It counts more than 100 plugins.") (define-public motion (package (name "motion") - (version "4.3.2") + (version "4.5.0") (home-page "https://motion-project.github.io/") (source (origin (method git-fetch) @@ -4557,7 +4557,7 @@ It counts more than 100 plugins.") (commit (string-append "release-" version)))) (sha256 (base32 - "09xs815jsivcilpmnrx2jkcxirj4lg5kp99fkr0p2sdxw03myi95")) + "1rqy98g3xjjzjxiw8j3qdka0rbhcgzgczz6qgj157ck9116j18dq")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3 From 1572071b6820a271d4801dd169685e0309de8628 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 13:31:07 +0100 Subject: gnu: motion: Remove input labels. * gnu/packages/video.scm (motion)[native-inputs, inputs]: Remove labels. --- gnu/packages/video.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 06024cc3e2..a2cbc53f8c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4561,15 +4561,9 @@ It counts more than 100 plugins.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + (list autoconf automake gettext-minimal pkg-config)) (inputs - `(("libjpeg" ,libjpeg-turbo) - ("ffmpeg" ,ffmpeg) - ("libmicrohttpd" ,libmicrohttpd) - ("sqlite" ,sqlite))) + (list libjpeg-turbo ffmpeg libmicrohttpd sqlite)) (arguments '(#:phases (modify-phases %standard-phases (replace 'bootstrap -- cgit v1.2.3 From 79564bf9977ebba0b31d8dc291eb039142f51f68 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 12 Dec 2022 14:27:05 +0100 Subject: 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. --- gnu/packages/arcan.scm | 2 +- gnu/packages/astronomy.scm | 4 ++-- gnu/packages/audio.scm | 8 ++++++-- gnu/packages/education.scm | 2 +- gnu/packages/emulators.scm | 8 ++++---- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 4 ++-- gnu/packages/gnunet.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/image-processing.scm | 4 ++-- gnu/packages/julia-jll.scm | 2 +- gnu/packages/kde-multimedia.scm | 2 +- gnu/packages/kodi.scm | 2 +- gnu/packages/linphone.scm | 2 +- gnu/packages/linux.scm | 3 ++- gnu/packages/mp3.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/qt.scm | 2 +- gnu/packages/rdesktop.scm | 2 +- gnu/packages/video.scm | 23 ++++++++++++----------- 20 files changed, 43 insertions(+), 37 deletions(-) (limited to 'gnu/packages/video.scm') 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 -- cgit v1.2.3 From f19d49e69cce1a962cdd77b3cb7e1dcbe0d22240 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Dec 2022 11:20:45 +0100 Subject: gnu: Add orf-dl. * gnu/packages/video.scm (orf-dl): New variable. --- gnu/packages/video.scm | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a15c86ee07..e32186f5ce 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -167,6 +167,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages perl-check) #:use-module (gnu packages perl-web) + #:use-module (gnu packages php) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) @@ -2444,6 +2445,38 @@ To load this plugin, specify the following option when starting mpv: (base32 "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm")))))) +(define-public orf-dl + (let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999") + (revision "1")) + (package + (name "orf-dl") + (version (git-version "0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tpoechtrager/orf_dl") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1w413miy01cm7rzb5c6wwfdnc2sqv87cvxwikafgrkswpimvdjsk")))) + (build-system copy-build-system) + (arguments + (list #:install-plan #~`(("orf_dl.php" "bin/orf-dl")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "orf_dl.php" + (("ffmpeg") + (search-input-file inputs "bin/ffmpeg")))))))) + (inputs (list php ffmpeg)) + (home-page "https://github.com/tpoechtrager/orf_dl") + (synopsis "Download videos from tvthek.orf.at") + (description "This package provides a PHP-based command line application +to download videos from Austria's national television broadcaster.") + (license license:gpl2+)))) + (define-public youtube-dl (package (name "youtube-dl") -- cgit v1.2.3 From 7e7659d34fb223ebd73e8c931d3b5c882d320869 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 24 Dec 2022 07:54:09 -0300 Subject: gnu: shotcut: Update to 22.12.21. * gnu/packages/video.scm (shotcut): Update to 22.12.21. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e32186f5ce..d1d50df304 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4885,7 +4885,7 @@ transitions, and effects and then export your film to many common formats.") (define-public shotcut (package (name "shotcut") - (version "22.11.25") + (version "22.12.21") (source (origin (method git-fetch) @@ -4894,7 +4894,7 @@ transitions, and effects and then export your film to many common formats.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "01qv0lb57kgmi5shcnhjwf47vqvbyjndxx6v7ha3sh4x5r8x0mrn")))) + (base32 "1hchnywsrkvnz07r2i1cffg1a8zi59pcpswz8x93a0rdc42hlk3d")))) (build-system qt-build-system) (arguments `(#:tests? #f ;there are no tests -- cgit v1.2.3 From badad2653f832db2212ce4c159dfd305971fddb3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 26 Dec 2022 00:06:26 +0100 Subject: gnu: pipe-viewer: Update to 0.4.4. * gnu/packages/video.scm (pipe-viewer): Update to 0.4.4. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d1d50df304..456376d597 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1125,7 +1125,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public pipe-viewer (package (name "pipe-viewer") - (version "0.2.3") + (version "0.4.4") (source (origin (method git-fetch) @@ -1135,7 +1135,7 @@ H.264 (MPEG-4 AVC) video streams.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0c2v4pj86442sp71ndjmvd2bl1grp6g9ya2ywdaihq1f2djk6jxl")))) + (base32 "0ka5az3aq2khql9nlxnrbkbs7afmp07r2fkx5pvmh6mqnriaimq3")))) (build-system perl-build-system) (arguments `(#:imported-modules -- cgit v1.2.3 From 783b85f6436fba3bc7155be33da8fdcf16c4877a Mon Sep 17 00:00:00 2001 From: Jessica Tallon Date: Tue, 27 Dec 2022 12:45:10 +0100 Subject: gnu: svtplay-dl: Update to 4.17. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (svtplay-dl): Update to 4.17. Signed-off-by: 宋文武 --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 456376d597..41e8ccfb1e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5637,7 +5637,7 @@ for details on how to change this.") (define-public svtplay-dl (package (name "svtplay-dl") - (version "4.14") + (version "4.17") (source (origin (method git-fetch) (uri (git-reference @@ -5646,7 +5646,7 @@ for details on how to change this.") (file-name (git-file-name name version)) (sha256 (base32 - "1wdrdszalvhv80m5jizbvjz4jc08acmbpxcsslyfb5cwh842in8m")))) + "0yjxmvldskw4pji3lg69pbx05izvxahz9my7z5p31mkiz6v33dmx")))) (build-system python-build-system) (inputs (list ffmpeg python-pyaml python-requests python-pysocks python-cryptography)) -- cgit v1.2.3 From 2fb26d8d8cd1f30d32ccb3e0a870bda5f2a6a43d Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 24 Dec 2022 14:41:29 -0800 Subject: gnu: openshot: Update to 3.0.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (libopenshot): Update to 0.3.0. (openshot): Update to 3.0.0. Signed-off-by: 宋文武 --- gnu/packages/video.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 41e8ccfb1e..2a70c4496f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -62,6 +62,7 @@ ;;; Copyright © 2022 Bird ;;; Copyright © 2022 Jai Vetrivelan ;;; Copyright © 2022 Chadwain Holness +;;; Copyright © 2022 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -4748,7 +4749,7 @@ create smoother and stable videos.") (define-public libopenshot (package (name "libopenshot") - (version "0.2.7") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -4757,7 +4758,7 @@ create smoother and stable videos.") (file-name (git-file-name name version)) (sha256 (base32 - "0i9bsn8gklm1mvj60l3d3xrxdgy8svpxjfqcwsr308j5zjn30pv8")) + "0q2899hbaqwh1gxyl9x84l116g82glk0wmr3r1xvfwb107m3mvx9")) (modules '((guix build utils))) (snippet '(begin ;; Allow overriding of the python installation dir @@ -4783,6 +4784,7 @@ create smoother and stable videos.") libopenshot-audio qtbase-5 qtmultimedia-5 + qtsvg-5 zeromq)) (arguments `(#:configure-flags @@ -4811,7 +4813,7 @@ API. It includes bindings for Python, Ruby, and other languages.") (define-public openshot (package (name "openshot") - (version "2.6.1") + (version "3.0.0") (source (origin (method git-fetch) (uri (git-reference @@ -4820,7 +4822,7 @@ API. It includes bindings for Python, Ruby, and other languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv")) + "1az59whx9sga6m8m2c3ndfls5h07r0jn4jipnyxckpxl32vpd147")) (modules '((guix build utils))) (snippet '(begin @@ -4857,12 +4859,6 @@ API. It includes bindings for Python, Ruby, and other languages.") (("fonts") "share/fonts/truetype") (("[A-Za-z_-]+.ttf") "DejaVuSans.ttf"))) #t)) - ;; https://github.com/OpenShot/openshot-qt/issues/4502 - (add-before 'ensure-no-mtimes-pre-1980 'fix-symbolic-link - (lambda _ - (delete-file "images/Humanity/actions/custom/razor_line_with_razor.png") - (symlink "../../../../src/timeline/media/images/razor_line_with_razor.png" - "images/Humanity/actions/custom/razor_line_with_razor.png"))) (add-before 'install 'set-tmp-home (lambda _ ;; src/classes/info.py "needs" to create several -- cgit v1.2.3 From 4dda2e36a0039a36aa138715930f5201528c5c08 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 30 Dec 2022 23:38:04 +0100 Subject: gnu: openshot: Build with QtWebEngine instead of QtWebKit. * gnu/packages/video.scm (openshot)[inputs]: Change from PYTHON-PYQT to PYTHON-PYQT-WITHOUT-QTWEBKIT. Add PYTHON-PYQTWEBENGINE and QTWEBENGINE-5. [arguments]: Wrap with QTWEBENGINEPROCESS_PATH. --- gnu/packages/video.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2a70c4496f..b9c8ab1ef3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4834,10 +4834,12 @@ API. It includes bindings for Python, Ruby, and other languages.") font-dejavu libopenshot python - python-pyqt + python-pyqt-without-qtwebkit + python-pyqtwebengine python-pyzmq python-requests - qtsvg-5)) + qtsvg-5 + qtwebengine-5)) (arguments `(#:modules ((guix build python-build-system) (guix build qt-utils) @@ -4867,10 +4869,16 @@ API. It includes bindings for Python, Ruby, and other languages.") #t)) (add-after 'install 'wrap-program (lambda* (#:key outputs inputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) + (let ((out (assoc-ref outputs "out")) + (qtwebengine-process-path + (search-input-file + inputs "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-qt-program "openshot-qt" - #:output out #:inputs inputs)) - #t))))) + #:output out #:inputs inputs) + ;; Help the program discover QtWebEngine at runtime. + (wrap-program (string-append out "/bin/openshot-qt") + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengine-process-path))))))))) (home-page "https://www.openshot.org/") (synopsis "Video editor") (description "OpenShot takes your videos, photos, and music files and -- cgit v1.2.3 From a7b2f36a0cfac3fbf9ad6669743d9f728ec9ea0c Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 30 Dec 2022 23:38:50 +0100 Subject: gnu: shotcut: Remove unused inputs. * gnu/packages/video.scm (shotcut)[inputs]: Remove LAME, LIBVPX, LIBX264, and QTWEBKIT. --- gnu/packages/video.scm | 4 ---- 1 file changed, 4 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index b9c8ab1ef3..c3ba1eddd2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4943,9 +4943,6 @@ transitions, and effects and then export your film to many common formats.") frei0r-plugins jack-1 ladspa - lame - libvpx - libx264 mlt pulseaudio qtbase-5 @@ -4955,7 +4952,6 @@ transitions, and effects and then export your film to many common formats.") qtquickcontrols-5 qtquickcontrols2-5 qtsvg-5 - qtwebkit qtwebsockets-5 qtx11extras sdl2)) -- cgit v1.2.3 From 6654f7a7e91e04cceffe57cb9467785006d1fa51 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 30 Dec 2022 23:39:55 +0100 Subject: gnu: shotcut: Remove input labels. * gnu/packages/video.scm (shotcut)[native-inputs]: Remove labels. --- gnu/packages/video.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c3ba1eddd2..fd11960f1c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4933,9 +4933,7 @@ transitions, and effects and then export your film to many common formats.") `("PATH" ":" prefix ,(list (string-append mlt "/bin")))))))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("python-wrapper" ,python-wrapper) - ("qttools-5" ,qttools-5))) + (list pkg-config python-wrapper qttools-5)) (inputs (list bash-minimal ffmpeg -- cgit v1.2.3 From af74211d987d2b8510e2f4937e65f6480754886f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 3 Jan 2023 13:51:21 -0500 Subject: gnu: VLC: Update to 3.0.18. * gnu/packages/video.scm (vlc): Update to 3.0.18. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fd11960f1c..c4b0024d06 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1939,7 +1939,7 @@ videoformats depend on the configuration flags of ffmpeg.") (define-public vlc (package (name "vlc") - (version "3.0.17.4") + (version "3.0.18") (source (origin (method url-fetch) (uri (string-append @@ -1948,7 +1948,7 @@ videoformats depend on the configuration flags of ffmpeg.") "/vlc-" version ".tar.xz")) (sha256 (base32 - "0cs1vnv91mg7p6253v6wms3zlz91xzphpwaw14dmrd2gibc64nlc")))) + "1v7db9icrb12yz7banq2wvpjpvqfrj031yj1kf5smn35qcwl82ap")))) (build-system gnu-build-system) (native-inputs (list flex bison gettext-minimal pkg-config)) -- cgit v1.2.3 From 201793fd07f602270b2375491a2f5d1d85d4f2b1 Mon Sep 17 00:00:00 2001 From: Brian Cully Date: Tue, 3 Jan 2023 18:48:39 -0500 Subject: gnu: hunspell: Move hunspell and dictionaries to hunspell module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidate hunspell and its dictionaries into the (gnu packages hunspell) module instead of having them scattered about. * gnu/packages/aspell.scm (aspell-word-list, define-word-list-dictionary, hunspell-dict-{en, en-au, en-gb, en-gb-ize, en-us}): Remove variables. * gnu/packages/libreoffice.scm (hunspell, dicollecte-french-dictionary, define-french-dictionary, hunspell-dict-fr-{classique, moderne, réforme, toutes-variantes}, hunspell-dict-pl, hunspell-dict-de, hunspell-dict-hu): Remove variables. * gnu/packages/hunspell.scm (hunspell, dicollecte-french-dictionary, define-french-dictionary, hunspell-dict-fr-{classique, moderne, réforme, toutes-variantes}, hunspell-dict-pl, hunspell-dict-de, hunspell-dict-hu, aspell-word-list, define-word-list-dictionary, hunspell-dict-{en, en-au, en-gb, en-gb-ize, en-us}): Add variables. (hunspell-dictionary): Explicitly declare upstream libreoffice version to prevent circular dependency. * gnu/packages/ebook.scm, gnu/packages/enchant.scm, gnu/packages/freedesktop.scm, gnu/packages/gnuzilla.scm, gnu/packages/kde-frameworks.scm, gnu/packages/messaging.scm, gnu/packages/scribus.scm, gnu/packages/task-management.scm, gnu/packages/telegram.scm, gnu/packages/tex.scm, gnu/packages/text-editors.scm, gnu/packages/video.scm: Adjust module imports. --- gnu/packages/aspell.scm | 118 ------------- gnu/packages/ebook.scm | 3 +- gnu/packages/enchant.scm | 2 +- gnu/packages/freedesktop.scm | 2 +- gnu/packages/gnuzilla.scm | 2 +- gnu/packages/hunspell.scm | 362 ++++++++++++++++++++++++++++++++++++++- gnu/packages/kde-frameworks.scm | 2 +- gnu/packages/libreoffice.scm | 233 +------------------------ gnu/packages/messaging.scm | 2 +- gnu/packages/scribus.scm | 1 + gnu/packages/task-management.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/tex.scm | 1 + gnu/packages/text-editors.scm | 2 +- gnu/packages/video.scm | 2 +- 15 files changed, 374 insertions(+), 362 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/aspell.scm b/gnu/packages/aspell.scm index 76deb7cdce..8978b4e087 100644 --- a/gnu/packages/aspell.scm +++ b/gnu/packages/aspell.scm @@ -395,124 +395,6 @@ dictionaries, including personal ones.") (base32 "0gb8j9iy1acdl11jq76idgc2lbc1rq3w04favn8cyh55d1v8phsk"))) - -;;; -;;; Hunspell packages made from the Aspell word lists. -;;; - -(define* (aspell-word-list language synopsis - #:optional - (nick (string-map (lambda (chr) - (if (char=? #\_ chr) - #\- - chr)) - (string-downcase language)))) - (package - (name (string-append "hunspell-dict-" nick)) - (version "2018.04.16") - (source (origin - (method url-fetch) - (uri (string-append - "mirror://sourceforge/wordlist/SCOWL/" - version "/scowl-" version ".tar.gz")) - (sha256 - (base32 - "11lkrnhwrf5mvrrq45k4mads3n9aswgac8dc25ba61c75alxb5rs")))) - (native-inputs - (list tar gzip perl aspell)) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-reproducible - (lambda _ - (substitute* "speller/README_en.txt.sh" - (("\\bdate\\b") "")))) - (delete 'configure) - (delete 'check) - (replace 'build - (lambda _ - (substitute* "speller/make-hunspell-dict" - (("zip -9 .*$") - "return\n")) - (mkdir "speller/hunspell") - - ;; XXX: This actually builds all the dictionary variants. - (invoke "make" "-C" "speller" "hunspell"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref %outputs "out")) - (hunspell (string-append out "/share/hunspell")) - (myspell (string-append out "/share/myspell")) - (doc (string-append out "/share/doc/" - ,name)) - (dot-dic ,(string-append "speller/" language ".dic"))) - (mkdir-p myspell) - - ;; Usually there's only a 'LANGUAGE.dic' file, but for the "en" - ;; dictionary, there no 'en.dic'. Instead, there's a set of - ;; 'en*.dic' files, hence the 'find-files' call below. - (if (file-exists? dot-dic) - (install-file dot-dic hunspell) - (for-each (lambda (dic) - (install-file dic hunspell)) - (find-files "speller" - ,(string-append language ".*\\.dic$")))) - - ;; Install affix files corresponding to installed dictionaries - (for-each (lambda (dic) - (install-file (string-append - "speller/" (basename dic ".dic") ".aff") - hunspell)) - (find-files hunspell ".*\\.dic$")) - (symlink hunspell (string-append myspell "/dicts")) - (for-each (lambda (file) - (install-file file doc)) - (find-files "." - "^(Copyright|.*\\.(txt|org|md))$")) - #t)))))) - (synopsis synopsis) - (description - "This package provides a dictionary for the Hunspell spell-checking -library.") - (home-page "http://wordlist.aspell.net/") - (license (non-copyleft "file://Copyright" - "Word lists come from several sources, all -under permissive licensing terms. See the 'Copyright' file.")))) - -(define-syntax define-word-list-dictionary - (syntax-rules (synopsis) - ((_ name language (synopsis text)) - (define-public name - (aspell-word-list language text))) - ((_ name language nick (synopsis text)) - (define-public name - (aspell-word-list language text nick))))) - -(define-word-list-dictionary hunspell-dict-en - "en" - (synopsis "Hunspell dictionary for English")) - -(define-word-list-dictionary hunspell-dict-en-au - "en_AU" - (synopsis "Hunspell dictionary for Australian English")) - -(define-word-list-dictionary hunspell-dict-en-ca - "en_CA" - (synopsis "Hunspell dictionary for Canadian English")) - -(define-word-list-dictionary hunspell-dict-en-gb - "en_GB-ise" "en-gb" - (synopsis "Hunspell dictionary for British English, with -ise endings")) - -(define-word-list-dictionary hunspell-dict-en-gb-ize - "en_GB-ize" - (synopsis "Hunspell dictionary for British English, with -ize endings")) - -(define-word-list-dictionary hunspell-dict-en-us - "en_US" - (synopsis "Hunspell dictionary for United States English")) - (define-public ispell (package (name "ispell") diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 8dff0f2ec8..b21fcfdc9a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -56,12 +56,13 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages glib) #:use-module (gnu packages gstreamer) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages javascript) #:use-module (gnu packages language) - #:use-module (gnu packages libusb) #:use-module (gnu packages libreoffice) + #:use-module (gnu packages libusb) #:use-module (gnu packages music) #:use-module (gnu packages pantheon) #:use-module (gnu packages pdf) diff --git a/gnu/packages/enchant.scm b/gnu/packages/enchant.scm index 1f82b2447e..015af0d096 100644 --- a/gnu/packages/enchant.scm +++ b/gnu/packages/enchant.scm @@ -25,8 +25,8 @@ #:use-module (gnu packages boost) #:use-module (gnu packages check) #:use-module (gnu packages glib) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages man) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 304d04a711..515d9b9cea 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -94,12 +94,12 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages ibus) #:use-module (gnu packages image) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libffi) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages libunwind) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index b507ec0406..01b6245f8b 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -70,8 +70,8 @@ #:use-module (gnu packages compression) #:use-module (gnu packages fontutils) #:use-module (gnu packages fonts) + #:use-module (gnu packages hunspell) #:use-module (gnu packages libevent) - #:use-module (gnu packages libreoffice) ;for hunspell #:use-module (gnu packages image) #:use-module (gnu packages libffi) #:use-module (gnu packages pulseaudio) diff --git a/gnu/packages/hunspell.scm b/gnu/packages/hunspell.scm index 48df196e17..8bc8c38176 100644 --- a/gnu/packages/hunspell.scm +++ b/gnu/packages/hunspell.scm @@ -17,13 +17,253 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages hunspell) + #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (ice-9 match) - #:use-module (gnu packages libreoffice)) + #:use-module (gnu packages aspell) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (gnu packages m4) + #:use-module (gnu packages perl) + #:use-module (gnu packages textutils)) + +(define-public hunspell + (package + (name "hunspell") + (version "1.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hunspell/hunspell") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qxlkd012r45ppd21kldbq9k5ac5nmxz290z6m2kch9l56v768k1")))) + (build-system gnu-build-system) + (native-inputs + (list autoconf automake libtool)) + (inputs + (list perl)) + (native-search-paths (list (search-path-specification + (variable "DICPATH") + (files '("share/hunspell"))))) + (home-page "https://hunspell.github.io/") + (synopsis "Spell checker") + (description "Hunspell is a spell checker and morphological analyzer +library and program designed for languages with rich morphology and complex +word compounding or character encoding.") + ;; Triple license, including "mpl1.1 or later". + (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) + +(define (dicollecte-french-dictionary variant synopsis) + ;; Return a French dictionary package from dicollecte.org, for the given + ;; VARIANT. + (package + (name (match variant + ("classique" "hunspell-dict-fr") + (_ (string-append "hunspell-dict-fr-" variant)))) + (version "6.2") + (source (origin + (uri (string-append + "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v" + version ".zip")) + (method url-fetch) + (sha256 + (base32 + "139hfrn5p87sl8hqmgkf6sgvnxrk2mm8vd8xsm8sm98qjnwlg0f9")))) + (build-system trivial-build-system) + (native-inputs (list unzip)) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (unzip (assoc-ref %build-inputs "unzip"))) + (invoke (string-append unzip "/bin/unzip") + (assoc-ref %build-inputs "source")) + (for-each (cut install-file <> hunspell) + (find-files "." + ,(string-append variant + "\\.(dic|aff)$"))) + (mkdir-p myspell) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (cut install-file <> doc) + (find-files "." "\\.(txt|org|md)$")) + #t)))) + (synopsis synopsis) + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "https://www.dicollecte.org/home.php?prj=fr") + (license license:mpl2.0))) + +(define-syntax define-french-dictionary + (syntax-rules (synopsis) + ((_ name variant (synopsis text)) + (define-public name + (dicollecte-french-dictionary variant text))))) + +(define-french-dictionary hunspell-dict-fr-classique + "classique" + ;; TRANSLATORS: In French, this is "Français classique". + (synopsis "Hunspell dictionary for ``classic'' French (recommended)")) + +(define-french-dictionary hunspell-dict-fr-moderne + "moderne" + ;; TRANSLATORS: In French, this is "Français moderne". + (synopsis "Hunspell dictionary for ``modern'' French")) + +(define-french-dictionary hunspell-dict-fr-réforme-1990 + "reforme1990" + (synopsis "Hunspell dictionary for the post @dfn{1990 réforme} French")) + +(define-french-dictionary hunspell-dict-fr-toutes-variantes + "toutesvariantes" + (synopsis "Hunspell dictionary for all variants of French")) + +(define-public hunspell-dict-pl + (package + (name "hunspell-dict-pl") + (version "20200327") + (source + (origin + (method url-fetch) + ;; Since creators of dictionary host only the latest daily release, + ;; we're using version mirrored by Arch Linux, which seems good + ;; enough. They're mirroring hunspell-pl releases since 2011. + (uri (string-append "https://sources.archlinux.org/other/community/" + "hunspell-pl/sjp-myspell-pl-" + version ".zip")) + (sha256 (base32 + "14mzf8glxkp2775dcqisb1zv6r8ncm3bvzl46q352rwyl2dg1c59")))) + + (build-system trivial-build-system) + (native-inputs (list unzip)) + (arguments + `(#:modules ((guix build utils)) + #:builder (begin + (use-modules (guix build utils) + (srfi srfi-26)) + + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (unzip (search-input-file %build-inputs + "/bin/unzip"))) + (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) + (invoke unzip "-j" "-o" "pl_PL.zip") + (for-each (cut install-file <> hunspell) + (find-files "." + ,(string-append "pl_PL" + "\\.(dic|aff)$"))) + (mkdir-p myspell) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (cut install-file <> doc) + (find-files "." "\\.(txt|org|md)$")) + #t)))) + (synopsis "Hunspell dictionary for Polish") + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "https://sjp.pl/slownik/ort/") + (license + (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) + +(define-public hunspell-dict-de + (package + (name "hunspell-dict-de") + (version "20161207") + (source + (origin + (method url-fetch) + (uri (string-append "https://www.j3e.de/ispell/igerman98/dict/" + "igerman98-" version ".tar.bz2")) + (sha256 + (base32 "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p")))) + (build-system gnu-build-system) + (arguments + `(#:make-flags '("hunspell/de_DE.dic") + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/hunspell/"))) + (install-file "hunspell/de_DE.aff" share) + (install-file "hunspell/de_DE.dic" share) + #t)))) + #:tests? #f)) ; no tests + (native-inputs + (list hunspell ispell perl)) + (synopsis "Hunspell dictionary for German (de_DE)") + (description "This package provides a dictionary for the Hunspell +spell-checking library.") + (home-page "https://www.j3e.de/ispell/igerman98/") + (license (list license:gpl2 license:gpl3)))) + +(define-public hunspell-dict-hu + (let ((revision "2") + (major+minor "1.7")) + (package + (name "hunspell-dict-hu") + (version (string-append major+minor "-" revision)) + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/magyarispell/Magyar Ispell/" + major+minor + "/magyarispell-" version ".tar.gz")) + (sha256 + (base32 "0r22rvqrp5bzgr9sqyap82kibi5z9n6xy5b06si28idqijw7c772")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags + #~(list "myspell" + "--jobs=1" ;the Makefile is not ready for parallelism + (string-append "SH=" + (search-input-file %build-inputs + "/bin/bash")) + (string-append "AWK=" + (search-input-file %build-inputs + "/bin/awk"))) + #:phases + #~(modify-phases %standard-phases + (replace 'configure + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "config" + (("/usr/bin/awk") + (which "awk"))))) + (replace 'install ;no install target + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share/hunspell/"))) + (install-file "hu_HU.aff" share) + (install-file "hu_HU.dic" share))))) + #:tests? #f)) ; no tests + (native-inputs + (list hunspell m4 recode)) + (synopsis "Hunspell dictionary for Hungarian (hu_HU)") + (description "This package provides a dictionary for the Hunspell +spell-checking library.") + (home-page "http://magyarispell.sourceforge.net/") + (license (list license:gpl2 license:gpl3))))) (define* (hunspell-dictionary dict-name full-name #:key synopsis home-page license) (package @@ -35,7 +275,7 @@ (#\_ #\-) (chr chr)) (string-downcase dict-name)))) - (version (package-version libreoffice)) + (version "7.4.3.2") (source (origin (method git-fetch) @@ -79,3 +319,121 @@ spell-checking library.") #:synopsis (synopsis "Hunspell dictionary for Italian") #:home-page "https://www.libreitalia.org/" #:license license:gpl3))) + +;;; +;;; Hunspell packages made from the Aspell word lists. +;;; + +(define* (aspell-word-list language synopsis + #:optional + (nick (string-map (lambda (chr) + (if (char=? #\_ chr) + #\- + chr)) + (string-downcase language)))) + (package + (name (string-append "hunspell-dict-" nick)) + (version "2018.04.16") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/wordlist/SCOWL/" + version "/scowl-" version ".tar.gz")) + (sha256 + (base32 + "11lkrnhwrf5mvrrq45k4mads3n9aswgac8dc25ba61c75alxb5rs")))) + (native-inputs + (list tar gzip perl aspell)) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-reproducible + (lambda _ + (substitute* "speller/README_en.txt.sh" + (("\\bdate\\b") "")))) + (delete 'configure) + (delete 'check) + (replace 'build + (lambda _ + (substitute* "speller/make-hunspell-dict" + (("zip -9 .*$") + "return\n")) + (mkdir "speller/hunspell") + + ;; XXX: This actually builds all the dictionary variants. + (invoke "make" "-C" "speller" "hunspell"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref %outputs "out")) + (hunspell (string-append out "/share/hunspell")) + (myspell (string-append out "/share/myspell")) + (doc (string-append out "/share/doc/" + ,name)) + (dot-dic ,(string-append "speller/" language ".dic"))) + (mkdir-p myspell) + + ;; Usually there's only a 'LANGUAGE.dic' file, but for the "en" + ;; dictionary, there no 'en.dic'. Instead, there's a set of + ;; 'en*.dic' files, hence the 'find-files' call below. + (if (file-exists? dot-dic) + (install-file dot-dic hunspell) + (for-each (lambda (dic) + (install-file dic hunspell)) + (find-files "speller" + ,(string-append language ".*\\.dic$")))) + + ;; Install affix files corresponding to installed dictionaries + (for-each (lambda (dic) + (install-file (string-append + "speller/" (basename dic ".dic") ".aff") + hunspell)) + (find-files hunspell ".*\\.dic$")) + (symlink hunspell (string-append myspell "/dicts")) + (for-each (lambda (file) + (install-file file doc)) + (find-files "." + "^(Copyright|.*\\.(txt|org|md))$")) + #t)))))) + (synopsis synopsis) + (description + "This package provides a dictionary for the Hunspell spell-checking +library.") + (home-page "http://wordlist.aspell.net/") + (license (license:non-copyleft "file://Copyright" + "Word lists come from several sources, all +under permissive licensing terms. See the 'Copyright' file.")))) + +(define-syntax define-word-list-dictionary + (syntax-rules (synopsis) + ((_ name language (synopsis text)) + (define-public name + (aspell-word-list language text))) + ((_ name language nick (synopsis text)) + (define-public name + (aspell-word-list language text nick))))) + +(define-word-list-dictionary hunspell-dict-en + "en" + (synopsis "Hunspell dictionary for English")) + +(define-word-list-dictionary hunspell-dict-en-au + "en_AU" + (synopsis "Hunspell dictionary for Australian English")) + +(define-word-list-dictionary hunspell-dict-en-ca + "en_CA" + (synopsis "Hunspell dictionary for Canadian English")) + +(define-word-list-dictionary hunspell-dict-en-gb + "en_GB-ise" "en-gb" + (synopsis "Hunspell dictionary for British English, with -ise endings")) + +(define-word-list-dictionary hunspell-dict-en-gb-ize + "en_GB-ize" + (synopsis "Hunspell dictionary for British English, with -ize endings")) + +(define-word-list-dictionary hunspell-dict-en-us + "en_US" + (synopsis "Hunspell dictionary for United States English")) + diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index aaa5a82d5f..fb578ee7e1 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -64,13 +64,13 @@ #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages image) #:use-module (gnu packages iso-codes) #:use-module (gnu packages kerberos) #:use-module (gnu packages kde) #:use-module (gnu packages kde-plasma) #:use-module (gnu packages libcanberra) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) #:use-module (gnu packages openbox) diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm index 2103aec5a0..b959470d8f 100644 --- a/gnu/packages/libreoffice.scm +++ b/gnu/packages/libreoffice.scm @@ -70,6 +70,7 @@ #:use-module (gnu packages graphics) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages java) @@ -792,191 +793,6 @@ Callisto/Draw documents. Currently it only understands documents created by Zoner Draw version 4 and 5.") (license license:mpl2.0))) -(define-public hunspell - (package - (name "hunspell") - (version "1.7.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/hunspell/hunspell") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0qxlkd012r45ppd21kldbq9k5ac5nmxz290z6m2kch9l56v768k1")))) - (build-system gnu-build-system) - (native-inputs - (list autoconf automake libtool)) - (inputs - (list perl)) - (native-search-paths (list (search-path-specification - (variable "DICPATH") - (files '("share/hunspell"))))) - (home-page "https://hunspell.github.io/") - (synopsis "Spell checker") - (description "Hunspell is a spell checker and morphological analyzer -library and program designed for languages with rich morphology and complex -word compounding or character encoding.") - ;; Triple license, including "mpl1.1 or later". - (license (list license:mpl1.1 license:gpl2+ license:lgpl2.1+)))) - -(define (dicollecte-french-dictionary variant synopsis) - ;; Return a French dictionary package from dicollecte.org, for the given - ;; VARIANT. - (package - (name (match variant - ("classique" "hunspell-dict-fr") - (_ (string-append "hunspell-dict-fr-" variant)))) - (version "6.2") - (source (origin - (uri (string-append - "http://www.dicollecte.org/download/fr/hunspell-french-dictionaries-v" - version ".zip")) - (method url-fetch) - (sha256 - (base32 - "139hfrn5p87sl8hqmgkf6sgvnxrk2mm8vd8xsm8sm98qjnwlg0f9")))) - (build-system trivial-build-system) - (native-inputs (list unzip)) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((out (assoc-ref %outputs "out")) - (hunspell (string-append out "/share/hunspell")) - (myspell (string-append out "/share/myspell")) - (doc (string-append out "/share/doc/" - ,name)) - (unzip (assoc-ref %build-inputs "unzip"))) - (invoke (string-append unzip "/bin/unzip") - (assoc-ref %build-inputs "source")) - (for-each (cut install-file <> hunspell) - (find-files "." - ,(string-append variant - "\\.(dic|aff)$"))) - (mkdir-p myspell) - (symlink hunspell (string-append myspell "/dicts")) - (for-each (cut install-file <> doc) - (find-files "." "\\.(txt|org|md)$")) - #t)))) - (synopsis synopsis) - (description - "This package provides a dictionary for the Hunspell spell-checking -library.") - (home-page "https://www.dicollecte.org/home.php?prj=fr") - (license license:mpl2.0))) - -(define-syntax define-french-dictionary - (syntax-rules (synopsis) - ((_ name variant (synopsis text)) - (define-public name - (dicollecte-french-dictionary variant text))))) - -(define-french-dictionary hunspell-dict-fr-classique - "classique" - ;; TRANSLATORS: In French, this is "Français classique". - (synopsis "Hunspell dictionary for ``classic'' French (recommended)")) - -(define-french-dictionary hunspell-dict-fr-moderne - "moderne" - ;; TRANSLATORS: In French, this is "Français moderne". - (synopsis "Hunspell dictionary for ``modern'' French")) - -(define-french-dictionary hunspell-dict-fr-réforme-1990 - "reforme1990" - (synopsis "Hunspell dictionary for the post @dfn{1990 réforme} French")) - -(define-french-dictionary hunspell-dict-fr-toutes-variantes - "toutesvariantes" - (synopsis "Hunspell dictionary for all variants of French")) - -(define-public hunspell-dict-pl - (package - (name "hunspell-dict-pl") - (version "20200327") - (source - (origin - (method url-fetch) - ;; Since creators of dictionary host only the latest daily release, - ;; we're using version mirrored by Arch Linux, which seems good - ;; enough. They're mirroring hunspell-pl releases since 2011. - (uri (string-append "https://sources.archlinux.org/other/community/" - "hunspell-pl/sjp-myspell-pl-" - version ".zip")) - (sha256 (base32 - "14mzf8glxkp2775dcqisb1zv6r8ncm3bvzl46q352rwyl2dg1c59")))) - - (build-system trivial-build-system) - (native-inputs (list unzip)) - (arguments - `(#:modules ((guix build utils)) - #:builder (begin - (use-modules (guix build utils) - (srfi srfi-26)) - - (let* ((out (assoc-ref %outputs "out")) - (hunspell (string-append out "/share/hunspell")) - (myspell (string-append out "/share/myspell")) - (doc (string-append out "/share/doc/" - ,name)) - (unzip (search-input-file %build-inputs - "/bin/unzip"))) - (invoke unzip "-j" "-o" (assoc-ref %build-inputs "source")) - (invoke unzip "-j" "-o" "pl_PL.zip") - (for-each (cut install-file <> hunspell) - (find-files "." - ,(string-append "pl_PL" - "\\.(dic|aff)$"))) - (mkdir-p myspell) - (symlink hunspell (string-append myspell "/dicts")) - (for-each (cut install-file <> doc) - (find-files "." "\\.(txt|org|md)$")) - #t)))) - (synopsis "Hunspell dictionary for Polish") - (description - "This package provides a dictionary for the Hunspell spell-checking -library.") - (home-page "https://sjp.pl/slownik/ort/") - (license - (list license:gpl2 license:mpl1.1 license:cc-by4.0 license:lgpl2.1 license:asl2.0)))) - -(define-public hunspell-dict-de - (package - (name "hunspell-dict-de") - (version "20161207") - (source - (origin - (method url-fetch) - (uri (string-append "https://www.j3e.de/ispell/igerman98/dict/" - "igerman98-" version ".tar.bz2")) - (sha256 - (base32 "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p")))) - (build-system gnu-build-system) - (arguments - `(#:make-flags '("hunspell/de_DE.dic") - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install ;no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/hunspell/"))) - (install-file "hunspell/de_DE.aff" share) - (install-file "hunspell/de_DE.dic" share) - #t)))) - #:tests? #f)) ; no tests - (native-inputs - (list hunspell ispell perl)) - (synopsis "Hunspell dictionary for German (de_DE)") - (description "This package provides a dictionary for the Hunspell -spell-checking library.") - (home-page "https://www.j3e.de/ispell/igerman98/") - (license (list license:gpl2 license:gpl3)))) - (define-public hyphen (package (name "hyphen") @@ -1000,53 +816,6 @@ patterns, which are pre-processed by a perl script.") (license (list license:mpl1.1 license:mpl2.0 license:gpl2+ license:lgpl2.1+)))) -(define-public hunspell-dict-hu - (let ((revision "2") - (major+minor "1.7")) - (package - (name "hunspell-dict-hu") - (version (string-append major+minor "-" revision)) - (source - (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/magyarispell/Magyar Ispell/" - major+minor - "/magyarispell-" version ".tar.gz")) - (sha256 - (base32 "0r22rvqrp5bzgr9sqyap82kibi5z9n6xy5b06si28idqijw7c772")))) - (build-system gnu-build-system) - (arguments - (list #:make-flags - #~(list "myspell" - "--jobs=1" ;the Makefile is not ready for parallelism - (string-append "SH=" - (search-input-file %build-inputs - "/bin/bash")) - (string-append "AWK=" - (search-input-file %build-inputs - "/bin/awk"))) - #:phases - #~(modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "config" - (("/usr/bin/awk") - (which "awk"))))) - (replace 'install ;no install target - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (share (string-append out "/share/hunspell/"))) - (install-file "hu_HU.aff" share) - (install-file "hu_HU.dic" share))))) - #:tests? #f)) ; no tests - (native-inputs - (list hunspell m4 recode)) - (synopsis "Hunspell dictionary for Hungarian (hu_HU)") - (description "This package provides a dictionary for the Hunspell -spell-checking library.") - (home-page "http://magyarispell.sourceforge.net/") - (license (list license:gpl2 license:gpl3))))) - (define-public mythes (package (name "mythes") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 7b693a07fa..80a058f12e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -88,6 +88,7 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages kde) @@ -98,7 +99,6 @@ #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages libidn) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages logging) #:use-module (gnu packages lua) diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index a1d81f5697..de598ac2f4 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index cb5cc6ff0d..c4f7f99049 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -36,7 +36,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) - #:use-module (gnu packages libreoffice) ;for hunspell + #:use-module (gnu packages hunspell) #:use-module (gnu packages linux) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 82c9227ba8..14e0602d93 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -38,12 +38,12 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages image) #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages language) #:use-module (gnu packages libevent) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) #:use-module (gnu packages lxqt) diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index a600bcae58..13bc000918 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages ghostscript) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libreoffice) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 854a424b8a..0094959cbb 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -72,10 +72,10 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages hunspell) #:use-module (gnu packages icu4c) #:use-module (gnu packages image) #:use-module (gnu packages libbsd) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages llvm) #:use-module (gnu packages lua) #:use-module (gnu packages ncurses) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c4b0024d06..e934379ff4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -145,11 +145,11 @@ #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-xyz) + #:use-module (gnu packages hunspell) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libidn) - #:use-module (gnu packages libreoffice) #:use-module (gnu packages libusb) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) -- cgit v1.2.3 From 590700ce00177a826872c867066eeba6eb7c4641 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 8 Jan 2023 10:30:37 +0100 Subject: gnu: pipewire: Switch default to 0.3. * gnu/packages/linux.scm (pipewire): Switch to pipewire 0.3. (pipewire-0.3): Remove variable. (wireplumber): Replace all pipewire-0.3 by pipewire. * gnu/packages/audio.scm (qpwgraph): Ditto. * gnu/packages/chromium.scm (ungoogled-chromium): Ditto. * gnu/packages/freedesktop.scm (weston, xdg-desktop-portal, xdg-desktop-portal-wlr): Ditto. * gnu/packages/gnome.scm (mutter): Ditto. * gnu/packages/kde-systemtools.scm (krfb): Ditto. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Ditto. * gnu/packages/video.scm (obs): Ditto. Signed-off-by: Mathieu Othacehe --- gnu/packages/audio.scm | 2 +- gnu/packages/chromium.scm | 2 +- gnu/packages/freedesktop.scm | 6 +-- gnu/packages/gnome.scm | 4 +- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/linux.scm | 79 ++++++++++++++-------------------------- gnu/packages/telegram.scm | 2 +- gnu/packages/video.scm | 2 +- 8 files changed, 38 insertions(+), 61 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 49e33402eb..0cefc61ca2 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -6017,7 +6017,7 @@ and DSD streams.") (arguments (list #:tests? #f)) ;; no tests (inputs (list alsa-lib libxkbcommon - pipewire-0.3 + pipewire qtbase qtsvg)) (native-inputs (list pkg-config)) diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm index ed6dd9dfd1..799c2422ac 100644 --- a/gnu/packages/chromium.scm +++ b/gnu/packages/chromium.scm @@ -941,7 +941,7 @@ opus+custom pango pciutils - pipewire-0.3 + pipewire pulseaudio qtbase-5 re2 diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d63fe8f7ca..130a7adec4 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1372,7 +1372,7 @@ compositor.") mtdev linux-pam pango - pipewire-0.3 + pipewire wayland-protocols-next xorg-server-xwayland)) (propagated-inputs @@ -2693,7 +2693,7 @@ compatible with the well-known scripts of the same name.") ("libportal" ,libportal) ("dbus" ,dbus) ("geoclue" ,geoclue) - ("pipewire" ,pipewire-0.3) + ("pipewire" ,pipewire) ("fuse" ,fuse-3))) (arguments `(#:configure-flags @@ -2866,7 +2866,7 @@ for xdg-desktop-portal that is using Qt/KF5.") grim iniparser libinih - pipewire-0.3 + pipewire slurp wayland wayland-protocols)) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b5273b5c06..09b8056cc9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8118,7 +8118,7 @@ to display dialog boxes from the commandline and shell scripts.") ;; theme to please libxcursor. adwaita-icon-theme libxcursor ;for XCURSOR_PATH - pipewire-0.3 + pipewire python python-dbus python-dbusmock @@ -8160,7 +8160,7 @@ to display dialog boxes from the commandline and shell scripts.") libxkbfile libxrandr libxtst - pipewire-0.3 + pipewire startup-notification sysprof upower diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 96ed5cb777..455798ab8c 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -270,7 +270,7 @@ This package is part of the KDE base applications module.") libxcb libxtst breeze-icons ;; default icon set - pipewire-0.3 + pipewire plasma-wayland-protocols qtbase-5 qtwayland-5 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5c8d886fbd..8d20f105cb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2017 nee ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Pierre-Antoine Rouby -;;; Copyright © 2018, 2020 Brendan Tildesley +;;; Copyright © 2018, 2020, 2022 Brendan Tildesley ;;; Copyright © 2018 Manuel Graf ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu @@ -9078,7 +9078,7 @@ types and interfaces and translates so that the X server can use them.") (define-public pipewire (package (name "pipewire") - (version "0.2.7") + (version "0.3.56") (source (origin (method git-fetch) (uri (git-reference @@ -9087,23 +9087,34 @@ types and interfaces and translates so that the X server can use them.") (file-name (git-file-name name version)) (sha256 (base32 - "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc")) - (patches (search-patches "pipewire-0.2.7-fno-common.patch")))) + "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dsystemd=false"))) + (list + #:configure-flags + #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") + "-Dsystemd=disabled" + "-Dsession-managers=[]" + "-Dman=enabled"))) (native-inputs - (list pkg-config)) - (inputs - (list alsa-lib - dbus - eudev - ffmpeg-4 - gstreamer - gst-plugins-base - libva - sbc - sdl2)) + (list pkg-config + python-docutils)) + (inputs (list alsa-lib + avahi + bluez + dbus + eudev + ffmpeg + gst-plugins-base + gstreamer + jack-2 + ldacbt + libva + pulseaudio + sbc + sdl2 + vulkan-headers + vulkan-loader)) (home-page "https://pipewire.org/") (synopsis "Server and user space API to deal with multimedia pipelines") (description @@ -9117,40 +9128,6 @@ and Flatpak we expect PipeWire to provide a core building block for the future of Linux application development.") (license license:lgpl2.0+))) -(define-public pipewire-0.3 - (package - (inherit pipewire) - (name "pipewire") - (version "0.3.56") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PipeWire/pipewire") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "066g4ri2k8pdflclvr2919f6x98gmqrqyj1xyiingw2nn2pwgcf1")))) - (arguments - (list - #:configure-flags - #~(list (string-append "-Dudevrulesdir=" #$output "/lib/udev/rules.d") - "-Dsystemd=disabled" - "-Dsession-managers=[]" - "-Dman=enabled"))) - (native-inputs - (modify-inputs (package-native-inputs pipewire) - (prepend python-docutils))) - (inputs (modify-inputs (package-inputs pipewire) - (replace "ffmpeg" ffmpeg) - (prepend avahi - bluez - jack-2 - ldacbt - pulseaudio - vulkan-loader - vulkan-headers))))) - (define-public wireplumber (package (name "wireplumber") @@ -9172,7 +9149,7 @@ of Linux application development.") (native-inputs (list `(,glib "bin") pkg-config)) - (inputs (list dbus elogind glib lua pipewire-0.3)) + (inputs (list dbus elogind glib lua pipewire)) (home-page "https://gitlab.freedesktop.org/pipewire/wireplumber") (synopsis "Session / policy manager implementation for PipeWire") (description "WirePlumber is a modular session / policy manager for diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 14e0602d93..ad9ca74a6c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -338,7 +338,7 @@ openh264 openssl opus - pipewire-0.3 + pipewire protobuf)) (synopsis "WebRTC support for Telegram Desktop") (description "WebRTC-for-Telegram-Desktop is a custom WebRTC fork by diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e934379ff4..fc430b9196 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3457,7 +3457,7 @@ be used for realtime video capture via Linux-specific APIs.") mbedtls-apache mesa pciutils - pipewire-0.3 + pipewire pulseaudio python qtbase-5 -- cgit v1.2.3 From 238f965c331990459a69cbc713ca951ad40e6044 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 14 Jan 2023 19:34:31 -0500 Subject: gnu: yt-dlp: Update to 2023.01.06. * gnu/packages/video.scm (yt-dlp): Update to 2023.01.06. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fc430b9196..e0c16ea741 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2564,7 +2564,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package/inherit youtube-dl (name "yt-dlp") - (version "2022.11.11") + (version "2023.01.06") (source (origin (method git-fetch) @@ -2573,7 +2573,7 @@ YouTube.com and many more sites.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "00dng4x7xbxp6w76dqkfzzhf2dh3s9pgfd0axs7qar20clj717py")))) + (base32 "13kg6zsc0js4smqj6v4qpiycl9jlijj3pvp49wif6ilgv87sq7v3")))) (arguments (substitute-keyword-arguments (package-arguments youtube-dl) ((#:tests? _) (not (%current-target-system))) -- cgit v1.2.3 From 33c03a9d8e11a9c69d97061403cf9779cbc6d9aa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 15 Jan 2023 01:00:01 +0100 Subject: gnu: motion: Update to 4.5.1. * gnu/packages/video.scm (motion): Update to 4.5.1. --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e0c16ea741..60d39c38dc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4583,7 +4583,7 @@ It counts more than 100 plugins.") (define-public motion (package (name "motion") - (version "4.5.0") + (version "4.5.1") (home-page "https://motion-project.github.io/") (source (origin (method git-fetch) @@ -4592,7 +4592,7 @@ It counts more than 100 plugins.") (commit (string-append "release-" version)))) (sha256 (base32 - "1rqy98g3xjjzjxiw8j3qdka0rbhcgzgczz6qgj157ck9116j18dq")) + "09j919bba75d05rkqpib5rcmn1ff5nvn4ss8yy4fi6iz0lnacffx")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs -- cgit v1.2.3