summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-11-11 00:19:53 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-11-11 00:19:53 +0000
commitc8bcc6a970a0379ee8d7897553f57ba551facd13 (patch)
treee77103995d267fb29f759e48008e834a116ad25b /media-video
parentStable on x86, bug #154574. (diff)
downloadgentoo-2-c8bcc6a970a0379ee8d7897553f57ba551facd13.tar.gz
gentoo-2-c8bcc6a970a0379ee8d7897553f57ba551facd13.tar.bz2
gentoo-2-c8bcc6a970a0379ee8d7897553f57ba551facd13.zip
Ignore patch 230_all_libcdio-0.78.2.patch when using older versions of libcdio. Closes bug #154193.
(Portage version: 2.1.2_rc1-r5)
Diffstat (limited to 'media-video')
-rw-r--r--media-video/vlc/ChangeLog6
-rw-r--r--media-video/vlc/vlc-0.8.5-r5.ebuild5
2 files changed, 9 insertions, 2 deletions
diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index c859d3a9af2f..0277297df001 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-video/vlc
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.189 2006/11/04 03:35:57 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.190 2006/11/11 00:19:53 flameeyes Exp $
+
+ 11 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.5-r5.ebuild:
+ Ignore patch 230_all_libcdio-0.78.2.patch when using older versions of
+ libcdio. Closes bug #154193.
04 Nov 2006; Patrick McLean <chutzpah@gentoo.org> vlc-0.8.5-r5.ebuild:
Add patch to allow compilation with media-video/vlc-0.8.5-r5 (bug #153931).
diff --git a/media-video/vlc/vlc-0.8.5-r5.ebuild b/media-video/vlc/vlc-0.8.5-r5.ebuild
index 7ad883402f2b..7c382a002a42 100644
--- a/media-video/vlc/vlc-0.8.5-r5.ebuild
+++ b/media-video/vlc/vlc-0.8.5-r5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r5.ebuild,v 1.9 2006/11/04 03:35:57 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.5-r5.ebuild,v 1.10 2006/11/11 00:19:53 flameeyes Exp $
WANT_AUTOMAKE=latest
WANT_AUTOCONF=latest
@@ -126,6 +126,9 @@ src_unpack() {
unpack ${A}
cd ${S}
+ has_version '>=dev-libs/libcdio-0.78' || \
+ export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
+
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
AT_M4DIR="m4" eautoreconf
}