From 2ff28472e3bc1d2f3df3794bfa98102d00f65a22 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 31 Oct 2021 18:42:19 +0100 Subject: gnu: pipe-viewer: Update to 0.1.5. * gnu/packages/video.scm (pipe-viewer): Update to 0.1.5. --- 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 245007f294..540b81f0b3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1073,7 +1073,7 @@ (define-public mkvtoolnix (define-public pipe-viewer (package (name "pipe-viewer") - (version "0.1.4") + (version "0.1.5") (source (origin (method git-fetch) @@ -1083,7 +1083,7 @@ (define-public pipe-viewer (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0d8b3gcr9dndw8qlwfrm0wgp4vjmn8fwd151kmzz7kkw57f5jfch")))) + (base32 "075xc5kvnmyqqj7zijvdrvbkna931h7xf8f8z0ick7yx5fy3pn5j")))) (build-system perl-build-system) (arguments `(#:imported-modules -- cgit v1.2.3 From 7eaacf0ece04e10a9f618893222c94b11216227c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Oct 2021 15:13:06 -0400 Subject: gnu: libopenshot: Update to 0.2.7. * gnu/packages/video.scm (libopenshot): Update to 0.2.7. [origin]: Adjust snippet to upstream changes. [inputs]: Add alsa-lib and zlib. [propagated-inputs]: Replace ffmpeg-4.3 with ffmpeg. --- gnu/packages/video.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 540b81f0b3..6ed49ce5a5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4659,7 +4659,7 @@ (define-public vidstab (define-public libopenshot (package (name "libopenshot") - (version "0.2.5") + (version "0.2.7") (source (origin (method git-fetch) (uri (git-reference @@ -4668,11 +4668,11 @@ (define-public libopenshot (file-name (git-file-name name version)) (sha256 (base32 - "1mxjkgjmjzgf628y3rscc6rqf55hxgjpmvwxlncfk1216i5xskwp")) + "0i9bsn8gklm1mvj60l3d3xrxdgy8svpxjfqcwsr308j5zjn30pv8")) (modules '((guix build utils))) (snippet '(begin ;; Allow overriding of the python installation dir - (substitute* "src/bindings/python/CMakeLists.txt" + (substitute* "bindings/python/CMakeLists.txt" (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set) (string-append set " CACHE PATH " "\"Python bindings directory\")"))) @@ -4684,11 +4684,12 @@ (define-public libopenshot ("python" ,python) ("swig" ,swig) ("unittest++" ,unittest-cpp))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("zlib" ,zlib))) (propagated-inputs ;all referenced in installed headers `(("cppzmq" ,cppzmq) - ;; libopenshot doesn't yet build with ffmpeg 4.4 (see: - ;; https://github.com/OpenShot/libopenshot/issues/676). - ("ffmpeg" ,ffmpeg-4.3) + ("ffmpeg" ,ffmpeg) ("imagemagick" ,imagemagick) ("jsoncpp" ,jsoncpp) ("libopenshot-audio" ,libopenshot-audio) -- cgit v1.2.3 From 0cfc13104f0cb9251b6bd4b997e675ae9f03cd85 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Oct 2021 15:14:24 -0400 Subject: gnu: OpenShot: Update to 2.6.1. * gnu/packages/video.scm (openshot): Update to 2.6.1. [arguments]: Add a 'fix-symbolic-link' phase to work around a broken symlink. Run the custom 'check' phase when tests? are enabled. --- gnu/packages/video.scm | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6ed49ce5a5..7bf9191811 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4724,7 +4724,7 @@ (define-public libopenshot (define-public openshot (package (name "openshot") - (version "2.5.1") + (version "2.6.1") (source (origin (method git-fetch) (uri (git-reference @@ -4733,7 +4733,7 @@ (define-public openshot (file-name (git-file-name name version)) (sha256 (base32 - "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq")) + "0pa8iwl217503bjlqg2zlrw5lxyq5hvxrf5apxrh3843hj1w1myv")) (modules '((guix build utils))) (snippet '(begin @@ -4758,9 +4758,10 @@ (define-public openshot #:phases (modify-phases %standard-phases (delete 'build) ;install phase does all the work (replace 'check - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "python" "src/tests/query_tests.py"))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "QT_QPA_PLATFORM" "offscreen") + (invoke "python" "src/tests/query_tests.py")))) (add-after 'unpack 'patch-font-location (lambda* (#:key inputs #:allow-other-keys) (let ((font (assoc-ref inputs "font-dejavu"))) @@ -4769,6 +4770,12 @@ (define-public openshot (("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 80c0505f166101bbe6d55b8f2314d1a18227b3ee Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Fri, 22 Oct 2021 15:15:28 -0400 Subject: gnu: Remove FFmpeg 4.3. * gnu/packages/video.scm (ffmpeg-4.3): Remove variable. --- gnu/packages/video.scm | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 7bf9191811..d4d9eed68d 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1701,17 +1701,6 @@ (define-public ffmpeg audio/video codec library.") (license license:gpl2+))) -(define-public ffmpeg-4.3 - (package/inherit ffmpeg - (version "4.3.2") - (source (origin - (method url-fetch) - (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" - version ".tar.xz")) - (sha256 - (base32 - "1nyd9jlcy0pqnwzi29a7sg50hq37vb0g3f9l16y3q8yh3m7ydr26")))))) - (define-public ffmpeg-3.4 (package (inherit ffmpeg) -- cgit v1.2.3 From e5a3df7b9f222daf2554b4afce16595ccf95089c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 2 Nov 2021 11:12:45 +0200 Subject: gnu: mpv: Update to 0.34.0. * gnu/packages/video.scm (mpv): Update to 0.34.0. [inputs]: Remove youtube-dl; add yt-dlp. [arguments]: Adjust custom 'patch-paths phase to adjust for change in inputs. --- gnu/packages/video.scm | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d4d9eed68d..1aed38a81e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -2084,7 +2084,7 @@ (define-public mplayer (define-public mpv (package (name "mpv") - (version "0.33.1") + (version "0.34.0") (source (origin (method git-fetch) (uri (git-reference @@ -2092,8 +2092,7 @@ (define-public mpv (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 - "06rw1f55zcsj78ql8w70j9ljp2qb1pv594xj7q9cmq7i92a7hq45")))) + (base32 "0kqckrgvpx42gdmnc644lpwbimwf1am256xd670w2b8sbrjv3bm9")))) (build-system waf-build-system) (native-inputs `(("perl" ,perl) ; for zsh completion file @@ -2137,19 +2136,17 @@ (define-public mpv ("wayland" ,wayland) ("wayland-protocols" ,wayland-protocols) ("libxkbcommon" ,libxkbcommon) - ("youtube-dl" ,youtube-dl) + ("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 "youtube-dl"))) - (substitute* "player/lua/ytdl_hook.lua" - (("\"youtube-dl\",") - (string-append "\"" ytdl "/bin/youtube-dl\","))) - #t))) + (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\",")))))) (add-before 'configure 'build-reproducibly (lambda _ ;; Somewhere in the build system library dependencies are enumerated -- cgit v1.2.3