diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2007-03-13 19:55:54 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2007-03-13 19:55:54 +0000 |
| commit | 21a75a68cd43c8742910cac5f0b65dfb19b6736c (patch) | |
| tree | a771688ee5dbaf8902237464a2a9367b83bede09 /media-video/mkvtoolnix | |
| parent | x86 stable wrt bug 170745 (diff) | |
| download | gentoo-2-21a75a68cd43c8742910cac5f0b65dfb19b6736c.tar.gz gentoo-2-21a75a68cd43c8742910cac5f0b65dfb19b6736c.tar.bz2 gentoo-2-21a75a68cd43c8742910cac5f0b65dfb19b6736c.zip | |
Build mkvinfo qt4 gui even without wxwindows
(Portage version: 2.1.2.2)
Diffstat (limited to 'media-video/mkvtoolnix')
| -rw-r--r-- | media-video/mkvtoolnix/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch | 14 | ||||
| -rw-r--r-- | media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild | 14 |
3 files changed, 31 insertions, 3 deletions
diff --git a/media-video/mkvtoolnix/ChangeLog b/media-video/mkvtoolnix/ChangeLog index 4afbb21acaae..aa13b4b9ba5d 100644 --- a/media-video/mkvtoolnix/ChangeLog +++ b/media-video/mkvtoolnix/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/mkvtoolnix # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.72 2007/02/24 17:54:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/ChangeLog,v 1.73 2007/03/13 19:55:54 aballier Exp $ + + 13 Mar 2007; Alexis Ballier <aballier@gentoo.org> + +files/mkvtoolnix-2.0.2-qt4.patch, mkvtoolnix-2.0.2.ebuild: + Build mkvinfo qt4 gui even without wxwindows *mkvtoolnix-2.0.2 (24 Feb 2007) diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch b/media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch new file mode 100644 index 000000000000..fcdde62e2ea6 --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-2.0.2-qt4.patch @@ -0,0 +1,14 @@ +Index: mkvtoolnix-2.0.2/configure.in +=================================================================== +--- mkvtoolnix-2.0.2.orig/configure.in ++++ mkvtoolnix-2.0.2/configure.in +@@ -1018,8 +1018,7 @@ AC_ARG_ENABLE([qt], + + qt_min_ver=4.0.0 + +-if test x"$enable_qt" = "xyes" -a \ +- '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then ++if test x"$enable_qt" = "xyes"; then + dnl Find moc. + AC_ARG_WITH(moc, + AC_HELP_STRING([--with-moc=prog],[use prog instead of looking for moc]), diff --git a/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild b/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild index dded0e55aa8a..bd356eef5223 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild,v 1.1 2007/02/24 17:54:54 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/mkvtoolnix/mkvtoolnix-2.0.2.ebuild,v 1.2 2007/03/13 19:55:54 aballier Exp $ -inherit eutils wxwidgets flag-o-matic qt4 +inherit eutils wxwidgets flag-o-matic qt4 autotools DESCRIPTION="Tools to create, alter, and inspect Matroska files" HOMEPAGE="http://www.bunkus.org/videotools/mkvtoolnix" @@ -33,6 +33,16 @@ pkg_setup() { fi } +src_unpack() { + unpack ${A} + cd "${S}" + + if use qt4; then + epatch "${FILESDIR}/${P}-qt4.patch" + eautoreconf + fi +} + src_compile() { use wxwindows && myconf="--with-wx-config=${WX_CONFIG}" econf \ |