yngwin 15/01/31 14:27:20 Modified: mkvtoolnix-7.5.0.ebuild ChangeLog Log: 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!)
Revision Changes Path 1.4 media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?rev=1.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?r1=1.3&r2=1.4 Index: mkvtoolnix-7.5.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mkvtoolnix-7.5.0.ebuild 19 Jan 2015 20:26:40 -0000 1.3 +++ mkvtoolnix-7.5.0.ebuild 31 Jan 2015 14:27:20 -0000 1.4 @@ -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 @@ 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_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 \ 1.214 media-video/mkvtoolnix/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.214&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.214&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?r1=1.213&r2=1.214 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v retrieving revision 1.213 retrieving revision 1.214 diff -u -r1.213 -r1.214 --- ChangeLog 19 Jan 2015 20:26:40 -0000 1.213 +++ ChangeLog 31 Jan 2015 14:27:20 -0000 1.214 @@ -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 <[email protected]> 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 <[email protected]> mkvtoolnix-7.4.0-r1.ebuild, mkvtoolnix-7.5.0.ebuild:
