From 2a222b7a22e2dcd17ba24dcb84abb96d9ff4b715 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Dec 2017 16:11:12 +0100 Subject: gnu: youtube-dl: Update to 2017.12.23. * gnu/packages/video.scm (youtube-dl): Update to 2017.12.23. --- 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 28ef48844c..c2b7a68e93 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1129,7 +1129,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2017.12.14") + (version "2017.12.23") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1137,7 +1137,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "01hvsch7ybff0amivl86m6klz156bm3hfh66zz5q8ha2af5j44hj")))) + "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit 1.4.1 From 86178675402f9dc05aefc424511d96cbe3d50c09 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Dec 2017 19:28:52 +0100 Subject: gnu: you-get: Update to 0.4.1011. * gnu/packages/video.scm (you-get): Update to 0.4.1011. --- 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 c2b7a68e93..094ee2770b 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1246,7 +1246,7 @@ other site that youtube-dl supports.") (define-public you-get (package (name "you-get") - (version "0.4.995") + (version "0.4.1011") (source (origin (method url-fetch) (uri (string-append @@ -1255,7 +1255,7 @@ other site that youtube-dl supports.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0i89mn8v8znn3csgzfg8dz5vcn3ld66xj02az6137bljhgivjxra")))) + "0cdbh5w0chw3dlrwizm91l6sgkkzy7p6h0072dai4xbw5zgld31k")))) (build-system python-build-system) (arguments '(#:tests? #f)) ; no tests -- cgit 1.4.1 From 817e91bca91079afa27e1ae2686f0989b530ae7d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Dec 2017 19:43:44 +0100 Subject: gnu: you-get: Fix typo in synopsis. * gnu/packages/video.scm (you-get)[synopsis]: Fix typo. --- 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 094ee2770b..40606d862c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1261,7 +1261,7 @@ other site that youtube-dl supports.") '(#:tests? #f)) ; no tests (inputs `(("ffmpeg" ,ffmpeg))) - (synopsis "Download videos, audios, or images from Web sites") + (synopsis "Download videos, audio, or images from Web sites") (description "You-Get is a command-line utility to download media contents (videos, audio, images) from the Web. It can use either mpv or vlc for playback.") -- cgit 1.4.1 From 5e84eab06b987d2edf8205e54faee1fa93dcd01a Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 23 Dec 2017 21:18:46 +0100 Subject: gnu: you-get: Explicitly invoke input ffmpeg. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ‘ffmpeg’ input was never actually used. * gnu/packages/video.scm (you-get)[arguments]: Add ‘qualify-input-references’ phase. --- gnu/packages/video.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 40606d862c..42abe30fba 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1257,10 +1257,24 @@ other site that youtube-dl supports.") (base32 "0cdbh5w0chw3dlrwizm91l6sgkkzy7p6h0072dai4xbw5zgld31k")))) (build-system python-build-system) - (arguments - '(#:tests? #f)) ; no tests (inputs - `(("ffmpeg" ,ffmpeg))) + `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'qualify-input-references + ;; Explicitly invoke the input ffmpeg, instead of whichever one + ;; happens to be in the user's $PATH at run time. + (lambda* (#:key inputs #:allow-other-keys) + (let ((ffmpeg (string-append (assoc-ref inputs "ffmpeg") + "/bin/ffmpeg"))) + (substitute* "src/you_get/processor/ffmpeg.py" + ;; Don't blindly replace all occurrences of ‘'ffmpeg'’: the + ;; same string is also used when sniffing ffmpeg's output. + (("(FFMPEG == |\\()'ffmpeg'" _ prefix) + (string-append prefix "'" ffmpeg "'"))) + #t)))) + #:tests? #f)) ; XXX some tests need Internet access (synopsis "Download videos, audio, or images from Web sites") (description "You-Get is a command-line utility to download media contents (videos, -- cgit 1.4.1 From dff543e889d3e1793809ef6d5d1af8bb155590aa Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 27 Dec 2017 10:42:29 +0100 Subject: gnu: Add ffmpeg-git. * gnu/packages/video.scm (ffmpeg-git): New variable. --- gnu/packages/video.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 42abe30fba..95739a2fcf 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -782,6 +782,25 @@ audio/video codec library.") flag)) ,flags)))))) +;; Annoyingly enough, the latest mpv release does not build with the stable +;; release of ffmpeg. Use a git commit until the situation is fixed. +(define-public ffmpeg-git + (let ((commit "3f887440677328c9cfed97ad81d14051ffa32aae") + (revision "1")) + (package + (inherit ffmpeg) + (name "ffmpeg-git") + (version (string-append "3.4-" revision "." (string-take commit 9))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FFmpeg/FFmpeg.git") + (commit commit))) + (file-name (string-append name "-" version "-checkout")) + (sha256 + (base32 + "1b7n3g4m2rbvrwsgbfl8wl91z42g1ld42clwxs8qpl9ny5rwz6sq"))))))) + (define-public vlc (package (name "vlc") -- cgit 1.4.1 From abc5ef5a7f7fecb99ca8213c0962f42cc1a65552 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 27 Dec 2017 10:46:26 +0100 Subject: gnu: mpv: Update to 0.28.0. * gnu/packages/video.scm (mpv): Update to 0.28.0. [inputs]: Change ffmpeg to ffmpeg-git, add wayland-protocols. --- gnu/packages/video.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 95739a2fcf..4f5466d386 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1005,7 +1005,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (define-public mpv (package (name "mpv") - (version "0.27.0") + (version "0.28.0") (source (origin (method url-fetch) (uri (string-append @@ -1013,7 +1013,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ".tar.gz")) (sha256 (base32 - "1754371fkva8aqxgbm50jxyvij7mnysq0538bf6zghbmigqqn79l")) + "1d2p6k3y9lqx8bpdal4grrj8ljy7pvd8qgdq8004fmr38afmbb7f")) (file-name (string-append name "-" version ".tar.gz")))) (build-system waf-build-system) (native-inputs @@ -1024,7 +1024,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") (inputs `(("alsa-lib" ,alsa-lib) ("enca" ,enca) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-git) ("jack" ,jack-1) ("ladspa" ,ladspa) ("lcms" ,lcms) @@ -1053,6 +1053,7 @@ SVCD, DVD, 3ivx, DivX 3/4/5, WMV and H.264 movies.") ("rsound" ,rsound) ("waf" ,python-waf) ("wayland" ,wayland) + ("wayland-protocols" ,wayland-protocols) ("libxkbcommon", libxkbcommon) ("youtube-dl" ,youtube-dl) ("zlib" ,zlib))) -- cgit 1.4.1 From 615d14768c67e29a385d0ef5f3556386bf9fbd04 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Dec 2017 08:35:28 +0200 Subject: gnu: mlt: Add ffmpeg support. * gnu/packages/video.scm (mlt)[inputs]: Add ffmpeg. --- 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 4f5466d386..e659d78900 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1749,6 +1749,7 @@ from various services and pipes them into a video playing application.") #t))))) (inputs `(("alsa-lib" ,alsa-lib) + ("ffmpeg" ,ffmpeg) ("fftw" ,fftw) ("libxml2" ,libxml2) ("jack" ,jack-1) -- cgit 1.4.1 From 42b9541c5b04d17c1b240f6d3c726e1c0c267a3f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 28 Dec 2017 08:36:15 +0200 Subject: gnu: mlt: Fix license. mlt is built with '--enable-gpl3', so the license is gpl3. * gnu/packages/video.scm (mlt)[license]: Change license to gpl3. --- 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 e659d78900..8cd7c149e0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1768,7 +1768,7 @@ broadcasting. It provides a toolkit for broadcasters, video editors, media players, transcoders, web streamers and many more types of applications. The functionality of the system is provided via an assortment of ready to use tools, XML authoring components, and an extensible plug-in based API.") - (license license:lgpl2.1+))) + (license license:gpl3))) (define-public v4l-utils (package -- cgit 1.4.1 From 50d22ef15dff5a6b20a57d2cf19000f4263a2656 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 Dec 2017 11:56:00 +0000 Subject: gnu: youtube-dl: Update to 2017.12.28. * gnu/packages/video.scm (youtube-dl): Update to 2017.12.28. --- 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 8cd7c149e0..b98173d74f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1149,7 +1149,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2017.12.23") + (version "2017.12.28") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1157,7 +1157,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "12m1bjdqm9bsc1f5psnzc203avzwr070xpdr6fqr728am536q845")))) + "1qj81b41dzcb0221q7aczskj9cb99z3s24kh84sbmsqvj8s14dkf")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit 1.4.1 From acd7bf4b5ee0a4c4148adb3058e8b947b794063b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 30 Dec 2017 17:27:41 +0000 Subject: gnu: youtube-dl: Update to 2017.12.31. * gnu/packages/video.scm (youtube-dl): Update to 2017.12.31. --- 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 b98173d74f..d9718e84f0 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1149,7 +1149,7 @@ access to mpv's powerful playback capabilities.") (define-public youtube-dl (package (name "youtube-dl") - (version "2017.12.28") + (version "2017.12.31") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1157,7 +1157,7 @@ access to mpv's powerful playback capabilities.") version ".tar.gz")) (sha256 (base32 - "1qj81b41dzcb0221q7aczskj9cb99z3s24kh84sbmsqvj8s14dkf")))) + "0cq10ii96lpq3z7l1js0s59sqb4h4yqwdqinl2yf7cdjynvj62xi")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit 1.4.1