From b51a37b1164824b1a510c079fb1a50747f27d72c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Apr 2020 10:11:35 +0300 Subject: gnu: mpv-mpris: Update to 0.4. * gnu/packages/video.scm (mpv-mpris): Update to 0.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 032604ecf3..5a6a061459 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1538,7 +1538,7 @@ (define-public gnome-mpv (define-public mpv-mpris (package (name "mpv-mpris") - (version "0.2") + (version "0.4") (source (origin (method git-fetch) @@ -1548,7 +1548,7 @@ (define-public mpv-mpris (file-name (git-file-name name version)) (sha256 (base32 - "06hq3j1jjlaaz9ss5l7illxz8vm5bng86jl24kawglwkqayhdnjx")))) + "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i")))) (build-system gnu-build-system) (arguments '(#:tests? #f ; no tests -- cgit v1.2.3 From 2a844af991a301052045bdc5f3bcc0f779185079 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Apr 2020 10:17:47 +0300 Subject: gnu: mpv-mpris: Switch to copy-build-system. * gnu/packages/video.scm (mpv-mpris)[build-system]: Switch to copy-build-system. [arguments]: Add custom 'build phase before 'install phase. --- gnu/packages/video.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5a6a061459..03796fd770 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -65,6 +65,7 @@ (define-module (gnu packages video) #:use-module (guix git-download) #:use-module (guix svn-download) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system meson) @@ -1549,18 +1550,16 @@ (define-public mpv-mpris (sha256 (base32 "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i")))) - (build-system gnu-build-system) + (build-system copy-build-system) (arguments - '(#:tests? #f ; no tests - #:make-flags '("CC=gcc") + '(#:install-plan + '(("mpris.so" "lib/")) #:phases (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (install-file "mpris.so" (string-append out "/lib"))) - #t))))) + (add-before 'install 'build + (lambda _ + (setenv "CC" (which "gcc")) + (invoke "make")))))) (native-inputs `(("pkg-config" ,pkg-config))) (inputs -- cgit v1.2.3 From 3f3daa1cc1c8be4c46da28c9268dbdf9c80f950a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 1 Apr 2020 17:10:50 +0200 Subject: gnu: openshot: Fix ‘color shift.png’ file name. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (openshot)[source]: Rename it to ‘colorshift.png’ in the snippet. Reported by . --- gnu/packages/video.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 03796fd770..88e7aeadde 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3668,6 +3668,10 @@ (define-public openshot (modules '((guix build utils))) (snippet '(begin + ;; Manually apply upstream's a5cef5b09668513af8f898e2402377ebd58a64cc + ;; fix. See . + (rename-file "src/effects/icons/color shift.png" + "src/effects/icons/colorshift.png") (delete-file-recursively "src/images/fonts") #t)))) (build-system python-build-system) (inputs -- cgit v1.2.3 From 5020a263921c02c957d880867f56d1287e8cb0f8 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Apr 2020 22:15:22 +0300 Subject: gnu: openshot: Upgrade to 2.5.1. * gnu/packages/video.scm (openshot): Update to 2.5.1. [source]: Add note about bundled libraries. Remove upstream rename workaround. [home-page]: Update to new home-page. --- gnu/packages/video.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 88e7aeadde..fcd9c9aca8 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3655,7 +3655,7 @@ (define-public libopenshot (define-public openshot (package (name "openshot") - (version "2.4.4") + (version "2.5.1") (source (origin (method git-fetch) (uri (git-reference @@ -3664,14 +3664,11 @@ (define-public openshot (file-name (git-file-name name version)) (sha256 (base32 - "0mg63v36h7l8kv2sgf6x8c1n3ygddkqqwlciz7ccxpbm4x1idqba")) + "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq")) (modules '((guix build utils))) (snippet '(begin - ;; Manually apply upstream's a5cef5b09668513af8f898e2402377ebd58a64cc - ;; fix. See . - (rename-file "src/effects/icons/color shift.png" - "src/effects/icons/colorshift.png") + ;; TODO: Unbundle jquery and others from src/timeline/media (delete-file-recursively "src/images/fonts") #t)))) (build-system python-build-system) (inputs @@ -3710,7 +3707,7 @@ (define-public openshot (let ((out (assoc-ref outputs "out"))) (wrap-qt-program out "openshot-qt")) #t))))) - (home-page "https://openshot.org") + (home-page "https://www.openshot.org/") (synopsis "Video editor") (description "OpenShot takes your videos, photos, and music files and helps you create the film you have always dreamed of. Easily add sub-titles, -- cgit v1.2.3 From e7228f0cfaf7b09f895111886a4df6aa53812ecd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 1 Apr 2020 22:15:50 +0300 Subject: gnu: openshot: Enable tests. * gnu/packages/video.scm (openshot)[arguments]: Add custom 'check phase. --- gnu/packages/video.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index fcd9c9aca8..c62e651612 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3681,14 +3681,17 @@ (define-public openshot ("python-requests" ,python-requests) ("qtsvg" ,qtsvg))) (arguments - `(#:tests? #f ;no tests - #:modules ((guix build python-build-system) + `(#: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 + (replace 'check + (lambda _ + (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-ubuntu"))) -- cgit v1.2.3 From 2f0952616535c8bbd2bdeff24a9fd33e72f72c96 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Sun, 5 Apr 2020 13:48:27 +0200 Subject: gnu: aegisub: Make some inputs native. * gnu/packages/video.scm (aegisub)[inputs]: Move desktop-files-utils from here... [native-inputs]: ...to here. Signed-off-by: Danny Milosavljevic --- 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 c62e651612..83cce1753e 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -38,6 +38,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Josh Holland ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2020 Vincent Legoll ;;; ;;; This file is part of GNU Guix. ;;; @@ -3277,7 +3278,6 @@ (define-public aegisub #t))))) (inputs `(("boost" ,boost) - ("desktop-file-utils" ,desktop-file-utils) ("ffms2" ,ffms2) ("fftw" ,fftw) ("hunspell" ,hunspell) @@ -3290,6 +3290,7 @@ (define-public aegisub ("wxwidgets-gtk2" ,wxwidgets-gtk2))) (native-inputs `(("intltool" ,intltool) + ("desktop-file-utils" ,desktop-file-utils) ("pkg-config" ,pkg-config))) (home-page "http://www.aegisub.org/") (synopsis "Subtitle engine") -- cgit v1.2.3