diff options
| author |   Stefan Knoblich <stkn@gentoo.org> | 2005-11-20 17:09:13 +0000 |
|---|---|---|
| committer | Stefan Knoblich <stkn@gentoo.org> | 2005-11-20 17:09:13 +0000 |
| commit | 88412eec026aa66558d050d33ee9d4b1a5531860 (patch) | |
| tree | 14b77fdd8ab535608d4d7dcb93208deca16361e3 /dev-libs | |
| parent | Block >=libdc1394-2.x.x, unsupported by pwlib atm (diff) | |
| download | voip-88412eec026aa66558d050d33ee9d4b1a5531860.tar.gz voip-88412eec026aa66558d050d33ee9d4b1a5531860.tar.bz2 voip-88412eec026aa66558d050d33ee9d4b1a5531860.zip | |
Updated plugin handling, enabled ipv6 use flag for now (needs testing with gnomemeeting).
svn path=/trunk/; revision=43
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/pwlib/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/pwlib/pwlib-1.9.1.ebuild | 40 |
2 files changed, 17 insertions, 25 deletions
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest index 393a192..6a78ca0 100644 --- a/dev-libs/pwlib/Manifest +++ b/dev-libs/pwlib/Manifest @@ -1,6 +1,6 @@ MD5 82886f6903aff217847b43066c8516fb pwlib-1.8.7.ebuild 4079 MD5 c5e8aafcba9e2996b152a154b7c4cf82 pwlib-1.8.4.ebuild 4797 -MD5 767ff874719b6fc1f082a6fa65f6256c pwlib-1.9.1.ebuild 4941 +MD5 ae3632ebd0872413284afc6c0f0e2fd7 pwlib-1.9.1.ebuild 4846 MD5 7727b16f2fbed2161f1bc6c38aacaa36 files/digest-pwlib-1.8.4 64 MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366 MD5 cd832010589d81cab25d2523d62a3401 files/pwlib-1.8.7-instplugins.diff 1044 diff --git a/dev-libs/pwlib/pwlib-1.9.1.ebuild b/dev-libs/pwlib/pwlib-1.9.1.ebuild index 637e5c3..98f4b00 100644 --- a/dev-libs/pwlib/pwlib-1.9.1.ebuild +++ b/dev-libs/pwlib/pwlib-1.9.1.ebuild @@ -4,7 +4,7 @@ inherit eutils flag-o-matic multilib -IUSE="alsa esd ieee1394 sdl ssl v4l2" +IUSE="alsa esd ieee1394 ipv6 oss sdl ssl v4l2" DESCRIPTION="Portable Multiplatform Class Libraries for OpenH323" HOMEPAGE="http://www.voxgratia.org/" @@ -37,21 +37,24 @@ S="${WORKDIR}/${PN}_v${PV//./_}" src_unpack() { tar -xzf ${DISTDIR}/${A} -C ${WORKDIR} || die "Unpacking failed" - cd ${S}/make + cd ${S} # filter out -O3 and -mcpu embedded compiler flags sed -i \ -e "s:-mcpu=\$(CPUTYPE)::" \ -e "s:-O3 -DNDEBUG:-DNDEBUG:" \ - unix.mak + make/unix.mak # newer esound package doesn't install libesd.a anymore, # use dynamic library instead (fixes #100432) epatch ${FILESDIR}/pwlib-1.6.3-dyn-esd.patch + + # don't break make install if there are no plugins to install + epatch ${FILESDIR}/pwlib-1.8.7-instplugins.diff } src_compile() { - local plugins myconf + local myconf="" # may cause ICE (bug #70638) filter-flags -fstack-protector @@ -67,21 +70,7 @@ src_compile() { #use ipv6 \ # && myconf="${myconf} --enable-ipv6" \ # || myconf="${myconf} --disable-ipv6" - myconf="--enable-ipv6" - - # plugins, oss and v4l are default - plugins="oss v4l" - - use ieee1394 \ - && plugins="${plugins} avc dc" - - use alsa \ - && plugins="${plugins} alsa" - - if use v4l2; then - myconf="${myconf} --enable-v4l2" - plugins="${plugins} v4l2" - fi +# myconf="--enable-ipv6" if use esd; then # fixes bug #45059 @@ -93,12 +82,15 @@ src_compile() { ${S}/make/unix.mak fi - # merge plugin options (safe way if default = "") - plugins="$(echo ${plugins} | sed -e "y: :,:")" - - econf ${myconf} \ + econf \ --enable-plugins \ - --with-plugins="${plugins}" || die "configure failed" + $(use_enable v4l2) \ + $(use_enable ieee1394 dc) \ + $(use_enable ieee1394 avc) \ + $(use_enable oss) \ + $(use_enable alsa) \ + $(use_enable ipv6) \ + ${myconf} || die "configure failed" # Horrible hack to strip out -L/usr/lib to allow upgrades # problem is it adds -L/usr/lib before -L${S} when SSL is |