2024-01-05 19:07:48 +01:00
|
|
|
--- 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
|
2024-01-05 19:07:48 +01:00
|
|
|
--- vlc-2.2.2/configure.ac.orig 2016-04-15 16:52:28.646023118 +0200
|
|
|
|
|
+++ vlc-2.2.2/configure.ac 2016-04-15 16:53:10.962987772 +0200
|
|
|
|
|
@@ -3754,10 +3754,6 @@
|
|
|
|
|
AC_MSG_WARN([Not building Qt Interface with X11 helpers.])
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [
|
|
|
|
|
- AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"])
|
|
|
|
|
- ])
|
|
|
|
|
-
|
|
|
|
|
QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)"
|
|
|
|
|
QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)"
|
|
|
|
|
AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"])
|
