From 99d5e5df2714a4ee36788b189f34e882b47b932a Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 09:19:00 +0100 Subject: gnu: mkvtoolnix: Install GUI to separate output. * gnu/packages/video.scm (mkvtoolnix)[arguments]: Do it. --- gnu/packages/video.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c97dbbe204..ee49d35cec 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -377,6 +377,7 @@ H.264 (MPEG-4 AVC) video streams.") "lib/utf8-cpp")) #t)))) (build-system gnu-build-system) + (outputs '("out" "gui")) ; "mkvtoolnix-gui" brings the closure size from ~300 MB to 1.5+ GB. (inputs `(("boost" ,boost) ("bzip2" ,bzip2) @@ -432,7 +433,20 @@ H.264 (MPEG-4 AVC) video streams.") (invoke "rake" "tests/unit"))) (replace 'install (lambda _ - (invoke "rake" "install")))))) + (invoke "rake" "install"))) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the Qt interface to "gui". + (let ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui"))) + (for-each + (lambda (file) + (mkdir-p (string-append gui (dirname file))) + (rename-file (string-append out file) + (string-append gui file))) + '("/bin/mkvtoolnix-gui" + "/share/applications/org.bunkus.mkvtoolnix-gui.desktop"))) + #t))))) (home-page "https://mkvtoolnix.download") (synopsis "Tools to create, alter and inspect Matroska files") (description -- cgit v1.2.3 From b55db49481394214adc30be623078c723d32c707 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 15 Mar 2019 20:32:36 +0100 Subject: gnu: mkvtoolnix: Move all GUI files to the "gui" output. * gnu/packages/video.scm (mkvtoolnix)[arguments]: Do it. --- gnu/packages/video.scm | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index ee49d35cec..5b40a7d4a5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -437,15 +437,29 @@ H.264 (MPEG-4 AVC) video streams.") (add-after 'install 'post-install (lambda* (#:key outputs #:allow-other-keys) ;; Move the Qt interface to "gui". - (let ((out (assoc-ref outputs "out")) - (gui (assoc-ref outputs "gui"))) + (let* ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui")) + (strip-store-dir (lambda (path) + (substring path (string-prefix-length out path))))) (for-each (lambda (file) (mkdir-p (string-append gui (dirname file))) (rename-file (string-append out file) (string-append gui file))) - '("/bin/mkvtoolnix-gui" - "/share/applications/org.bunkus.mkvtoolnix-gui.desktop"))) + (append '("/bin/mkvtoolnix-gui" + "/share/applications/org.bunkus.mkvtoolnix-gui.desktop" + "/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml" + "/share/mime/packages/org.bunkus.mkvtoolnix-gui.xml") + (map strip-store-dir (find-files out "\\.ogg$")) + (map strip-store-dir (find-files out "mkvtoolnix-gui\\.png$")) + (map strip-store-dir (find-files out "mkvtoolnix-gui\\.1")))) + (for-each + (lambda (file) + (delete-file-recursively (string-append out file))) + '("/share/applications" + "/share/metainfo" + "/share/mime" + "/share/mkvtoolnix"))) #t))))) (home-page "https://mkvtoolnix.download") (synopsis "Tools to create, alter and inspect Matroska files") -- cgit v1.2.3 From 0848615300ec0693b2849e80103a13063fa4b190 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sat, 16 Mar 2019 16:11:24 +0100 Subject: gnu: Add gaupol. * gnu/packages/video.scm (gaupol): New variable. --- gnu/packages/video.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5b40a7d4a5..c661c4ce87 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3461,3 +3461,72 @@ speed and correctness.") (description "Wlstream is a screen capture tool for recording audio and video from a Wayland session.") (license license:lgpl2.1+)))) + +(define-public gaupol + (package + (name "gaupol") + (version "1.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/otsaloma/gaupol/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0dk44fmcs86ymfxfbpdbrr4x5nn5hnv57wkqjyw61g779xjhlrd2")))) + (build-system python-build-system) + (native-inputs + `(("gettext" ,gettext-minimal) + ("pkg-config" ,pkg-config))) + (inputs + `(("python-pygobject" ,python-pygobject) + ("gtk+" ,gtk+) + ("python-pycairo" ,python-pycairo) ; Required or else clicking on a subtitle line fails. + ("python-chardet" ,python-chardet) ; Optional: Character encoding detection. + ("gtkspell3" ,gtkspell3) ; Optional: Inline spell-checking. + ("iso-codes" ,iso-codes) ; Optional: Translations. + ("gstreamer" ,gstreamer) + ("gst-libav" ,gst-libav) + ("gst-plugins-base" ,gst-plugins-base) + ("gst-plugins-good" ,gst-plugins-good) + ("gst-plugins-bad" ,gst-plugins-bad) + ("gst-plugins-ugly" ,gst-plugins-ugly))) + (arguments + `(#:tests? #f ; Tests seem to require networking. + #:phases + (modify-phases %standard-phases + ;; gaupol's setup.py script does not support one of the Python build + ;; system's default flags, "--single-version-externally-managed". + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "python" "setup.py" "install" + (string-append "--prefix=" (assoc-ref outputs "out")) + "--root=/"))) + (add-after 'install 'wrap-gaupol + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/gaupol") + `("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path)) + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + #t)) + (add-after 'unpack 'patch-data-dir + ;; Fix some path variables that setup.py seems to garble. + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "setup.py" + (("DATA_DIR = \\{!r\\}\"\\.format\\(data_dir\\)") + (string-append "DATA_DIR = '" out "/share/gaupol'\"")) + (("LOCALE_DIR = \\{!r\\}\"\\.format\\(locale_dir\\)") + (string-append "LOCALE_DIR = '" out "/share/locale'\""))) + #t)))))) + (synopsis "Editor for text-based subtitles") + (description + "Gaupol supports multiple subtitle file formats and provides means of +creating subtitles, editing texts and timing subtitles to match video. The +user interface features a builtin video player and is designed with attention +to convenience of translating and batch processing of multiple documents.") + (home-page "https://otsaloma.io/gaupol/") + (license license:gpl3+))) -- cgit v1.2.3 From 47956fa0c24efcdcba3493f0231c30e9a39ec7df Mon Sep 17 00:00:00 2001 From: ng0 Date: Thu, 14 Mar 2019 09:33:38 +0000 Subject: Correct name and email address for ng0. * .mailmap, Makefile.am, doc/guix.de.texi, doc/guix.fr.texi, doc/guix.texi, etc/completion/fish/guix.fish, gnu/packages/accessibility.scm, gnu/packages/admin.scm, gnu/packages/audio.scm, gnu/packages/autotools.scm, gnu/packages/cdrom.scm, gnu/packages/check.scm, gnu/packages/cinnamon.scm, gnu/packages/compression.scm, gnu/packages/crypto.scm, gnu/packages/databases.scm, gnu/packages/django.scm, gnu/packages/dns.scm, gnu/packages/elixir.scm, gnu/packages/emacs-xyz.scm, gnu/packages/emacs.scm, gnu/packages/enlightenment.scm, gnu/packages/erlang.scm, gnu/packages/fonts.scm, gnu/packages/fontutils.scm, gnu/packages/forth.scm, gnu/packages/fvwm.scm, gnu/packages/games.scm, gnu/packages/gl.scm, gnu/packages/gnome.scm, gnu/packages/gnunet.scm, gnu/packages/gnupg.scm, gnu/packages/gnuzilla.scm, gnu/packages/gtk.scm, gnu/packages/guile-wm.scm,gnu/packages/guile-xyz.scm, gnu/packages/haskell-check.scm, gnu/packages/haskell-crypto.scm, gnu/packages/haskell.scm, gnu/packages/image-viewers.scm, gnu/packages/image.scm, gnu/packages/irc.scm, gnu/packages/language.scm, gnu/packages/libcanberra.scm, gnu/packages/linux.scm, gnu/packages/lisp.scm, gnu/packages/lolcode.scm, gnu/packages/lxde.scm, gnu/packages/lxqt.scm, gnu/packages/mail.scm, gnu/packages/markup.scm, gnu/packages/mate.scm, gnu/packages/maths.scm, gnu/packages/mc.scm, gnu/packages/messaging.scm, gnu/packages/music.scm, gnu/packages/ncurses.scm, gnu/packages/networking.scm, gnu/packages/nickle.scm, gnu/packages/openbox.scm, gnu/packages/pdf.scm, gnu/packages/perl-check.scm, gnu/packages/perl.scm, gnu/packages/python-compression.scm, gnu/packages/python-crypto.scm, gnu/packages/python-web.scm, gnu/packages/python-xyz.scm, gnu/packages/python.scm, gnu/packages/qt.scm, gnu/packages/ruby.scm, gnu/packages/rust.scm, gnu/packages/scheme.scm, gnu/packages/serialization.scm, gnu/packages/shells.scm, gnu/packages/ssh.scm, gnu/packages/suckless.scm, gnu/packages/tbb.scm, gnu/packages/telephony.scm, gnu/packages/text-editors.scm, gnu/packages/textutils.scm, gnu/packages/time.scm, gnu/packages/tls.scm, gnu/packages/tor.scm, gnu/packages/version-control.scm, gnu/packages/video.scm, gnu/packages/vim.scm, gnu/packages/web.scm, gnu/packages/wm.scm, gnu/packages/xdisorg.scm, gnu/packages/xfce.scm, gnu/packages/xml.scm, gnu/packages/xorg.scm, gnu/services/certbot.scm, gnu/services/desktop.scm, gnu/services/version-control.scm, gnu/services/web.scm, guix/import/hackage.scm, guix/licenses.scm: Correct name and email address for ng0. Signed-off-by: Tobias Geerinckx-Rice --- 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 c661c4ce87..f00be7092b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2016 Kei Kebreau ;;; Copyright © 2016 Dmitry Nikolaev ;;; Copyright © 2016 Andy Patterson -;;; Copyright © 2016, 2017 Nils Gillmann +;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016, 2018, 2019 Eric Bavier ;;; Copyright © 2016 Jan Nieuwenhuizen ;;; Copyright © 2017 Feng Shu -- cgit v1.2.3 From cdfea208b89f7c8a01fe0ebf1cb574d02e0822ec Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 18 Mar 2019 23:39:18 +0100 Subject: gnu: dav1d: Update to 0.2.1. * gnu/packages/video.scm (dav1d): Update to 0.2.1. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f00be7092b..220d729d03 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3411,7 +3411,7 @@ transitions, and effects and then export your film to many common formats.") (define-public dav1d (package (name "dav1d") - (version "0.2.0") + (version "0.2.1") (source (origin (method url-fetch) @@ -3423,8 +3423,7 @@ transitions, and effects and then export your film to many common formats.") (string-append "https://code.videolan.org/videolan/dav1d/-/" "archive/" version "/dav1d-" version ".tar.bz2"))) (sha256 - (base32 - "0q0dbbl91syjnkygz268gh4b7mdcgl6hldj300a4cbqidsadpl5p")))) + (base32 "0cp7harg2gf61v35hyki2ddk9yr0xli9bkk3smxblabmq9rv5cs3")))) (build-system meson-build-system) (native-inputs `(("nasm" ,nasm))) (home-page "https://code.videolan.org/videolan/dav1d") -- cgit v1.2.3 From ab3423d2ff96b4789b066267f0624e5a035984a7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 19 Mar 2019 14:58:17 +0100 Subject: gnu: youtube-dl: Update to 2019.03.18. * gnu/packages/video.scm (youtube-dl): Update to 2019.03.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 220d729d03..24b4a2c22d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1440,7 +1440,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2019.03.09") + (version "2019.03.18") (source (origin (method url-fetch) (uri (string-append "https://github.com/rg3/youtube-dl/releases/" @@ -1448,7 +1448,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1g46mrmzr31b2r6x0g6wmg3j00qc8l6cbzmdik0l5vwjfcrdvghf")))) + "0r31q7j3gg2zfw3b45jancxl7mmr2gin8dyfx5dgyyp92ss8hih7")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 6854a5d5f7a4ca41b786fadfafe97978a5b45f14 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 20 Mar 2019 20:25:18 +0100 Subject: gnu: obs: Update to 23.0.2. * gnu/packages/video.scm (obs): Update to 23.0.2. --- gnu/packages/video.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 24b4a2c22d..51c030aa44 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2221,7 +2221,7 @@ be used for realtime video capture via Linux-specific APIs.") (define-public obs (package (name "obs") - (version "22.0.3") + (version "23.0.2") (source (origin (method git-fetch) (uri (git-reference @@ -2230,10 +2230,10 @@ be used for realtime video capture via Linux-specific APIs.") (file-name (git-file-name name version)) (sha256 (base32 - "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i")))) + "1c0a5vy4h3qwz69qw3bydyk7r651ib5a9jna4yj6c25p3p9isdvp")))) (build-system cmake-build-system) (arguments - `(#:tests? #f)) ; no tests + `(#:tests? #f)) ; no tests (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 309f340879122f8081e9a099b98b0fc1758a077b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:42:22 +0100 Subject: gnu: libmatroska: Don't use NAME in source URI. * gnu/packages/video.scm (libmatroska)[source]: Hard-code NAME. --- 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 51c030aa44..7b59a68c13 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -675,7 +675,7 @@ SMPTE 314M.") (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" - name "/" name "-" version ".tar.xz")) + "libmatroska/libmatroska-" version ".tar.xz")) (sha256 (base32 "1j4mjzx6mjzfjf9hz8g4w84krf5jccmr5cyynll0j1vwv3aiv9iq")))) -- cgit v1.2.3 From 04ef07fecb03f213a09d365aac2b793e62a90943 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 21 Mar 2019 03:42:28 +0100 Subject: gnu: libmatroska: Update to 1.5.0. * gnu/packages/video.scm (libmatroska): Update to 1.5.0. --- gnu/packages/video.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7b59a68c13..dc277de518 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -670,15 +670,14 @@ SMPTE 314M.") (define-public libmatroska (package (name "libmatroska") - (version "1.4.9") + (version "1.5.0") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" "libmatroska/libmatroska-" version ".tar.xz")) (sha256 - (base32 - "1j4mjzx6mjzfjf9hz8g4w84krf5jccmr5cyynll0j1vwv3aiv9iq")))) + (base32 "07md2gvy3x92ym2k449740mdji6mhknlajkndnhi507s4wcdrvzh")))) (build-system cmake-build-system) (inputs `(("libebml" ,libebml))) -- cgit v1.2.3