commit: fe5dc79e3f08966ed5dedeffbce7446995351b8f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 9 19:50:52 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb 9 19:51:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5dc79e
media-video/vlc: Fixed compilation with qt5 (bug #574256).
Patch provided by Nick Andrade in bug #574064
Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
media-video/vlc/files/vlc-2.2.2-qt5widgets.patch | 13 +++++++++++++
media-video/vlc/vlc-2.2.2.ebuild | 3 +++
2 files changed, 16 insertions(+)
diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
new file mode 100644
index 0000000..a024d00
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch
@@ -0,0 +1,13 @@
+--- vlc-2.2.2/configure.ac
++++ vlc-2.2.2/configure.ac
+@@ -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"])
diff --git a/media-video/vlc/vlc-2.2.2.ebuild b/media-video/vlc/vlc-2.2.2.ebuild
index e930d06..b263cf5 100644
--- a/media-video/vlc/vlc-2.2.2.ebuild
+++ b/media-video/vlc/vlc-2.2.2.ebuild
@@ -222,6 +222,9 @@ PATCHES=(
# Bug #541678
"${FILESDIR}"/qt4-select.patch
+
+ # Allow QT5.5 since Gentoo has a patched QTwidgets
+ "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch
)
S="${WORKDIR}/${MY_P}"
