Hello community,
here is the log from the commit of package gstreamer-plugins-bad for
openSUSE:Factory checked in at 2017-11-03 16:32:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old)
and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-bad"
Fri Nov 3 16:32:28 2017 rev:66 rq:537062 version:1.12.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes
2017-09-29 11:53:46.768397881 +0200
+++
/work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new/gstreamer-plugins-bad.changes
2017-11-03 16:33:17.801765167 +0100
@@ -1,0 +2,8 @@
+Fri Oct 27 09:43:39 UTC 2017 - [email protected]
+
+- Add gstpb-support-openjpeg-2.3.patch: fix build with openjpeg 2.3
+ (bgo#788703).
+- Add autoconf, automake and libtool BuildRequires and call
+ autoreconf, since above patch touches the build system.
+
+-------------------------------------------------------------------
New:
----
gstpb-support-openjpeg-2.3.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gstreamer-plugins-bad.spec ++++++
--- /var/tmp/diff_new_pack.fGZ1DW/_old 2017-11-03 16:33:18.669733574 +0100
+++ /var/tmp/diff_new_pack.fGZ1DW/_new 2017-11-03 16:33:18.673733428 +0100
@@ -33,7 +33,11 @@
Source:
https://gstreamer.freedesktop.org/src/gst-plugins-bad/%{_name}-%{version}.tar.xz
Source2: gstreamer-plugins-bad.appdata.xml
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM gstpb-support-openjpeg-2.3.patch bgo#788703
[email protected] -- Fix build with openjpeg 2.3
+Patch1: gstpb-support-openjpeg-2.3.patch
BuildRequires: Mesa-libGLESv3-devel
+BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: gtk-doc
@@ -42,6 +46,7 @@
BuildRequires: libgsm-devel
BuildRequires: libjasper-devel
BuildRequires: libmpcdec-devel
+BuildRequires: libtool
BuildRequires: orc >= 0.4.11
BuildRequires: python-base
BuildRequires: pkgconfig(OpenEXR)
@@ -394,8 +399,11 @@
%prep
%setup -q -n %{_name}-%{version}
+%patch1 -p1
%build
+# patch1 modifies configure.ac
+autoreconf -fi
%configure \
%if ! 0%{?BUILD_ORIG}
--with-package-name='openSUSE GStreamer-plugins-bad package' \
++++++ gstpb-support-openjpeg-2.3.patch ++++++
>From bff2d834a4a38f64e555cee3d0144fde6c515acd Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <[email protected]>
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
