Hello community, here is the log from the commit of package gstreamer-plugins-bad for openSUSE:Factory checked in at 2019-10-14 14:52:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gstreamer-plugins-bad (Old) and /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gstreamer-plugins-bad" Mon Oct 14 14:52:20 2019 rev:97 rq:737390 version:1.16.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gstreamer-plugins-bad/gstreamer-plugins-bad.changes 2019-10-10 11:48:15.240147916 +0200 +++ /work/SRC/openSUSE:Factory/.gstreamer-plugins-bad.new.2352/gstreamer-plugins-bad.changes 2019-10-14 14:52:21.570315504 +0200 @@ -1,0 +2,8 @@ +Thu Oct 10 14:39:23 UTC 2019 - Stefan BrĂ¼ns <stefan.bru...@rwth-aachen.de> + +- Fix compilation with OpenEXR 2.4.0 + + 0001-Require-OpenEXR-2.3.0-at-least-and-do-not-force-C-98.patch + + Readd libtool and autoreconf call +- Remove Leap 42.x support from spec file + +------------------------------------------------------------------- New: ---- 0001-Require-OpenEXR-2.3.0-at-least-and-do-not-force-C-98.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gstreamer-plugins-bad.spec ++++++ --- /var/tmp/diff_new_pack.hBlISN/_old 2019-10-14 14:52:22.498313083 +0200 +++ /var/tmp/diff_new_pack.hBlISN/_new 2019-10-14 14:52:22.498313083 +0200 @@ -34,12 +34,19 @@ Summary: GStreamer Streaming-Media Framework Plug-Ins License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Multimedia/Other -Url: http://gstreamer.freedesktop.org/ +Url: https://gstreamer.freedesktop.org/ 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 -- do not force C++98 for OpenEXR +Patch0: 0001-Require-OpenEXR-2.3.0-at-least-and-do-not-force-C-98.patch BuildRequires: Mesa-libGLESv3-devel +%if !%{use_meson} +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +%endif BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gobject-introspection-devel @@ -55,7 +62,11 @@ BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: python3-xml -BuildRequires: pkgconfig(OpenEXR) +%if %{suse_version} >= 1550 +BuildRequires: pkgconfig(OpenEXR) >= 2.3.0 +%else +BuildRequires: pkgconfig(OpenEXR) <= 2.3.0 +%endif BuildRequires: pkgconfig(aom) BuildRequires: pkgconfig(bluez) BuildRequires: pkgconfig(bzip2) @@ -453,7 +464,10 @@ %lang_package %prep -%autosetup -p1 -n %{_name}-%{version} +%setup -n %{_name}-%{version} +%if %{suse_version} >= 1550 +%patch0 -p1 +%endif %build export PYTHON=%{_bindir}/python3 @@ -505,6 +519,7 @@ %{nil} %{meson_build} %else +autoreconf -vfi %configure \ %if ! 0%{?BUILD_ORIG} --with-package-name='openSUSE GStreamer-plugins-bad package' \ @@ -553,14 +568,6 @@ %find_lang %{_name}-%{gst_branch} %fdupes %{buildroot}%{_datadir}/gtk-doc/html/ -%if 0%{?suse_version} < 1330 -%post -%glib2_gsettings_schema_post - -%postun -%glib2_gsettings_schema_postun -%endif - %post -n libgstadaptivedemux-1_0-0 -p /sbin/ldconfig %postun -n libgstadaptivedemux-1_0-0 -p /sbin/ldconfig ++++++ 0001-Require-OpenEXR-2.3.0-at-least-and-do-not-force-C-98.patch ++++++ >From e85c4be4565d59bb0a64a7cc2abbdb95be0982d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Thu, 10 Oct 2019 16:38:37 +0200 Subject: [PATCH] Require OpenEXR 2.3.0 at least, and do not force C++98 OpenEXR 2.3.0 was released more than a year ago, and contains many correctness and security fixes, even more so the just released 2.4.0. OpenEXR 2.4.0 requires at least C++11 (and supports C++14/17), so drop the extra compiler flags. --- configure.ac | 2 +- ext/openexr/Makefile.am | 2 +- ext/openexr/meson.build | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index dbd15419d..06fd09472 100644 --- a/configure.ac +++ b/configure.ac @@ -1752,7 +1752,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [ dnl *** OpenEXR *** translit(dnm, m, l) AM_CONDITIONAL(USE_OPENEXR, true) AG_GST_CHECK_FEATURE(OPENEXR, [openexr library], openexr, [ - AG_GST_PKG_CHECK_MODULES(OPENEXR, OpenEXR) + AG_GST_PKG_CHECK_MODULES(OPENEXR, OpenEXR >= 2.3.0) ]) dnl *** openh264 *** diff --git a/ext/openexr/Makefile.am b/ext/openexr/Makefile.am index 1a95fee6b..614c1376a 100644 --- a/ext/openexr/Makefile.am +++ b/ext/openexr/Makefile.am @@ -6,7 +6,7 @@ libgstopenexr_la_CFLAGS = \ $(OPENEXR_CFLAGS) libgstopenexr_la_CXXFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) \ - $(OPENEXR_CFLAGS) -std=c++98 + $(OPENEXR_CFLAGS) libgstopenexr_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(GST_LIBS) $(OPENEXR_LIBS) diff --git a/ext/openexr/meson.build b/ext/openexr/meson.build index 53cd5120f..4137d64b1 100644 --- a/ext/openexr/meson.build +++ b/ext/openexr/meson.build @@ -1,6 +1,5 @@ -openexr_dep = dependency('OpenEXR', required: get_option('openexr')) +openexr_dep = dependency('OpenEXR', required: get_option('openexr'), version: '>= 2.3.0') if openexr_dep.found() - openexr_extra_cpp_args = cxx.get_supported_arguments(['-std=c++98']) gstopenexr = library('gstopenexr', 'gstopenexr.c', 'gstopenexrdec.cpp', -- 2.23.0