summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-09-13 18:18:45 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-09-13 18:18:45 +0000
commit3bdacf918daeba0798c6fcc5202d46c79217378c (patch)
tree5dec577bb784c44e10b198c936b439b7816cea61 /net-libs/ptlib
parent[bump] virtual/perl-CPAN-Meta-YAML-0.4.0 (diff)
downloadgentoo-2-3bdacf918daeba0798c6fcc5202d46c79217378c.tar.gz
gentoo-2-3bdacf918daeba0798c6fcc5202d46c79217378c.tar.bz2
gentoo-2-3bdacf918daeba0798c6fcc5202d46c79217378c.zip
Remove <media-libs/libdc1394-2 and v4l1 support wrt #367085 by Steve Williams
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/ptlib')
-rw-r--r--net-libs/ptlib/ChangeLog5
-rw-r--r--net-libs/ptlib/ptlib-2.6.7-r1.ebuild19
2 files changed, 11 insertions, 13 deletions
diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index c7bcf29e6aed..7477e32a3fa1 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/ptlib
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.24 2011/04/04 20:44:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ChangeLog,v 1.25 2011/09/13 18:18:45 ssuominen Exp $
+
+ 13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> ptlib-2.6.7-r1.ebuild:
+ Remove <media-libs/libdc1394-2 and v4l1 support wrt #367085 by Steve Williams
04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> ptlib-2.6.7.ebuild:
Use virtual/ffmpeg in all versions.
diff --git a/net-libs/ptlib/ptlib-2.6.7-r1.ebuild b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
index 72b0dedd35f3..cb820c098bc2 100644
--- a/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
+++ b/net-libs/ptlib/ptlib-2.6.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7-r1.ebuild,v 1.5 2011/04/04 12:23:37 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/ptlib/ptlib-2.6.7-r1.ebuild,v 1.6 2011/09/13 18:18:45 ssuominen Exp $
EAPI="2"
@@ -16,9 +16,9 @@ LICENSE="MPL-1.0"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
# default enabled are features from 'minsize', the most used according to ptlib
-IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ieee1394 ipv6
+IUSE="alsa +asn +audio debug doc dtmf esd examples ffmpeg ftp http ipv6
jabber ldap mail odbc oss pch qos remote sasl sdl serial shmvideo snmp soap
-socks ssl +stun telnet tts v4l v4l2 +video vxml wav xml xmlrpc"
+socks ssl +stun telnet tts v4l2 +video vxml wav xml xmlrpc"
CDEPEND="
audio? ( alsa? ( media-libs/alsa-lib )
@@ -28,11 +28,7 @@ CDEPEND="
sasl? ( dev-libs/cyrus-sasl:2 )
sdl? ( media-libs/libsdl )
ssl? ( dev-libs/openssl )
- video? ( ieee1394? ( media-libs/libdc1394:1
- media-libs/libdv
- sys-libs/libavc1394
- sys-libs/libraw1394 )
- v4l2? ( media-libs/libv4l ) )
+ video? ( v4l2? ( media-libs/libv4l ) )
xml? ( dev-libs/expat )
!!dev-libs/pwlib"
RDEPEND="${CDEPEND}
@@ -41,8 +37,7 @@ DEPEND="${CDEPEND}
dev-util/pkgconfig
sys-devel/bison
sys-devel/flex
- video? ( v4l? ( sys-kernel/linux-headers )
- v4l2? ( sys-kernel/linux-headers ) )"
+ video? ( v4l2? ( sys-kernel/linux-headers ) )"
# NOTES:
# media-libs/libdc1394:2 should be supported but headers location have changed
@@ -180,7 +175,7 @@ src_configure() {
$(use_enable http) \
$(use_enable http httpforms) \
$(use_enable http httpsvc) \
- $(use_enable ieee1394 dc) \
+ --disable-dc \
$(use_enable ipv6) \
$(use_enable jabber) \
$(use_enable ldap openldap) \
@@ -201,7 +196,7 @@ src_configure() {
$(use_enable stun) \
$(use_enable telnet) \
$(use_enable tts) \
- $(use_enable v4l) \
+ --disable-v4l \
$(use_enable v4l2) \
$(use_enable video) $(use_enable video vidfile) \
$(use_enable vxml) \