From addab2110e92af23e1afb108c00f576452402c598a6d18774b1a4c3287356cec Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 29 Sep 2017 09:50:16 +0000
Subject: [PATCH] Accepting request 528855 from KDE:Qt5

- Unbundle ffmpeg if possible, only support proprietary codecs
  if the system ffmpeg does

OBS-URL: https://build.opensuse.org/request/show/528855
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=23
---
 libqt5-qtwebengine.changes |  6 ++++++
 libqt5-qtwebengine.spec    | 20 ++++++++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes
index 14c7611..fa10f44 100644
--- a/libqt5-qtwebengine.changes
+++ b/libqt5-qtwebengine.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 26 15:03:00 UTC 2017 - fabian@ritter-vogt.de
+
+- Unbundle ffmpeg if possible, only support proprietary codecs
+  if the system ffmpeg does
+
 -------------------------------------------------------------------
 Mon Jul 10 09:56:30 UTC 2017 - mlin@suse.com
 
diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec
index 3255a64..eca24d9 100644
--- a/libqt5-qtwebengine.spec
+++ b/libqt5-qtwebengine.spec
@@ -18,18 +18,23 @@
 
 %define qt5_snapshot 0
 
-%if %{?suse_version} <= 1320
+%if 0%{?suse_version} <= 1320
 %bcond_with system_vpx
 %else
 %bcond_without system_vpx
 %endif
-%if %{?suse_version} < 1330
+%if 0%{?suse_version} < 1330
 %bcond_with system_icu
 %else
 # Change to without once ICU 59 in TW is supported
 %bcond_with system_icu
 %endif
-%if %{?suse_version} >= 1320 || (%{?suse_version} == 1315 && 0%{?leap_version} >= 420200)
+%if %{?suse_version} >= 1320 || (0%{?is_opensuse} && 0%{?sle_version} >= 120300)
+%bcond_without system_ffmpeg
+%else
+%bcond_with system_ffmpeg
+%endif
+%if 0%{?suse_version} >= 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200)
 %bcond_without system_minizip
 %else
 %bcond_with system_minizip
@@ -168,6 +173,11 @@ BuildRequires:  pkgconfig(icu-i18n) >= 54.0
 %if %{with system_vpx}
 BuildRequires:  pkgconfig(vpx) >= 1.4.0
 %endif
+%if %{with system_ffmpeg}
+BuildRequires:  libavformat-devel
+BuildRequires:  libavcodec-devel
+BuildRequires:  libavutil-devel
+%endif
 %if %qt5_snapshot
 #to create the forwarding headers
 BuildRequires:  perl
@@ -247,8 +257,10 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
 %endif
 # It does not actually include proprietary codecs, it only makes it attempt to use ffmpeg
 %qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \
-        QMAKE_CFLAGS+="$RPM_OPT_FLAGS" \
+%if %{with system_ffmpeg}
         WEBENGINE_CONFIG+=use_proprietary_codecs \
+        WEBENGINE_CONFIG+=use_system_ffmpeg \
+%endif
 %if %{with system_icu}
         WEBENGINE_CONFIG+=use_system_icu \
 %endif