[vlc/f34: 2/2] Merge branch 'master' into f34
by Leigh Scott
commit 10560a3b33ddd4bd651bda4f9948c25c2048d653
Merge: 52d9b45 649c6db
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 14 12:52:57 2021 +0100
Merge branch 'master' into f34
vlc.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
3 years, 5 months
[vlc] tweak last commit
by Leigh Scott
commit 649c6db1b0c588fbcf43f68d28c490324a0aa502
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 14 12:52:37 2021 +0100
tweak last commit
vlc.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 91b21d5..bc41fc9 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -335,7 +335,6 @@ VLC media player extras modules.
%if 0%{?el7}
%patch5 -p1
%patch6 -p1
-%patch12 -p1
# Lower opus requirement - rfbz#5585
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
@@ -352,6 +351,9 @@ sed -i -e 's/luac/luac-5.1/g' configure.ac
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%if 0%{?rhel} >= 7
+%patch12 -p1
+%endif
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
3 years, 5 months
[vlc/el7: 2/2] Merge branch 'master' into el7
by Leigh Scott
commit e57abdcf15e6c4c7b26aeb25a4171f0d1533642e
Merge: 605250b 828661b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 14 12:43:04 2021 +0100
Merge branch 'master' into el7
...ss-libdvdread-6.1.2-supports-UTF-8-paths-.patch | 74 ++++++++++++++++++++++
vlc.spec | 2 +
2 files changed, 76 insertions(+)
---
3 years, 5 months
[vlc/el8: 2/2] Merge branch 'master' into el8
by Leigh Scott
commit 1712ae08b398b31f4d4a31be801b69a424f22851
Merge: 8e07320 828661b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 14 12:42:45 2021 +0100
Merge branch 'master' into el8
...ss-libdvdread-6.1.2-supports-UTF-8-paths-.patch | 74 ++++++++++++++++++++++
vlc.spec | 2 +
2 files changed, 76 insertions(+)
---
3 years, 5 months
[vlc/f33: 2/2] Merge branch 'master' into f33
by Leigh Scott
commit dee0efeb8854b3c12f5049704930d95e6bfe86f3
Merge: 17280f5 828661b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jun 14 12:42:23 2021 +0100
Merge branch 'master' into f33
...ss-libdvdread-6.1.2-supports-UTF-8-paths-.patch | 74 ++++++++++++++++++++++
vlc.spec | 2 +
2 files changed, 76 insertions(+)
---
3 years, 5 months
