From 07fe3935252c150e8d0cb2bfc7b60401b383b82c55e85fac88fd23d7e32656b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 23 Jun 2018 14:41:57 +0000 Subject: [PATCH] Fix build for SLE12sp3 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/gstreamer-plugins-base?expand=0&rev=117 --- gstreamer-plugins-base.changes | 6 ++++++ gstreamer-plugins-base.spec | 14 +++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/gstreamer-plugins-base.changes b/gstreamer-plugins-base.changes index d71e38f..b1b479b 100644 --- a/gstreamer-plugins-base.changes +++ b/gstreamer-plugins-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jun 23 14:40:27 UTC 2018 - bjorn.lie@gmail.com + +- Conditionalize orc and pkgconfig(wayland-egl) BuildRequires and + enable-orc call, fix build for SLE 12 SP3. + ------------------------------------------------------------------- Wed Jun 13 23:00:44 UTC 2018 - bjorn.lie@gmail.com diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 907692b..451dbbb 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -43,7 +43,6 @@ BuildRequires: libXext-devel BuildRequires: libXv-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel -BuildRequires: orc >= 0.4.24 BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: python3-xml @@ -60,9 +59,6 @@ BuildRequires: pkgconfig(glesv1_cm) BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(glib-2.0) >= 2.24 BuildRequires: pkgconfig(gmodule-no-export-2.0) -%if 0%{?suse_version} >= 1500 -BuildRequires: pkgconfig(graphene-1.0) -%endif BuildRequires: pkgconfig(gstreamer-1.0) >= %{version} BuildRequires: pkgconfig(gtk+-3.0) >= 3.10 BuildRequires: pkgconfig(gtk+-x11-3.0) >= 3.0.0 @@ -81,12 +77,18 @@ BuildRequires: pkgconfig(vorbis) >= 1.0 BuildRequires: pkgconfig(vorbisenc) >= 1.0 BuildRequires: pkgconfig(wayland-client) >= 1.0 BuildRequires: pkgconfig(wayland-cursor) >= 1.0 -BuildRequires: pkgconfig(wayland-egl) >= 1.0 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11-xcb) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xv) BuildRequires: pkgconfig(zlib) +%if 0%{?suse_version} >= 1500 +BuildRequires: pkgconfig(graphene-1.0) +%endif +%if 0%{?is_opensuse} +BuildRequires: orc >= 0.4.24 +BuildRequires: pkgconfig(wayland-egl) >= 1.0 +%endif Requires: %{gstreamer_plugins_base_req} Recommends: %{name}-lang Recommends: PackageKit-gstreamer-plugin @@ -465,7 +467,9 @@ export PYTHON=%{_bindir}/python3 --disable-static\ --enable-gtk-doc\ --enable-introspection\ +%if 0%{?is_opensuse} --enable-orc\ +%endif %{nil} make %{?_smp_mflags}