From 70020ebe2b2e9aaeeb8896db72c1af7d4142ac00 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 04:33:41 +0200 Subject: gnu: youtube-dl: Update to 2018.04.16. * gnu/packages/video.scm (youtube-dl): Update to 2018.04.16. --- 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 b4e7e6ad82..5284577420 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1160,7 +1160,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2018.03.14") + (version "2018.04.16") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1168,7 +1168,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "0j8j797gqc29fd5ra3cjvwkp8dgvigdydsj0zzjs05zccfqrj9lh")))) + "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3 From 3e34ba43cbc42e4bfe7d4dc2a321c60da8f7cdae Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 17 Apr 2018 04:34:09 +0200 Subject: gnu: you-get: Update to 0.4.1060. * gnu/packages/video.scm (you-get): Update to 0.4.1060. --- 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 5284577420..e959accf6a 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1278,7 +1278,7 @@ (define-public youtube-dl-gui (define-public you-get (package (name "you-get") - (version "0.4.1040") + (version "0.4.1060") (source (origin (method url-fetch) (uri (string-append @@ -1287,7 +1287,7 @@ (define-public you-get (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0257p9bn426rv0cjk2j5hsx6cg7dz5gpjwlqq0sy1axa47phis46")))) + "1pq7c2ay42aan7ykpmddzh6ylq0qsq8a27pk68m5imaxi6abbwsz")))) (build-system python-build-system) (inputs `(("ffmpeg" ,ffmpeg))) ; for multi-part and >=1080p videos -- cgit v1.2.3 From 06079c196c426cd84242c4e55b7227bcc5ecf290 Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Mon, 23 Apr 2018 08:07:10 +0200 Subject: gnu: ffmpeg: Update to 4.0. * gnu/packages/video.scm (ffmpeg): Update to 4.0. * gnu/packages/video.scm (ffmpeg@3.4): New variable. * gnu/packages/video.scm (ffmpeg-git): Remove variable. * gnu/packages/video.scm (mpv)[inputs]: Build with ffmpeg instead of ffmpeg-git. * gnu/packages/gstreamer.scm (gst-libav)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. * gnu/packages/messaging.scm (qtox)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. * gnu/packages/emulators.scm (dolphin-emu)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. * gnu/packages/gnunet.scm (libextractor)[inputs]: Build with ffmpeg@3.4 instead of ffmpeg. --- gnu/packages/emulators.scm | 2 +- gnu/packages/gnunet.scm | 2 +- gnu/packages/gstreamer.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/video.scm | 37 +++++++++++++++---------------------- 5 files changed, 19 insertions(+), 26 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 79947059bd..75b191c067 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -186,7 +186,7 @@ (define-public dolphin-emu ("bluez" ,bluez) ("curl" ,curl) ("eudev" ,eudev) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("font-wqy-microhei" ,font-wqy-microhei) ("freetype" ,freetype) ("glew" ,glew) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index b6062625c0..880fb9f09e 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -88,7 +88,7 @@ (define-public libextractor `(("exiv2" ,exiv2) ("bzip2" ,bzip2) ("flac" ,flac) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ;libmagic, for the MIME plug-in ("glib" ,glib) ("gstreamer" ,gstreamer) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 6747c388d5..4eef9e741d 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -403,7 +403,7 @@ (define-public gst-libav ("python" ,python))) (inputs `(("gst-plugins-base" ,gst-plugins-base) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("orc" ,orc) ("zlib" ,zlib))) (home-page "https://gstreamer.freedesktop.org/") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2b3284ba6f..237a315239 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -913,7 +913,7 @@ (define-public qtox ,(list (string-append (assoc-ref inputs "qtsvg") "/lib/qt5/plugins/")))))))))) (inputs - `(("ffmpeg" ,ffmpeg) + `(("ffmpeg" ,ffmpeg-3.4) ("filteraudio" ,filteraudio) ("glib" ,glib) ("gtk+" ,gtk+-2) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e959accf6a..1966d44dfd 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -597,14 +597,14 @@ (define-public libva (define-public ffmpeg (package (name "ffmpeg") - (version "3.4.2") + (version "4.0") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) (sha256 (base32 - "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))) + "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d")))) (build-system gnu-build-system) (inputs `(("fontconfig" ,fontconfig) @@ -770,6 +770,18 @@ (define-public ffmpeg audio/video codec library.") (license license:gpl2+))) +(define-public ffmpeg-3.4 + (package + (inherit ffmpeg) + (version "3.4.2") + (source (origin + (method url-fetch) + (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" + version ".tar.xz")) + (sha256 + (base32 + "0h6prjn1ijkzzhkyj8mazp0wpx7m0n9ycadjxagf9czqirbyk4ib")))))) + (define-public ffmpeg-2.8 (package (inherit ffmpeg) @@ -790,25 +802,6 @@ (define-public ffmpeg-2.8 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") @@ -1032,7 +1025,7 @@ (define-public mpv (inputs `(("alsa-lib" ,alsa-lib) ("enca" ,enca) - ("ffmpeg" ,ffmpeg-git) + ("ffmpeg" ,ffmpeg) ("jack" ,jack-1) ("ladspa" ,ladspa) ("lcms" ,lcms) -- cgit v1.2.3 From bb5c508c12db269017cec41350f30ac1e3edd644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 23 Apr 2018 18:18:41 +0200 Subject: gnu: Use ffmpeg@3.4 in packages not ready for 4.0. * gnu/packages/cdrom.scm (dvdstyler)[inputs]: Change FFMPEG with FFMPEG-3.4. * gnu/packages/video.scm (mlt, motion, simplescreenrecorder)[inputs]: Likewise. * gnu/packages/music.scm (moc, pianobar)[inputs]: Likewise. --- gnu/packages/cdrom.scm | 2 +- gnu/packages/music.scm | 4 ++-- gnu/packages/video.scm | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index 3d35ff51f4..5f9117c637 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -392,7 +392,7 @@ (define-public dvdstyler ("fontconfig" ,fontconfig) ("libexif" ,libexif) ("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config) ("flex" ,flex) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index aea7395d41..c27055e0c1 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2391,7 +2391,7 @@ (define-public pianobar ("curl" ,curl) ("libgcrypt" ,libgcrypt) ("json-c" ,json-c) - ("ffmpeg" ,ffmpeg))) + ("ffmpeg" ,ffmpeg-3.4))) (native-inputs `(("pkg-config" ,pkg-config))) (home-page "http://6xq.net/projects/pianobar/") @@ -2792,7 +2792,7 @@ (define-public moc `(("alsa-lib" ,alsa-lib) ("curl" ,curl) ("faad2" ,faad2) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ("jack" ,jack-1) ("libid3tag" ,libid3tag) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 1966d44dfd..dc5a375664 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1847,7 +1847,7 @@ (define-public mlt #t))))) (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("fftw" ,fftw) ("libxml2" ,libxml2) ("jack" ,jack-1) @@ -2082,7 +2082,7 @@ (define-public simplescreenrecorder ;; As a result, they are omitted. Please add them back if problems appear. (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("glu" ,glu) ("jack" ,jack-1) ("libxi" ,libxi) @@ -2794,7 +2794,7 @@ (define-public motion ("pkg-config" ,pkg-config))) (inputs `(("libjpeg" ,libjpeg) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("sqlite" ,sqlite))) (arguments '(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From fe355a1f8df476eabbc7718d8b420e3e524a099a Mon Sep 17 00:00:00 2001 From: Rutger Helling Date: Wed, 25 Apr 2018 11:41:17 +0200 Subject: gnu: youtube-dl: Update to 2018.04.25. * gnu/packages/video.scm (youtube-dl): Update to 2018.04.25. --- 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 dc5a375664..7c2e20527f 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1153,7 +1153,7 @@ (define-public libvpx (define-public youtube-dl (package (name "youtube-dl") - (version "2018.04.16") + (version "2018.04.25") (source (origin (method url-fetch) (uri (string-append "https://yt-dl.org/downloads/" @@ -1161,7 +1161,7 @@ (define-public youtube-dl version ".tar.gz")) (sha256 (base32 - "046zg8pww2xg1yibh7c1a8jcg8f1znr4hsz1l1da03djcp6na99d")))) + "17zxgwfcy7c6gdyxdgh02f5zi52gvmy0zpccfj6zjkhw5iqj1vbw")))) (build-system python-build-system) (arguments ;; The problem here is that the directory for the man page and completion -- cgit v1.2.3