diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2015-01-31 14:27:20 +0000 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2015-01-31 14:27:20 +0000 |
| commit | 1e9bf092a80e97909861e1b1c99e6fb7cd01666c (patch) | |
| tree | 000f3895358b17e8d4534b0e0708ca6787fdf83b | |
| parent | Add ~x86-fbsd keyword (diff) | |
| download | gentoo-2-1e9bf092a80e97909861e1b1c99e6fb7cd01666c.tar.gz gentoo-2-1e9bf092a80e97909861e1b1c99e6fb7cd01666c.tar.bz2 gentoo-2-1e9bf092a80e97909861e1b1c99e6fb7cd01666c.zip | |
Point directly to Qt5 tools to fix bug #532600, and actually build experimental mkvtoolnix-gui.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!)
| -rw-r--r-- | media-video/mkvtoolnix/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog index 69d53c7fe3d3..d8915362a262 100644 --- a/media-video/mkvtoolnix/ChangeLog +++ b/media-video/mkvtoolnix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mkvtoolnix # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.213 2015/01/19 20:26:40 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.214 2015/01/31 14:27:20 yngwin Exp $ + + 31 Jan 2015; Ben de Groot <yngwin@gentoo.org> mkvtoolnix-7.5.0.ebuild: + Point directly to Qt5 tools to fix bug #532600, and actually build + experimental mkvtoolnix-gui. 19 Jan 2015; Hans de Graaff <graaff@gentoo.org> mkvtoolnix-7.4.0-r1.ebuild, mkvtoolnix-7.5.0.ebuild: diff --git a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild index a239a847f54a..c9d5e9c0aa2e 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.3 2015/01/19 20:26:40 graaff Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.4 2015/01/31 14:27:20 yngwin Exp $ EAPI=5 WX_GTK_VER="3.0" @@ -41,6 +41,7 @@ RDEPEND=" qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 + dev-qt/qtwidgets:5 ) wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) " @@ -78,9 +79,17 @@ src_prepare() { src_configure() { local myconf + if use qt5 ; then + # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 + myconf+="--with-moc=/usr/$(get_libdir)/qt5/bin/moc + --with-uic=/usr/$(get_libdir)/qt5/bin/uic + --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc + --with-mkvtoolnix-gui" + fi + if use wxwidgets ; then need-wxwidgets unicode - myconf="--with-wx-config=${WX_CONFIG}" + myconf+="--with-wx-config=${WX_CONFIG}" fi econf \ |