From 037d59136763c03243e76ebe5d6e40bed6653333 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 9 Feb 2019 17:15:13 +0100 Subject: gnu: libvpx: Update to 1.8.0. * gnu/packages/patches/gst-plugins-good-libvpx-compat.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/video.scm (libvpx): Update to 1.8.0. [source](patches): Remove obsolete patch. (libvpx-1.7): New public variable. * gnu/packages/gnuzilla.scm (icecat)[inputs]: Use LIBVPX-1.7 instead of LIBVPX. * gnu/packages/gstreamer.scm (gst-plugins-good)[source](patches): New field. [arguments]: Add #:make-flags. --- gnu/packages/video.scm | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'gnu/packages/video.scm') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f98b6e796c..c0f439ea93 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -23,7 +23,7 @@ ;;; Copyright © 2017 Gregor Giesen ;;; Copyright © 2017, 2018, 2019 Rutger Helling ;;; Copyright © 2018 Roel Janssen -;;; Copyright © 2018 Marius Bakke +;;; Copyright © 2018, 2019 Marius Bakke ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Brendan Tildesley @@ -1301,7 +1301,7 @@ access to mpv's powerful playback capabilities.") (define-public libvpx (package (name "libvpx") - (version "1.7.0") + (version "1.8.0") (source (origin ;; XXX: Upstream does not provide tarballs for > 1.6.1. (method git-fetch) @@ -1311,9 +1311,8 @@ access to mpv's powerful playback capabilities.") (file-name (git-file-name name version)) (sha256 (base32 - "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) - (patches (search-patches "libvpx-use-after-free-in-postproc.patch" - "libvpx-CVE-2016-2818.patch")))) + "079pb80am08lj8y5rx99vdr99mdqis9067f172zq12alkz849n93")) + (patches (search-patches "libvpx-CVE-2016-2818.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--enable-shared" @@ -1338,6 +1337,25 @@ access to mpv's powerful playback capabilities.") (license license:bsd-3) (home-page "https://www.webmproject.org/"))) +;; GNU IceCat fails to build against 1.8.0, so keep this version for now. +(define-public libvpx-1.7 + (package + (inherit libvpx) + (version "1.7.0") + (source (origin + (inherit (package-source libvpx)) + (uri (git-reference + (url "https://chromium.googlesource.com/webm/libvpx") + (commit (string-append "v" version)))) + (file-name (git-file-name "libvpx" version)) + (sha256 + (base32 + "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6")) + (patches + (append + (origin-patches (package-source libvpx)) + (search-patches "libvpx-use-after-free-in-postproc.patch"))))))) + (define-public youtube-dl (package (name "youtube-dl") -- cgit v1.2.3