File gstpb-support-openjpeg-2.3.patch of Package gstreamer-plugins-bad

Overview Repositories Revisions Requests Users Attributes Meta

File gstpb-support-openjpeg-2.3.patch of Package gstreamer-plugins-bad (Revision ba37f4a471e1b2d4bef5f88f702f8cdd)

Currently displaying revision ba37f4a471e1b2d4bef5f88f702f8cdd , Show latest

From bff2d834a4a38f64e555cee3d0144fde6c515acd 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
---
 configure.ac               |  5 -----
 ext/openjpeg/gstopenjpeg.h |  6 ++----
 ext/openjpeg/meson.build   | 20 +++++++-------------
 3 files changed, 9 insertions(+), 22 deletions(-)

Index: gst-plugins-bad-1.12.3/configure.ac
===================================================================
--- gst-plugins-bad-1.12.3.orig/configure.ac
+++ gst-plugins-bad-1.12.3/configure.ac
@@ -2815,11 +2815,6 @@ AG_GST_CHECK_FEATURE(OPENJPEG, [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
Index: gst-plugins-bad-1.12.3/ext/openjpeg/gstopenjpeg.h
===================================================================
--- gst-plugins-bad-1.12.3.orig/ext/openjpeg/gstopenjpeg.h
+++ gst-plugins-bad-1.12.3/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
Index: gst-plugins-bad-1.12.3/ext/openjpeg/meson.build
===================================================================
--- gst-plugins-bad-1.12.3.orig/ext/openjpeg/meson.build
+++ gst-plugins-bad-1.12.3/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

Places

File gstpb-support-openjpeg-2.3.patch of Package gstreamer-plugins-bad (Revision ba37f4a471e1b2d4bef5f88f702f8cdd)

Places