From 8506fce04bb45ad90309829f1bbf06389fe19b3b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 22 Mar 2020 15:34:12 +0200 Subject: gnu: libcaca: Update license field. * gnu/packages/video.scm (libcaca)[license]: List as wtfpl2. --- 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 d18fe95b61..38e9d36307 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -750,7 +750,7 @@ (define-public libcaca pixels, so that it can work on older video cards or text terminals. It supports Unicode, 2048 colors, dithering of color images, and advanced text canvas operations.") - (license (license:fsf-free "file://COPYING")))) ;WTFPL version 2 + (license license:wtfpl2))) (define-public libdca (package -- cgit v1.2.3 From 4233e74b39635d5ef4dde204ecc26dcc894d9467 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 23 Mar 2020 18:15:01 +0100 Subject: gnu: youtube-dl: Add 'ffmpeg' as input. * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase wrap-executable. [inputs]: Add ffmpeg. Signed-off-by: Mathieu Othacehe --- gnu/packages/video.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 38e9d36307..3b64c435b7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -37,6 +37,7 @@ ;;; Copyright © 2019 Riku Viitanen ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020 Josh Holland +;;; Copyright © 2020 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -1671,7 +1672,17 @@ (define-public youtube-dl (string-append "'" prefix "/etc/")) (("'share/") (string-append "'" prefix "/share/"))) - #t)))))) + #t))) + (add-after 'install 'wrap-executable + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (ffmpeg (assoc-ref inputs "ffmpeg"))) + (wrap-program (string-append out "/bin/youtube-dl") + `("PATH" ":" prefix + ,(list (string-append ffmpeg "/bin"))))) + #t))))) + (inputs + `(("ffmpeg" ,ffmpeg))) (synopsis "Download videos from YouTube.com and other sites") (description "Youtube-dl is a small command-line program to download videos from -- cgit v1.2.3 From 7884fc434f5d4a11b1dd566553b83fae09c44fad Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Mon, 23 Mar 2020 18:15:02 +0100 Subject: gnu: youtube-dl: Add zsh completion. * gnu/packages/video.scm (youtube-dl)[arguments]: Add phase install-completion. Signed-off-by: Mathieu Othacehe --- gnu/packages/video.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 3b64c435b7..cb575a7375 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1673,6 +1673,15 @@ (define-public youtube-dl (("'share/") (string-append "'" prefix "/share/"))) #t))) + (add-after 'install 'install-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (zsh (string-append out + "/share/zsh/site-functions"))) + (mkdir-p zsh) + (copy-file "youtube-dl.zsh" + (string-append zsh "/_youtube-dl")) + #t))) (add-after 'install 'wrap-executable (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From acd595c2375c8a9134a376eb92dec694c8fada3c Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 23 Mar 2020 21:49:45 +0100 Subject: Revert "gnu: youtube-dl: Add 'ffmpeg' as input." This reverts commit 4233e74b39635d5ef4dde204ecc26dcc894d9467. --- gnu/packages/video.scm | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cb575a7375..a97d3302de 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1681,17 +1681,7 @@ (define-public youtube-dl (mkdir-p zsh) (copy-file "youtube-dl.zsh" (string-append zsh "/_youtube-dl")) - #t))) - (add-after 'install 'wrap-executable - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (ffmpeg (assoc-ref inputs "ffmpeg"))) - (wrap-program (string-append out "/bin/youtube-dl") - `("PATH" ":" prefix - ,(list (string-append ffmpeg "/bin"))))) - #t))))) - (inputs - `(("ffmpeg" ,ffmpeg))) + #t)))))) (synopsis "Download videos from YouTube.com and other sites") (description "Youtube-dl is a small command-line program to download videos from -- cgit v1.2.3 From b5a26299f7801502602265e21ed85f17c03dc34e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Mar 2020 11:58:44 +0200 Subject: gnu: youtube-viewer: Update to 3.7.5. * gnu/packages/video.scm (youtube-viewer): Update to 3.7.5. [inputs]: Add perl-json-xs. --- gnu/packages/video.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index a97d3302de..9d60bed682 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1827,7 +1827,7 @@ (define-public you-get (define-public youtube-viewer (package (name "youtube-viewer") - (version "3.7.4") + (version "3.7.5") (source (origin (method git-fetch) (uri (git-reference @@ -1836,7 +1836,7 @@ (define-public youtube-viewer (file-name (git-file-name name version)) (sha256 (base32 - "1plsm1sc04lwlg5h2gapxpykc3cpd4frjll14lamql89dm4a50vi")))) + "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f")))) (build-system perl-build-system) (native-inputs `(("perl-module-build" ,perl-module-build))) @@ -1845,6 +1845,7 @@ (define-public youtube-viewer ("perl-file-sharedir" ,perl-file-sharedir) ("perl-gtk2" ,perl-gtk2) ("perl-json" ,perl-json) + ("perl-json-xs" ,perl-json-xs) ("perl-libwww" ,perl-libwww) ("perl-lwp-protocol-https" ,perl-lwp-protocol-https) ("perl-lwp-useragent-cached" ,perl-lwp-useragent-cached) -- cgit v1.2.3 From 315b98b9eb71e1a56de6a49ffbfed0af3c92be7e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 26 Mar 2020 12:01:50 +0200 Subject: gnu: youtube-viewer: Don't build gtk3 front-end. * gnu/packages/video.scm (youtube-viewer)[arguments]: Update module-build-flags to only build gtk2 front-end. --- 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 9d60bed682..2ca8605a1a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1860,7 +1860,7 @@ (define-public youtube-viewer `(#:modules ((guix build perl-build-system) (guix build utils) (srfi srfi-26)) - #:module-build-flags '("--gtk") + #:module-build-flags '("--gtk2") #:phases (modify-phases %standard-phases (add-after 'unpack 'refer-to-inputs -- cgit v1.2.3