| 1 |
yngwin 15/01/31 14:27:20 |
| 2 |
|
| 3 |
Modified: mkvtoolnix-7.5.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Point directly to Qt5 tools to fix bug #532600, and actually build experimental mkvtoolnix-gui. |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 0x4FDF9CFD2FAC514E!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: mkvtoolnix-7.5.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- mkvtoolnix-7.5.0.ebuild 19 Jan 2015 20:26:40 -0000 1.3 |
| 23 |
+++ mkvtoolnix-7.5.0.ebuild 31 Jan 2015 14:27:20 -0000 1.4 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2015 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.3 2015/01/19 20:26:40 graaff Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-7.5.0.ebuild,v 1.4 2015/01/31 14:27:20 yngwin Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
WX_GTK_VER="3.0" |
| 32 |
@@ -41,6 +41,7 @@ |
| 33 |
qt5? ( |
| 34 |
dev-qt/qtcore:5 |
| 35 |
dev-qt/qtgui:5 |
| 36 |
+ dev-qt/qtwidgets:5 |
| 37 |
) |
| 38 |
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] ) |
| 39 |
" |
| 40 |
@@ -78,9 +79,17 @@ |
| 41 |
src_configure() { |
| 42 |
local myconf |
| 43 |
|
| 44 |
+ if use qt5 ; then |
| 45 |
+ # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 |
| 46 |
+ myconf+="--with-moc=/usr/$(get_libdir)/qt5/bin/moc |
| 47 |
+ --with-uic=/usr/$(get_libdir)/qt5/bin/uic |
| 48 |
+ --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc |
| 49 |
+ --with-mkvtoolnix-gui" |
| 50 |
+ fi |
| 51 |
+ |
| 52 |
if use wxwidgets ; then |
| 53 |
need-wxwidgets unicode |
| 54 |
- myconf="--with-wx-config=${WX_CONFIG}" |
| 55 |
+ myconf+="--with-wx-config=${WX_CONFIG}" |
| 56 |
fi |
| 57 |
|
| 58 |
econf \ |
| 59 |
|
| 60 |
|
| 61 |
|
| 62 |
1.214 media-video/mkvtoolnix/ChangeLog |
| 63 |
|
| 64 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.214&view=markup |
| 65 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?rev=1.214&content-type=text/plain |
| 66 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/mkvtoolnix/ChangeLog?r1=1.213&r2=1.214 |
| 67 |
|
| 68 |
Index: ChangeLog |
| 69 |
=================================================================== |
| 70 |
RCS file: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v |
| 71 |
retrieving revision 1.213 |
| 72 |
retrieving revision 1.214 |
| 73 |
diff -u -r1.213 -r1.214 |
| 74 |
--- ChangeLog 19 Jan 2015 20:26:40 -0000 1.213 |
| 75 |
+++ ChangeLog 31 Jan 2015 14:27:20 -0000 1.214 |
| 76 |
@@ -1,6 +1,10 @@ |
| 77 |
# ChangeLog for media-video/mkvtoolnix |
| 78 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 79 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.213 2015/01/19 20:26:40 graaff Exp $ |
| 80 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.214 2015/01/31 14:27:20 yngwin Exp $ |
| 81 |
+ |
| 82 |
+ 31 Jan 2015; Ben de Groot <yngwin@g.o> mkvtoolnix-7.5.0.ebuild: |
| 83 |
+ Point directly to Qt5 tools to fix bug #532600, and actually build |
| 84 |
+ experimental mkvtoolnix-gui. |
| 85 |
|
| 86 |
19 Jan 2015; Hans de Graaff <graaff@g.o> mkvtoolnix-7.4.0-r1.ebuild, |
| 87 |
mkvtoolnix-7.5.0.ebuild: |
Archives