Really fix compilation without X, changed use flag from gtk to X

diff --git a/media-video/mpeg4ip/ChangeLog b/media-video/mpeg4ip/ChangeLog
index fcfc316f48c1fa278f35775b9a137b244ea92c7d..403cd916cbe5491a4b07f0d09426adaf7bf2a1ad 100644 (file)
--- a/media-video/mpeg4ip/ChangeLog
+++ b/media-video/mpeg4ip/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mpeg4ip
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.18 2004/12/31 08:32:54 tester Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/ChangeLog,v 1.19 2005/01/04 03:05:51 tester Exp $
+
+  03 Jan 2005; Olivier Crête <tester@gentoo.org> mpeg4ip-1.2.ebuild:
+  Really fix compilation without X, changed use flag from gtk to X
 
   31 Dec 2004; Olivier Crête <tester@gentoo.org>
   +files/mpeg4ip-1.2-mp4encode-template-path.patch:

diff --git a/media-video/mpeg4ip/Manifest b/media-video/mpeg4ip/Manifest
index db9d07124b6ecc52d0b42a91d108241a5b05dcec..14ef45ba39e48f970ad000239ddd5f33a5c9390e 100644 (file)
--- a/media-video/mpeg4ip/Manifest
+++ b/media-video/mpeg4ip/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 65f6ffc28c1d4afc6c2494d7289570d6 mpeg4ip-1.1.ebuild 1638
+MD5 70d18ba0532a78593282eb879d3c1274 mpeg4ip-1.1.ebuild 1642
 MD5 1b1b7046bccf0f835f8e3c5b68063d8e metadata.xml 255
-MD5 fb7140d795e4997b69fc3c41801296cf ChangeLog 3475
-MD5 d3901fe672ba3d47273a123d16228c72 mpeg4ip-1.0.ebuild 2205
-MD5 fceab1657eb7d646f9a25b87ac3c68c8 mpeg4ip-1.2.ebuild 2646
+MD5 985a2265fb21cb141a8b726a1515b698 ChangeLog 3613
+MD5 a74537cea5ff250264109426ab1861f4 mpeg4ip-1.0.ebuild 2205
+MD5 4392010baaf5428fcf10f3cbe7bd25a7 mpeg4ip-1.2.ebuild 2664
 MD5 47b75e71dec24165d7bcf3a5b55d785d files/mpeg4ip-1.1-gentoo-fixes.patch 844
 MD5 e1adf5b673be8f3eede637fc5ea66aa3 files/digest-mpeg4ip-1.2 64
 MD5 bf208b3fef7857814d19fd17e38cbd66 files/digest-mpeg4ip-1.1 64
@@ -15,7 +15,7 @@ MD5 5362a4e7d4ecc6778c030d2de9070f14 files/mpeg4ip-1.2-mp4encode-template-path.p
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFB1RFRwDHaUUJ0mYMRAt+UAJwLy9pwUrSc4zjGwyvuTMP7ZiDBkACfZpEX
-+dhZto5TTpWr8ryHccf6+rE=
-=/jF8
+iD8DBQFB2gg/wDHaUUJ0mYMRAvvOAJsHKDx7qiymdwxkYPfuSw0l2orwLgCfa3Pv
+l31IwJeNaMis0eVzoCWUNwA=
+=YUWo
 -----END PGP SIGNATURE-----

diff --git a/media-video/mpeg4ip/mpeg4ip-1.0.ebuild b/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
index 856f02dda797104dfaa325535833ca40f3c3d84f..30626f1be0350ab367c9cbb30457ffa498d40a32 100644 (file)
--- a/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0.ebuild,v 1.8 2004/06/30 01:05:49 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.0.ebuild,v 1.9 2005/01/04 03:05:51 tester Exp $
 
 DESCRIPTION="MPEG 4 implementation library"
 

diff --git a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
index 93ce68c4b83e120e6de163cd0a95742a5cc095c7..09290b0199f337e17d8b496499f825e7ae5b7597 100644 (file)
--- a/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.10 2004/11/06 03:18:29 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.1.ebuild,v 1.11 2005/01/04 03:05:51 tester Exp $
 
 inherit eutils
 

diff --git a/media-video/mpeg4ip/mpeg4ip-1.2.ebuild b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
index 81d2604528684cabe5c5b5e70bd7f1dc67874aaf..4c041c260e693fa2dbc0dd41123d937d089e5f94 100644 (file)
--- a/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
+++ b/media-video/mpeg4ip/mpeg4ip-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.2.ebuild,v 1.3 2004/12/31 08:32:54 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mpeg4ip/mpeg4ip-1.2.ebuild,v 1.4 2005/01/04 03:05:51 tester Exp $
 
 inherit eutils
 
@@ -16,7 +16,7 @@ SLOT="0"
 
 KEYWORDS="~x86 ~amd64"
 
-IUSE="ipv6 mmx gtk v4l2 xvid nas alsa esd arts"
+IUSE="ipv6 mmx X v4l2 xvid nas alsa esd arts"
 
 RDEPEND="sys-devel/libtool
        sys-devel/autoconf
@@ -24,7 +24,7 @@ RDEPEND="sys-devel/libtool
        >=media-libs/faac-1.20.1
        >=media-sound/lame-3.92
        media-libs/libsdl
-       gtk? ( >=x11-libs/gtk+-2 )
+       X? ( >=x11-libs/gtk+-2 )
        media-libs/libid3tag
        xvid? ( media-libs/xvid )
        nas? ( media-libs/nas virtual/x11 )
@@ -67,8 +67,9 @@ src_compile() {
                        $(use_enable esd)
                        $(use_enable alsa)
                        $(use_enable arts)
-                       $(use_enable gtk gtk-glib)
-                       $(use_enable gtk mp4live)"
+                       $(use_enable X gtk-glib)
+                       $(use_enable X player)
+                       $(use_enable X mp4live)"
        use v4l2 || myconf="${myconf} --disable-v4l2"
 
        # ffmpeg support doesnt build even on gcc 3.3