bf533178e9
The previous version was by mistake mixed up with the patch 'gst-plugins-bad: openjpeg: Remove compatibility with openjpeg 2.0' Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
90 lines
3.2 KiB
Diff
90 lines
3.2 KiB
Diff
From b08b3ad2c4ca27519b34229b7430af5cb73cc7ef Mon Sep 17 00:00:00 2001
|
|
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
|
|
Date: Thu, 19 Oct 2017 16:36:17 +0200
|
|
Subject: [PATCH] openjpeg: Support building with openjpeg 2.3, simpler
|
|
|
|
OpenJPEG 2.3 installs its headers to /usr/include/openjpeg-2.3. However,
|
|
since libopenjp2.pc seems to provide the right includedir CFLAGS at
|
|
least since version 2.1, instead of adding yet another version check,
|
|
just remove the subdir and the check for 2.2.
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=788703
|
|
|
|
Upstream: https://cgit.freedesktop.org/gstreamer/gst-plugins-bad/commit/?id=bff2d834a4a38f64e555cee3d0144fde6c515acd
|
|
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
|
---
|
|
configure.ac | 5 -----
|
|
ext/openjpeg/gstopenjpeg.h | 6 ++----
|
|
ext/openjpeg/meson.build | 20 +++++++-------------
|
|
3 files changed, 9 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 7a8d752..f9727ac 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -2815,11 +2815,6 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [openjpeg library], openjpeg, [
|
|
AG_GST_PKG_CHECK_MODULES(OPENJPEG_2_1, libopenjp2 >= 2.1)
|
|
if test x"$HAVE_OPENJPEG_2_1" = x"yes"; then
|
|
AC_DEFINE([HAVE_OPENJPEG_2_1], 1, [Define if OpenJPEG 2.1 is used])
|
|
- dnl include paths changed for v2.2
|
|
- 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])
|
|
- fi
|
|
fi
|
|
else
|
|
# Fallback to v1.5
|
|
diff --git a/ext/openjpeg/gstopenjpeg.h b/ext/openjpeg/gstopenjpeg.h
|
|
index 52410a4..f9ca74a 100644
|
|
--- a/ext/openjpeg/gstopenjpeg.h
|
|
+++ b/ext/openjpeg/gstopenjpeg.h
|
|
@@ -38,10 +38,8 @@
|
|
#define OPJ_CPRL CPRL
|
|
#else
|
|
#include <stdio.h>
|
|
-# if defined(HAVE_OPENJPEG_2_2)
|
|
-# include <openjpeg-2.2/openjpeg.h>
|
|
-# elif defined(HAVE_OPENJPEG_2_1)
|
|
-# include <openjpeg-2.1/openjpeg.h>
|
|
+# if defined(HAVE_OPENJPEG_2_1)
|
|
+# include <openjpeg.h>
|
|
# else
|
|
# include <openjpeg-2.0/openjpeg.h>
|
|
# endif
|
|
diff --git a/ext/openjpeg/meson.build b/ext/openjpeg/meson.build
|
|
index 0d97ebb..14b8583 100644
|
|
--- a/ext/openjpeg/meson.build
|
|
+++ b/ext/openjpeg/meson.build
|
|
@@ -6,21 +6,15 @@ openjpeg_sources = [
|
|
|
|
openjpeg_cargs = []
|
|
|
|
-# Check for 2.2, 2.1, then 2.0
|
|
-openjpeg_dep = dependency('libopenjp2', version : '>=2.2', required : false)
|
|
+# Check for 2.1, then 2.0, then 1.5
|
|
+openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false)
|
|
if openjpeg_dep.found()
|
|
- openjpeg_cargs += ['-DHAVE_OPENJPEG_2_2', '-DHAVE_OPENJPEG_2_1']
|
|
+ openjpeg_cargs += ['-DHAVE_OPENJPEG_2_1']
|
|
else
|
|
- openjpeg_dep = dependency('libopenjp2', version : '>=2.1', required : false)
|
|
- if 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
|
|
+ openjpeg_dep = dependency('libopenjp2', required : false)
|
|
+ if not openjpeg_dep.found()
|
|
+ openjpeg_dep = dependency('libopenjpeg1', required : false)
|
|
+ openjpeg_cargs += ['-DHAVE_OPENJPEG_1']
|
|
endif
|
|
endif
|
|
|
|
--
|
|
2.14.2
|
|
|