summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2006-08-03 09:08:57 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2006-08-03 09:08:57 +0000
commitb074e1d70f20e695325b895fa4fc9fe76d718dbd (patch)
tree6ac0f61c3d0eba333d98d7ad33d22e318f5f2293 /media-plugins
parentVersion bump to fix mbox problems caused in rc3, #142576 (diff)
downloadgentoo-2-b074e1d70f20e695325b895fa4fc9fe76d718dbd.tar.gz
gentoo-2-b074e1d70f20e695325b895fa4fc9fe76d718dbd.tar.bz2
gentoo-2-b074e1d70f20e695325b895fa4fc9fe76d718dbd.zip
Check for bad combination of ffmpeg and libtheora to abort with an error, see bug #142250.
(Portage version: 2.1.1_pre4-r2)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/vdr-softdevice/ChangeLog7
-rw-r--r--media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild14
2 files changed, 19 insertions, 2 deletions
diff --git a/media-plugins/vdr-softdevice/ChangeLog b/media-plugins/vdr-softdevice/ChangeLog
index 6da88626c909..bb4fd200a4a3 100644
--- a/media-plugins/vdr-softdevice/ChangeLog
+++ b/media-plugins/vdr-softdevice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/vdr-softdevice
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.11 2006/07/31 12:18:06 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/ChangeLog,v 1.12 2006/08/03 09:08:57 zzam Exp $
+
+ 03 Aug 2006; Matthias Schwarzott <zzam@gentoo.org>
+ vdr-softdevice-0.2.3.20060511-r7.ebuild:
+ Check for bad combination of ffmpeg and libtheora to abort with an error,
+ see bug #142250.
31 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> metadata.xml:
changed maintainance to VDR-Project
diff --git a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild
index 06f69189134b..05e6668f4bc7 100644
--- a/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild
+++ b/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.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-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild,v 1.2 2006/07/31 12:15:04 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-softdevice/vdr-softdevice-0.2.3.20060511-r7.ebuild,v 1.3 2006/08/03 09:08:57 zzam Exp $
inherit vdr-plugin versionator
@@ -70,6 +70,18 @@ pkg_setup() {
0) einfo "SHM support will not be compiled." ;;
1) einfo "SHM support will be compiled." ;;
esac
+
+ # Check for ffmpeg relying on libtheora without pkg-config-file
+ # Bug #142250
+ if built_with_use media-video/ffmpeg theora && \
+ has_version "<media-libs/libtheora/libtheora-1.0_alpha4"; then
+
+ eerror "This package will not work when using ffmpeg with"
+ eerror "USE=\"theora\" combined with media-libs/libtheora"
+ eerror "older than version 1.0_alpha4."
+ eerror "Please update to at least media-libs/libtheora-1.0_alpha4."
+ die "Please update to at least media-libs/libtheora-1.0_alpha4."
+ fi
}
src_unpack() {