summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2005-12-14 05:15:53 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2005-12-14 05:15:53 +0000
commit885b318b28e38986a215115a912425c8394c889e (patch)
treeaa5faed9a7c9d1a517b8151f3f317ebd005429be /media-video/transcode
parentChange libXpm dep to libXext. gvim links to libXpm, then its weird link.sh sc... (diff)
downloadgentoo-2-885b318b28e38986a215115a912425c8394c889e.tar.gz
gentoo-2-885b318b28e38986a215115a912425c8394c889e.tar.bz2
gentoo-2-885b318b28e38986a215115a912425c8394c889e.zip
Add modular X dependencies to 0.6. Remove some redundant deps on 1.0. Some differences in 1.0: apparently doesn't link against libXi.
(Portage version: 2.0.53)
Diffstat (limited to 'media-video/transcode')
-rw-r--r--media-video/transcode/ChangeLog7
-rw-r--r--media-video/transcode/transcode-0.6.14-r3.ebuild11
-rw-r--r--media-video/transcode/transcode-1.0.2-r1.ebuild11
3 files changed, 16 insertions, 13 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index f00c92fd39a6..d830ad4de113 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/transcode
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.122 2005/12/10 16:06:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.123 2005/12/14 05:15:53 spyderous Exp $
+
+ 14 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ transcode-0.6.14-r3.ebuild, transcode-1.0.2-r1.ebuild:
+ Add modular X dependencies to 0.6. Remove some redundant deps on 1.0. Some
+ differences in 1.0: apparently doesn't link against libXi.
*transcode-1.0.2-r1 (10 Dec 2005)
diff --git a/media-video/transcode/transcode-0.6.14-r3.ebuild b/media-video/transcode/transcode-0.6.14-r3.ebuild
index e837bf9b3a5e..88814bae8f21 100644
--- a/media-video/transcode/transcode-0.6.14-r3.ebuild
+++ b/media-video/transcode/transcode-0.6.14-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r3.ebuild,v 1.2 2005/11/03 12:08:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r3.ebuild,v 1.3 2005/12/14 05:15:53 spyderous Exp $
inherit libtool flag-o-matic eutils multilib autotools
@@ -33,7 +33,13 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
imagemagick? ( >=media-gfx/imagemagick-5.5.6.0 )
media-libs/netpbm
media-libs/libexif
- X? ( virtual/x11 )
+ X? ( || ( ( x11-libs/libXaw
+ x11-libs/libXi
+ x11-libs/libXv
+ )
+ virtual/x11
+ )
+ )
mpeg? ( media-libs/libmpeg3 )
encode? ( >=media-sound/lame-3.93 )
sdl? ( media-libs/libsdl )
@@ -47,6 +53,7 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
pvm? ( >=sys-cluster/pvm-3.4 )"
DEPEND="${RDEPEND}
+ X? ( || ( x11-proto/xextproto virtual/x11 ) )
x86? ( >=dev-lang/nasm-0.98.36 )
=sys-devel/gcc-3*"
diff --git a/media-video/transcode/transcode-1.0.2-r1.ebuild b/media-video/transcode/transcode-1.0.2-r1.ebuild
index 1c0c29affb6e..4c19d5365dbe 100644
--- a/media-video/transcode/transcode-1.0.2-r1.ebuild
+++ b/media-video/transcode/transcode-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r1.ebuild,v 1.1 2005/12/10 16:06:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.2-r1.ebuild,v 1.2 2005/12/14 05:15:53 spyderous Exp $
inherit libtool flag-o-matic eutils multilib autotools
@@ -43,12 +43,6 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
>=media-libs/libmpeg2-0.4.0b
xml2? ( dev-libs/libxml2 )
X? ( || ( (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXpm
- x11-libs/libXt
- x11-libs/libICE
- x11-libs/libSM
x11-libs/libXaw
x11-libs/libXv )
virtual/x11 ) )
@@ -57,11 +51,8 @@ RDEPEND="a52? ( >=media-libs/a52dec-0.7.4 )
DEPEND="${RDEPEND}
v4l? ( >=sys-kernel/linux-headers-2.6.11 )
X? ( || ( ( x11-base/xorg-server
- x11-libs/libX11
- x11-libs/libXt
x11-libs/libXaw
x11-libs/libXv
- x11-proto/xproto
x11-proto/xextproto )
virtual/x11 ) )
sys-devel/autoconf