From: Alexis Ballier Date: Tue, 13 Mar 2007 19:55:54 +0000 (+0000) Subject: Build mkvinfo qt4 gui even without wxwindows X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7526445d7279ca3d67f610ed7b172431601a5075;p=gentoo.git Build mkvinfo qt4 gui even without wxwindows Package-Manager: portage-2.1.2.2 --- 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 + +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/Manifest b/media-video/mkvtoolnix/Manifest index 5d34158e3743..ca92ecbd6307 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX mkvtoolnix-2.0.2-qt4.patch 497 RMD160 12acefb7108b2731a78e6b06b8ae5da8106f9fd5 SHA1 a1b6eab033a2f79cf15a02f8d7e3d403c161b10b SHA256 c24e0618a6515831337bd099eb641d077c1cf067a3c8d1632459cd3c4ab2b09f +MD5 35b4fd6e37ec1fedac0ad27ccbc6a138 files/mkvtoolnix-2.0.2-qt4.patch 497 +RMD160 12acefb7108b2731a78e6b06b8ae5da8106f9fd5 files/mkvtoolnix-2.0.2-qt4.patch 497 +SHA256 c24e0618a6515831337bd099eb641d077c1cf067a3c8d1632459cd3c4ab2b09f files/mkvtoolnix-2.0.2-qt4.patch 497 DIST mkvtoolnix-1.8.1.tar.bz2 665710 RMD160 e3b6f61cd3ab73b679bd8fe82a6d3aad5bfe06e9 SHA1 2e5f9f1ea352a4cd8d2e6b195cb06fe21286ef46 SHA256 2e43be38e8d7c4eff6fe09973b6fccb44e1aba83f93d1046f83cd10061969578 DIST mkvtoolnix-2.0.0.tar.bz2 739166 RMD160 400a355646a04cd1ba0c30f2ca1536893e6bf508 SHA1 42f12c238e399eca8327d1059ed344c46492ca8c SHA256 73c1c60f08ac7e1409952eeff6e52a69ec76b11220dbb161dfdc1d34a66c3136 DIST mkvtoolnix-2.0.2.tar.bz2 756652 RMD160 01ea703dfe6e15f9cf121fa0752d059b01a79c15 SHA1 6a4b1e62786fb6e5f426fe3a6ddc667034868212 SHA256 1fce872d1c3ee29ee583dae7c2fb4052343099533bfdd26f1b18f3c6cb2e9473 @@ -12,14 +16,14 @@ EBUILD mkvtoolnix-2.0.0.ebuild 1560 RMD160 81d8fc92f4901828ce11b3e9f28305cc8ec08 MD5 6d678827a4f5e4a034d11087216f4a48 mkvtoolnix-2.0.0.ebuild 1560 RMD160 81d8fc92f4901828ce11b3e9f28305cc8ec08f90 mkvtoolnix-2.0.0.ebuild 1560 SHA256 c8b05f574fed2fe238f4b67dbff9889daf6168df29747b349b69952962dc496b mkvtoolnix-2.0.0.ebuild 1560 -EBUILD mkvtoolnix-2.0.2.ebuild 1560 RMD160 f73d3d5eaca672d2b00c77f63dfd7d2246fd9606 SHA1 413bee368387ffdf6b909f7211bb5adf3aa0994e SHA256 064e31498e51b1a514e2e2e489ec3c41fe9f6e73aac0aac9fb7be050c0202702 -MD5 df09cd3843f8a3b60a9e0650059e453a mkvtoolnix-2.0.2.ebuild 1560 -RMD160 f73d3d5eaca672d2b00c77f63dfd7d2246fd9606 mkvtoolnix-2.0.2.ebuild 1560 -SHA256 064e31498e51b1a514e2e2e489ec3c41fe9f6e73aac0aac9fb7be050c0202702 mkvtoolnix-2.0.2.ebuild 1560 -MISC ChangeLog 11155 RMD160 47e30be949f479d5de746cd9a0642e16e2cc0cb2 SHA1 32be7b21f92025406c099dd179801dc52b0c0bc2 SHA256 1ed659fb92f6b098a2bcdbc27d1bf77b490ca27ae4ef285a0efb994cbebdea1a -MD5 92349b2d08f0d716da5e4b50e6d2c533 ChangeLog 11155 -RMD160 47e30be949f479d5de746cd9a0642e16e2cc0cb2 ChangeLog 11155 -SHA256 1ed659fb92f6b098a2bcdbc27d1bf77b490ca27ae4ef285a0efb994cbebdea1a ChangeLog 11155 +EBUILD mkvtoolnix-2.0.2.ebuild 1687 RMD160 eb9dd0c27c882ac5502bc470606f8e09a5d42af2 SHA1 d756f366b58174d3ab99c531729d1689f80bc09c SHA256 ed19f6cef2473cadf3b584926f28ad3456d98b0fbd61b83da6d8de585cc574db +MD5 4616fec9389116ccb5586625b4258244 mkvtoolnix-2.0.2.ebuild 1687 +RMD160 eb9dd0c27c882ac5502bc470606f8e09a5d42af2 mkvtoolnix-2.0.2.ebuild 1687 +SHA256 ed19f6cef2473cadf3b584926f28ad3456d98b0fbd61b83da6d8de585cc574db mkvtoolnix-2.0.2.ebuild 1687 +MISC ChangeLog 11317 RMD160 8434bf4d51657e0ccbbf79ffaa68bd1c67824565 SHA1 407207ba62c720febf8b9e52b921a25d0ce21674 SHA256 9a933d5cb7e72eea91ebc0c6f538d72618990d51c5b6ebf57ae7818199191769 +MD5 b6a161494a1e2f6515c9767c39690962 ChangeLog 11317 +RMD160 8434bf4d51657e0ccbbf79ffaa68bd1c67824565 ChangeLog 11317 +SHA256 9a933d5cb7e72eea91ebc0c6f538d72618990d51c5b6ebf57ae7818199191769 ChangeLog 11317 MISC metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 SHA1 f8d7127515244fba82de7daad73ef24ed65f36ef SHA256 9f4dc1b64d959e6192e5f464ee00ea68518f541193c39fe683f93f2eae4268cf MD5 29655c309de058bf3e45772adc64c83e metadata.xml 253 RMD160 71868f6bd2770c12c4ccf726f3de1bf9b8211d28 metadata.xml 253 @@ -34,9 +38,9 @@ MD5 320f4fb7342cea75024aec39721f6b48 files/digest-mkvtoolnix-2.0.2 253 RMD160 b58a8f530d3c15ec73cb42b9fba6e3aaa6503688 files/digest-mkvtoolnix-2.0.2 253 SHA256 52ea89bcaec4323be7c8410d165eb681158657d1f8ff7640946db6a3b3848457 files/digest-mkvtoolnix-2.0.2 253 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF4Hv1vFcC4BYPU0oRAhuTAJ9ekPxUz89kBWEUqMuzIHFifQcbEQCfQDst -uPzOQq7lVARiJf43F8HZlt0= -=FSKV +iD8DBQFF9wHGvFcC4BYPU0oRAp1gAKCVuhTJJ4+yOj6iQhfXdP4hX6s0uwCeOJFx +IkBE88t80hMibeUbmp6mWLQ= +=Ha6A -----END PGP SIGNATURE----- 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 \