rpm/libqt5-qtwebengine
SHA256
1
0
Fork 0
forked from pool/libqt5-qtwebengine
Code Pull Requests Activity

Accepting request 528855 from KDE:Qt5

Browse Source 
- 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
This commit is contained in:
Dominique Leuenberger 2017-09-29 09:50:16 +00:00 committed by Git OBS Bridge
parent 079012a6ce
commit addab2110e
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libqt5-qtwebengine.changes
View File

@ -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 Mon Jul 10 09:56:30 UTC 2017 - mlin@suse.com

20
libqt5-qtwebengine.spec
View File

@ -18,18 +18,23 @@
%define qt5_snapshot 0 %define qt5_snapshot 0
%if %{?suse_version} <= 1320 %if 0%{?suse_version} <= 1320
%bcond_with system_vpx %bcond_with system_vpx
%else %else
%bcond_without system_vpx %bcond_without system_vpx
%endif %endif
%if %{?suse_version} < 1330 %if 0%{?suse_version} < 1330
%bcond_with system_icu %bcond_with system_icu
%else %else
# Change to without once ICU 59 in TW is supported # Change to without once ICU 59 in TW is supported
%bcond_with system_icu %bcond_with system_icu
%endif %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 %bcond_without system_minizip
%else %else
%bcond_with system_minizip %bcond_with system_minizip
@ -168,6 +173,11 @@ BuildRequires: pkgconfig(icu-i18n) >= 54.0
%if %{with system_vpx} %if %{with system_vpx}
BuildRequires: pkgconfig(vpx) >= 1.4.0 BuildRequires: pkgconfig(vpx) >= 1.4.0
%endif %endif
%if %{with system_ffmpeg}
BuildRequires: libavformat-devel
BuildRequires: libavcodec-devel
BuildRequires: libavutil-devel
%endif
%if %qt5_snapshot %if %qt5_snapshot
#to create the forwarding headers #to create the forwarding headers
BuildRequires: perl BuildRequires: perl
@ -247,8 +257,10 @@ export RPM_OPT_FLAGS=${RPM_OPT_FLAGS/-g / }
%endif %endif
# It does not actually include proprietary codecs, it only makes it attempt to use ffmpeg # It does not actually include proprietary codecs, it only makes it attempt to use ffmpeg
%qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \ %qmake5 QMAKE_CFLAGS="$RPM_OPT_FLAGS" \
QMAKE_CFLAGS+="$RPM_OPT_FLAGS" \ %if %{with system_ffmpeg}
WEBENGINE_CONFIG+=use_proprietary_codecs \ WEBENGINE_CONFIG+=use_proprietary_codecs \
WEBENGINE_CONFIG+=use_system_ffmpeg \
%endif
%if %{with system_icu} %if %{with system_icu}
WEBENGINE_CONFIG+=use_system_icu \ WEBENGINE_CONFIG+=use_system_icu \
%endif %endif