From d1cbeb4fe7f97e08c1522b6d7e9d88c0e10f77e6 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Thu, 19 Oct 2017 16:26:45 +0200
Subject: [PATCH] Revert "openjpeg: Support building with openjpeg 2.3"

This reverts commit ef4d6b93e6078b7056c51a928f5620b13e55e323.

A better fix follows.

https://bugzilla.gnome.org/show_bug.cgi?id=788703
---
 configure.ac               |  5 -----
 ext/openjpeg/gstopenjpeg.h |  4 +---
 ext/openjpeg/meson.build   | 19 +++++++++----------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4aa55d7789..a54af0f09d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2874,11 +2874,6 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [
         AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_2, libopenjp2 >= 2.2)
         if test x"$HAVE_OPENJPEG_2_2" = x"yes"; then
           AC_DEFINE([HAVE_OPENJPEG_2_2], 1, [Define if OpenJPEG 2.2 is used])
-
-          AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_3, libopenjp2 >= 2.3 libopenjp2 < 2.4)
-          if test x"$HAVE_OPENJPEG_2_3" = x"yes"; then
-            AC_DEFINE([HAVE_OPENJPEG_2_3], 1, [Define if OpenJPEG 2.3 is used])
-          fi
         fi
     fi
   else
diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h
index 58c2866dcf..52410a4f7a 100644
--- a/ext/openjpeg/gstopenjpeg.h
+++ b/ext/openjpeg/gstopenjpeg.h
@@ -38,9 +38,7 @@
 #define OPJ_CPRL CPRL
 #else
 #include <stdio.h>
-# if defined(HAVE_OPENJPEG_2_3)
-#  include <openjpeg-2.3/openjpeg.h>
-# elif defined(HAVE_OPENJPEG_2_2)
+# if defined(HAVE_OPENJPEG_2_2)
 #  include <openjpeg-2.2/openjpeg.h>
 # elif defined(HAVE_OPENJPEG_2_1)
 #  include <openjpeg-2.1/openjpeg.h>
diff --git a/ext/openjpeg/meson.build b/ext/openjpeg/meson.build
index f2ed2e2fde..0d97ebb9ee 100644
--- a/ext/openjpeg/meson.build
+++ b/ext/openjpeg/meson.build
@@ -6,23 +6,22 @@ openjpeg_sources = [
 
 openjpeg_cargs = []
 
-max_supported_version = '<2.4'
-supported_versions = [ '2.3', '2.2', '2.1' ]
-foreach version: supported_versions
-  openjpeg_dep = dependency('libopenjp2', version : ['>=' + version, max_supported_version],
-      required : false)
+# Check for 2.2, 2.1, then 2.0
+openjpeg_dep = dependency('libopenjp2', version : '>=2.2', required : false)
+if openjpeg_dep.found()
+  openjpeg_cargs += ['-DHAVE_OPENJPEG_2_2', '-DHAVE_OPENJPEG_2_1']
+else
+  openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false)
   if openjpeg_dep.found()
-    openjpeg_cargs += ['-DHAVE_OPENJPEG_' + version.underscorify()]
-  endif
-endforeach
-
-if not openjpeg_dep.found()
+    openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1']
+  else
     openjpeg_dep = dependency('libopenjp2', required : false)
     # Fallback to 1.5
     if not openjpeg_dep.found()
       openjpeg_dep = dependency('libopenjpeg1', required : false)
       openjpeg_cargs += ['-DHAVE_OPENJPEG_1']
     endif
+  endif
 endif
 
 if openjpeg_dep.found()