diff --git a/vlc-2.2.2-no-qt5-check.patch b/vlc-2.2.2-no-qt5-check.patch new file mode 100644 index 0000000..2bb6966 --- /dev/null +++ b/vlc-2.2.2-no-qt5-check.patch @@ -0,0 +1,21 @@ +--- vlc-2.2.2/configure.orig 2016-02-14 21:03:20.506473555 +0100 ++++ vlc-2.2.2/configure 2016-02-14 21:03:31.066438070 +0100 +@@ -49179,18 +49179,6 @@ + fi + + fi +- +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.5.0 Qt5Core < 5.6.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.5.0 Qt5Core < 5.6.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- +- as_fn_error $? "\"You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c\"" "$LINENO" 5 +- +-fi +- + QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)" + QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)" + for ac_prog in moc-qt5 moc diff --git a/vlc.spec b/vlc.spec index d438804..d24bd43 100644 --- a/vlc.spec +++ b/vlc.spec @@ -10,8 +10,8 @@ %define mozilla_sdk_dir %(pkg-config --variable=sdkdir libxul) %endif Name: vlc -Version: 2.2.1 -Release: 4mamba +Version: 2.2.2 +Release: 1mamba Summary: The VideoLAN client Group: Graphical Desktop/Applications/Multimedia Vendor: openmamba @@ -27,6 +27,7 @@ Patch6: vlc-2.0.4-fix-undefined-symbol.patch Patch7: vlc-2.0.7-libva-1.2.patch Patch8: vlc-2.0.7-libflac-1.3.0.patch Patch9: vlc-2.2.0-vorbisidec.patch +Patch10: vlc-2.2.2-no-qt5-check.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: enca-devel @@ -290,6 +291,7 @@ This package contains VLC plugins for PulseAudio. #%patch7 -p1 #%patch8 -p1 %patch9 -p1 +%patch10 -p1 %build #:<< ___EOF @@ -500,6 +502,9 @@ fi #%endif %changelog +* Mon Feb 15 2016 Automatic Build System 2.2.2-1mamba +- automatic version update by autodist + * Thu Nov 12 2015 Silvan Calarco 2.2.1-4mamba - rebuilt with liblua 5.2.4-2mamba with fixed pkgconfig