summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-01-17 11:20:43 +0100
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:44:25 +0200
commit96f602b88c8a0d3d8412847358bb124df42daa9b (patch)
treea53d6287c5862a28e23ff31da60bc1fee1d9d023 /gnu
parent4748d947f70290ca17f61c694bf7a8c4eb446d24 (diff)
downloadguix-96f602b88c8a0d3d8412847358bb124df42daa9b.tar.gz
gnu: libvpx: Ungraft.
* gnu/packages/video.scm (libvpx)[replacement]: Remove.
[source](patches): Add “libvpx-CVE-2023-5217.patch”.
(libvpx/fixed): Remove.

Change-Id: I6de247a0fe7e8e09772513386cd0696bebe34afd
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/video.scm14
1 files changed, 2 insertions, 12 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index a10448fde9..4049328808 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -2907,7 +2907,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
@@ -2917,7 +2916,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"
@@ -2946,16 +2946,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"
-                                "libvpx-CVE-2023-44488.patch"))))))
-
 (define-public orfondl
   (package
     (name "orfondl")