Merge branch 'master' into el8

el8
Leigh Scott 4 years ago
commit f1b47d7760

@ -335,7 +335,6 @@ VLC media player extras modules.
%if 0%{?el7} %if 0%{?el7}
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch12 -p1
# Lower opus requirement - rfbz#5585 # Lower opus requirement - rfbz#5585
sed -i -e 's/opus >= 1.0.3/opus >= 1.0.2/' configure.ac sed -i -e 's/opus >= 1.0.3/opus >= 1.0.2/' configure.ac
sed -i -e 's/opus_multistream_surround_encoder_create/opus_multistream_encoder_create/g' modules/codec/opus.c sed -i -e 's/opus_multistream_surround_encoder_create/opus_multistream_encoder_create/g' modules/codec/opus.c
@ -352,6 +351,9 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%if 0%{?rhel} >= 7
%patch12 -p1
%endif
%{?_with_bootstrap: %{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :

Loading…
Cancel
Save