05/06: gnu: libvpx: Ungraft.

[guix-commits]

civodul pushed a commit to branch core-updates
in repository guix.

commit 24be2119d2fb6787988a9a87cfd4a92695219428
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed Jan 17 11:20:43 2024 +0100

    gnu: libvpx: Ungraft.
    
    * gnu/packages/video.scm (libvpx)[replacement]: Remove.
    [source](patches): Add “libvpx-CVE-2023-5217.patch”.
    (libvpx/fixed): Remove.
    
    Change-Id: I6de247a0fe7e8e09772513386cd0696bebe34afd
---
 gnu/packages/video.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a17fbdb8b2..e17b2df24d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2810,7 +2810,6 @@ To load this plugin, specify the following option when 
starting mpv:
   (package
     (name "libvpx")
     (version "1.12.0")
-    (replacement libvpx/fixed)
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2820,7 +2819,8 @@ To load this plugin, specify the following option when 
starting mpv:
               (sha256
                (base32
                 "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))
-              (patches (search-patches "libvpx-CVE-2016-2818.patch"))))
+              (patches (search-patches "libvpx-CVE-2016-2818.patch"
+                                       "libvpx-CVE-2023-5217.patch"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags (list "--enable-shared"
@@ -2849,15 +2849,6 @@ To load this plugin, specify the following option when 
starting mpv:
     (license license:bsd-3)
     (home-page "https://www.webmproject.org/";)))
 
-(define libvpx/fixed
-  (package
-    (inherit libvpx)
-    (source
-     (origin
-       (inherit (package-source libvpx))
-       (patches (search-patches "libvpx-CVE-2016-2818.patch"
-                                "libvpx-CVE-2023-5217.patch"))))))
-
 (define-public orf-dl
   (let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999")
         (revision "1"))