From 3df69aaf630efa5b5f7d56bb10239646792dda1d Mon Sep 17 00:00:00 2001 From: Timo Eisenmann Date: Thu, 28 Mar 2019 21:00:54 +0100 Subject: gnu: mpv: Set absolute path to 'youtube-dl'. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mpv)[arguments]: Add phase 'patch-paths' to substitute in the absolute path to 'youtube-dl'. Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3a043fb34f..8aedc1c2f5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1326,6 +1326,14 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (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-before 'configure 'setup-waf (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 4994174fa0234ecb35b181d1d0cca209be1c4323 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Apr 2019 13:52:39 +0300 Subject: gnu: libopenshot: Update to 0.2.3. * gnu/packages/video.scm (libopenshot): Update to 0.2.3. --- gnu/packages/video.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8aedc1c2f5..27a9a423cc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3300,7 +3300,7 @@ create smoother and stable videos.") (define-public libopenshot (package (name "libopenshot") - (version "0.2.2") + (version "0.2.3") (source (origin (method git-fetch) (uri (git-reference @@ -3309,7 +3309,7 @@ create smoother and stable videos.") (file-name (git-file-name name version)) (sha256 (base32 - "1x4kv05pdq1pglb6y056aa7llc6iyibyhzg93k7zwj0q08cp5ixd")) + "0r1qmr8ar5n72603xkj9h065vbpznrqsq88kxxmn9n8djyyvk03k")) (modules '((guix build utils))) (snippet '(begin ;; Allow overriding of the python installation dir @@ -3318,9 +3318,7 @@ create smoother and stable videos.") (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")))) + #t)))) (build-system cmake-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From fc83a8913a04e8fdbe792664690ad81f0cbe3028 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Apr 2019 13:53:08 +0300 Subject: gnu: openshot: Update to 2.4.4. * gnu/packages/video.scm (openshot): Update to 2.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 27a9a423cc..cf11f0e01f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3362,7 +3362,7 @@ API. It includes bindings for Python, Ruby, and other languages.") (define-public openshot (package (name "openshot") - (version "2.4.3") + (version "2.4.4") (source (origin (method git-fetch) (uri (git-reference @@ -3371,7 +3371,7 @@ API. It includes bindings for Python, Ruby, and other languages.") (file-name (git-file-name name version)) (sha256 (base32 - "1qdw1mli4y9qhrnllnkaf6ydgw5vfvdb90chs4i679k0x0jyb9a2")))) + "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) -- cgit v1.2.3 From a512aa918168193249b8a277eab65e015d2dd9e3 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Apr 2019 13:54:15 +0300 Subject: gnu: openshot: Use wrap-qt-program. * gnu/packages/video.scm (openshot)[arguments]: Add more modules. Adjust custom 'wrap-program phase to use wrap-qt-program. --- gnu/packages/video.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cf11f0e01f..8bf13c192e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3383,6 +3383,11 @@ API. It includes bindings for Python, Ruby, and other languages.") ("qtsvg" ,qtsvg))) (arguments `(#:tests? #f ;no tests + #:modules ((guix build python-build-system) + (guix build qt-utils) + (guix build utils)) + #:imported-modules (,@%python-build-system-modules + (guix build qt-utils)) #:phases (modify-phases %standard-phases (delete 'build) ;install phase does all the work (add-before 'install 'set-tmp-home @@ -3392,12 +3397,10 @@ API. It includes bindings for Python, Ruby, and other languages.") (setenv "HOME" "/tmp") #t)) (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/openshot-qt") - `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") - "/lib/qt5/plugins/"))))))))) + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-qt-program out "openshot-qt")) + #t))))) (home-page "https://openshot.org") (synopsis "Video editor") (description "OpenShot takes your videos, photos, and music files and -- cgit v1.2.3 From 2afb79392d39df05e5b285ea46dd59eafb0616d8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 8 Apr 2019 19:55:07 +0300 Subject: openshot: Unbundle font. * gnu/packages/video.scm (openshot)[source]: Add snippet to remove bundled font. [inputs]: Add font-ubuntu. [arguments]: Add custom 'patch-font-location to patch the search path for the unbundled font. --- gnu/packages/video.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8bf13c192e..86076bfa40 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -91,6 +91,7 @@ #:use-module (gnu packages elf) #:use-module (gnu packages file) #:use-module (gnu packages flex) + #:use-module (gnu packages fonts) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) @@ -3371,10 +3372,15 @@ API. It includes bindings for Python, Ruby, and other languages.") (file-name (git-file-name name version)) (sha256 (base32 - "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba")))) + "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/images/fonts") #t)))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg) + ("font-ubuntu" ,font-ubuntu) ("libopenshot" ,libopenshot) ("python" ,python) ("python-pyqt" ,python-pyqt) @@ -3390,6 +3396,13 @@ API. It includes bindings for Python, Ruby, and other languages.") (guix build qt-utils)) #:phases (modify-phases %standard-phases (delete 'build) ;install phase does all the work + (add-after 'unpack 'patch-font-location + (lambda* (#:key inputs #:allow-other-keys) + (let ((font (assoc-ref inputs "font-ubuntu"))) + (substitute* "src/classes/app.py" + (("info.IMAGES_PATH") (string-append "\"" font "\"")) + (("fonts") "share/fonts/truetype"))) + #t)) (add-before 'install 'set-tmp-home (lambda _ ;; src/classes/info.py "needs" to create several -- cgit v1.2.3