From 3f697ff2e8b44941749ce54ca9dfbe0cc388a764 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 5 Oct 2017 20:23:06 +0200
Subject: gnu: openjpeg: Update to 2.3.0.

* gnu/packages/patches/openjpeg-CVE-2017-12982.patch,
gnu/packages/patches/openjpeg-CVE-2017-14040.patch,
gnu/packages/patches/openjpeg-CVE-2017-14041.patch,
gnu/packages/patches/openjpeg-CVE-2017-14151.patch,
gnu/packages/patches/openjpeg-CVE-2017-14152.patch,
gnu/packages/patches/openjpeg-CVE-2017-14164.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/image.scm (openjpeg): Update to 2.3.0.
[source](patches): Remove.
* gnu/packages/gstreamer.scm (gst-plugins-bad)[arguments]: Adjust openjpeg
substitution.
---
 gnu/packages/gstreamer.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gstreamer.scm')

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index bc8f75ba12..c308dc9f34 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -280,10 +280,10 @@ developers consider to have good quality code and correct functionality.")
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-openjpeg-reference
            (lambda _
-             ;; Remove hard-coded openjpeg-2.1 path. 2.2 is API- and
+             ;; Remove hard-coded openjpeg-2.2 path. 2.3 is API- and
              ;; ABI-compatible.
              (substitute* "ext/openjpeg/gstopenjpeg.h"
-               (("<openjpeg-2\\.1/") "<openjpeg-2.2/"))
+               (("<openjpeg-2\\.2/") "<openjpeg-2.3/"))
              #t)))))
     (propagated-inputs
      `(("gst-plugins-base" ,gst-plugins-base)))
-- 
cgit v1.2.3