[vlc/el7: 191/191] Merge branch 'master' into el7
commit 1649a294e230e7a386cfc84095e4a0712aa03a21
Merge: 156cf58 f09590a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jan 11 16:06:25 2019 +0100
Merge branch 'master' into el7
mmal_1.patch | 6570 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
vlc.spec | 99 +-
3 files changed, 6613 insertions(+), 58 deletions(-)
---
diff --cc vlc.spec
index cbf7309,ed7d8bb..c4063ca
--- a/vlc.spec
+++ b/vlc.spec
@@@ -319,9 -324,9 +324,10 @@@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 ||
%{?_with_opencv:--enable-opencv} \
--enable-sftp \
%{?_with_vcdimager:--enable-vcdx} \
+ %{?_with_rpi: \
--enable-omxil \
--enable-omxil-vout \
+%{?_with_rpi:
--enable-rpi-omxil \
--enable-mmal \
} \