From 4f889375f2e3c0606e83280cd7deee5c58e11cd4 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 17:29:56 +0200 Subject: gnu: libopenshot: Fix tests on other architectures. * gnu/packages/video.scm (libopenshot)[source]: Add patch. * gnu/packages/patches/libopenshot-fixup-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 52f151bd78..c51352dcf8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3222,7 +3222,8 @@ create smoother and stable videos.") (string-append set " CACHE PATH " "\"Python bindings directory\")"))) #t)) - (patches (search-patches "libopenshot-tests-with-system-libs.patch")))) + (patches (search-patches "libopenshot-fixup-tests.patch" + "libopenshot-tests-with-system-libs.patch")))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 277becbbb7beee43c2e0fa5e2b038882c07200cd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 17:30:33 +0200 Subject: gnu: libopenshot: Remove bundled libraries. * gnu/packages/video.scm (libopenshot)[source]: Add snippet to remove bundled libraries. --- 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 c51352dcf8..d61e11eecd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3221,6 +3221,7 @@ create smoother and stable videos.") (("(SET\\(PYTHON_MODULE_PATH.*)\\)" _ set) (string-append set " CACHE PATH " "\"Python bindings directory\")"))) + (delete-file-recursively "thirdparty") #t)) (patches (search-patches "libopenshot-fixup-tests.patch" "libopenshot-tests-with-system-libs.patch")))) -- cgit v1.2.3 From ad656e70b69f65914b87cb334ffef9547f597508 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 17:31:16 +0200 Subject: gnu: libopenshot: Build with modular qt. * gnu/packages/video.scm (libopenshot)[propagated-inputs]: Remove qt, add qtbase, qtmultimedia. --- gnu/packages/video.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d61e11eecd..221b3a8ad0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3237,7 +3237,8 @@ create smoother and stable videos.") ("imagemagick" ,imagemagick) ("jsoncpp" ,jsoncpp) ("libopenshot-audio" ,libopenshot-audio) - ("qt" ,qt) ;widgets, core, gui, multimedia, and multimediawidgets + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) ("zeromq" ,zeromq))) (arguments `(#:configure-flags -- cgit v1.2.3 From ae63b2c582d565fe7c3f7a18d9b9c1f1ee438931 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 19:57:08 +0200 Subject: gnu: avidemux: Update to 2.7.1. * gnu/packages/video.scm (avidemux): Update to 2.7.1. [arguments]: Update bundled ffmpeg to 3.3.7. --- gnu/packages/video.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 221b3a8ad0..782f6a0c64 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1764,7 +1764,7 @@ for use with HTML5 video.") (define-public avidemux (package (name "avidemux") - (version "2.6.12") + (version "2.7.1") (source (origin (method url-fetch) (uri (string-append @@ -1772,7 +1772,7 @@ for use with HTML5 video.") name "_" version ".tar.gz")) (sha256 (base32 - "0nz52yih8sff53inndkh2dba759xjzsh4b8xjww419lcpk0qp6kn")) + "15g9h791qbnmycabbbl7s2b3n3xpvygm88qrfk35g2cw6957ik9w")) (patches (search-patches "avidemux-install-to-lib.patch")))) (build-system cmake-build-system) (native-inputs @@ -1810,19 +1810,19 @@ for use with HTML5 video.") (add-before 'patch-source-shebangs 'unpack-ffmpeg (lambda _ (with-directory-excursion "avidemux_core/ffmpeg_package" - (invoke "tar" "xf" "ffmpeg-2.7.6.tar.bz2") - (delete-file "ffmpeg-2.7.6.tar.bz2")) + (invoke "tar" "xf" "ffmpeg-3.3.7.tar.bz2") + (delete-file "ffmpeg-3.3.7.tar.bz2")) #t)) (add-after 'patch-source-shebangs 'repack-ffmpeg (lambda _ (with-directory-excursion "avidemux_core/ffmpeg_package" - (substitute* "ffmpeg-2.7.6/configure" + (substitute* "ffmpeg-3.3.7/configure" (("#! /bin/sh") (string-append "#!" (which "sh")))) - (invoke "tar" "cjf" "ffmpeg-2.7.6.tar.bz2" "ffmpeg-2.7.6" + (invoke "tar" "cjf" "ffmpeg-3.3.7.tar.bz2" "ffmpeg-3.3.7" ;; avoid non-determinism in the archive "--sort=name" "--mtime=@0" "--owner=root:0" "--group=root:0") - (delete-file-recursively "ffmpeg-2.7.6")) + (delete-file-recursively "ffmpeg-3.3.7")) #t)) (replace 'configure (lambda _ -- cgit v1.2.3 From 3261a732804f7bcaa90279072cdc7e60afd62dd5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Mar 2019 19:57:48 +0200 Subject: gnu: avidemux: Build with modular qt. * gnu/packages/video.scm (avidemux)[inputs]: Remove qt, add qtbase, qttools. --- 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 782f6a0c64..bf9cb155f2 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1794,9 +1794,8 @@ for use with HTML5 video.") ("perl" ,perl) ("pulseaudio" ,pulseaudio) ("python" ,python-wrapper) - ("qt" ,qt) ; FIXME: reenable modular qt after update - requires building - ;("qtbase" ,qtbase) with -std=gnu++11. - ;("qttools" ,qttools) + ("qtbase" ,qtbase) + ("qttools" ,qttools) ("sdl" ,sdl) ("sqlite" ,sqlite) ("yasm" ,yasm) -- cgit v1.2.3 From e7ed996c531b5077f4466d8b9801a3509f00e0e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 17:11:50 +0200 Subject: gnu: mkvtoolnix: Update to 31.0.0. * gnu/packages/video.scm (mkvtoolnix): Update to 31.0.0. [arguments]: Remove unneeded 'with-extra-includes' flag, add flags to disable update checks and not use precompiled headers. --- gnu/packages/video.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index bf9cb155f2..76fdec9f2f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -316,7 +316,7 @@ H.264 (MPEG-4 AVC) video streams.") (define-public mkvtoolnix (package (name "mkvtoolnix") - (version "13.0.0") + (version "31.0.0") (source (origin (method url-fetch) @@ -324,7 +324,7 @@ H.264 (MPEG-4 AVC) video streams.") name "-" version ".tar.xz")) (sha256 (base32 - "0hknnnnx9661igm1r73dc7aqxnnrl5a8yvyvr1nhd9ymn2klwpl5")) + "0d8va2iamzc7y3wi71z8mk2vnqvnkgwb2p7casdfp37400x8r2pr")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled libraries. @@ -368,16 +368,15 @@ H.264 (MPEG-4 AVC) video streams.") (assoc-ref %build-inputs "docbook-xsl") "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl)) - (string-append "--with-extra-includes=" - (assoc-ref %build-inputs "nlohmann-json-cpp") - "/include/nlohmann")) + "--enable-update-check=no" + "--enable-precompiled-headers=no") #:phases (modify-phases %standard-phases (add-before 'configure 'add-googletest - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (symlink - (string-append (assoc-ref %build-inputs "googletest") - "/include/gtest") "lib/gtest") + (string-append (assoc-ref inputs "googletest") + "/include/gtest") "lib/gtest") #t)) (replace 'build (lambda _ -- cgit v1.2.3 From f3395a7b4dcf04bad2c07d6de414014a3d227483 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 17:13:30 +0200 Subject: gnu: mkvtoolnix: Unbundle more libraries. * gnu/packages/video.scm (mkvtoolnix)[source]: Remove more bundled libraries. [inputs]: Add fmt, cmark. --- gnu/packages/video.scm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 76fdec9f2f..93ebfe09d5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -112,6 +112,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages m4) #:use-module (gnu packages man) + #:use-module (gnu packages markup) #:use-module (gnu packages mp3) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) @@ -119,6 +120,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages popt) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -329,7 +331,8 @@ H.264 (MPEG-4 AVC) video streams.") (snippet '(begin ;; Delete bundled libraries. (for-each delete-file-recursively - '("lib/libebml" + '("lib/fmt" + "lib/libebml" "lib/libmatroska" "lib/nlohmann-json" "lib/pugixml" @@ -339,9 +342,11 @@ H.264 (MPEG-4 AVC) video streams.") (inputs `(("boost" ,boost) ("bzip2" ,bzip2) + ("cmark" ,cmark) ("libebml" ,libebml) - ("flac" ,flac) ("file" ,file) + ("flac" ,flac) + ("fmt" ,fmt) ("libmatroska" ,libmatroska) ("libogg" ,libogg) ("libvorbis" ,libvorbis) -- cgit v1.2.3 From 662ff659ec6fb2ab2c7b01a5d05d7b72f21f3820 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 4 Mar 2019 17:15:01 +0200 Subject: gnu: mkvtoolnix: Use modular qt. * gnu/packages/video.scm (mkvtoolnix)[inputs]: Remove qt, add qtbase, qtmultimedia. [native-inputs]: Add qttools. --- gnu/packages/video.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 93ebfe09d5..8e229f1d49 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -352,7 +352,8 @@ H.264 (MPEG-4 AVC) video streams.") ("libvorbis" ,libvorbis) ("lzo" ,lzo) ("pugixml" ,pugixml) - ("qt" ,qt) + ("qtbase" ,qtbase) + ("qtmultimedia" ,qtmultimedia) ("utfcpp" ,utfcpp) ("zlib" ,zlib))) (native-inputs @@ -364,6 +365,7 @@ H.264 (MPEG-4 AVC) video streams.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) + ("qttools" ,qttools) ("ruby" ,ruby))) (arguments `(#:configure-flags -- cgit v1.2.3