summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir Lamouri <volkmar@gentoo.org>2009-03-20 01:39:25 +0000
committerMounir Lamouri <volkmar@gentoo.org>2009-03-20 01:39:25 +0000
commitb7225d4d9c992aa020775ac009b313d22ac14b1c (patch)
tree32861c76a65506b280f1c5db79a88eea2909ebbb /net-libs
parentnet-libs/ptlib: fixing install when debug enabled (diff)
downloadvoip-b7225d4d9c992aa020775ac009b313d22ac14b1c.tar.gz
voip-b7225d4d9c992aa020775ac009b313d22ac14b1c.tar.bz2
voip-b7225d4d9c992aa020775ac009b313d22ac14b1c.zip
net-libs/ptlib: fixing build with video disabled and sdl enabled by blocking this configuration
svn path=/trunk/; revision=818
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/ptlib/ChangeLog4
-rw-r--r--net-libs/ptlib/Manifest4
-rw-r--r--net-libs/ptlib/ptlib-2.4.5-r1.ebuild15
3 files changed, 18 insertions, 5 deletions
diff --git a/net-libs/ptlib/ChangeLog b/net-libs/ptlib/ChangeLog
index 1c57782..0a94c5c 100644
--- a/net-libs/ptlib/ChangeLog
+++ b/net-libs/ptlib/ChangeLog
@@ -4,6 +4,10 @@
20 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
ptlib-2.4.5-r1.ebuild:
+ Blocking emerge if video is disabled and sdl enabled
+
+ 20 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
+ ptlib-2.4.5-r1.ebuild:
Fixing install with debug enabled
15 Mar 2009; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com>
diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
index e775176..1f50b25 100644
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -1,6 +1,6 @@
AUX ptlib-asm.patch 561 RMD160 3825ccdf533c614d6ed5ec2462e0b4308d72225b SHA1 3d9547f09baec55729bf8c8465064a67226b4bec SHA256 f97c433c846f9280c8f2e30b2ca3c618059bc4b809e892bb1ad7eba900b5e670
DIST ptlib-2.4.5-htmldoc.tar.bz2 2082811 RMD160 b0afab6eecb040d7433293ed232ad534149a47bf SHA1 6aec9971ca03704b9a0818a5479b0f92d480a99f SHA256 20f9e3770520781dfe390768133fde1d1ef1b55c6320ef25905bb36da99c1ccb
DIST ptlib-2.4.5.tar.bz2 2961858 RMD160 dd66ef8fc2edf470fce436ab1d3acc7c24d028d5 SHA1 b19d0590a77a66cded4556aea49d4a9ba81ed21f SHA256 06e17d81368106bcea103af42dfbb00e531645fbe0ea838dc4c8516608e889ae
-EBUILD ptlib-2.4.5-r1.ebuild 8593 RMD160 c8006a28e4372defe3f1bea3ee2506fe3e1e11b7 SHA1 35a65f7280efe6deb2cdb479a299287f56e65156 SHA256 0e0b5dced52b135ff300994693acdd4558d5ad709324e6811a645837f05bef36
-MISC ChangeLog 1065 RMD160 0c5d298438124ef02e5b5477730267cc7f511ba0 SHA1 6030c481e34e20ff0a47896b7c2e9e0717926cbc SHA256 b0978357ccf0df3b40c35571941827e7f1b6bfa0bc6e3df989c72c79144ef942
+EBUILD ptlib-2.4.5-r1.ebuild 8943 RMD160 a7cda0ad18ff3db2323d2aec9ea881dbb0cb5e13 SHA1 6d147b97667fdee259ecac91c8746b9673696fb7 SHA256 42a106bfd9227479298ce906001a4fffbd3ff843d5a53d493f05bf624bd5fd4d
+MISC ChangeLog 1213 RMD160 fa12d5233629236678c3455d53e8613f53be45f5 SHA1 898be6456a9a94e4c5e1ea678f0fb5e184fa1720 SHA256 cc03fcd6d4cc6379852c960dea6ccd88fe5b94c26996a72b7ae8fac507e793d4
MISC metadata.xml 1399 RMD160 6f7041ad693635a3cee1226eb914143dbfcecf55 SHA1 60331a1d8cb47e8bf0b8b8e91a5b021863699979 SHA256 7db5a0e0a077970d1873295c170b1a675cd3a034fb6cb7751f967938aeb995ed
diff --git a/net-libs/ptlib/ptlib-2.4.5-r1.ebuild b/net-libs/ptlib/ptlib-2.4.5-r1.ebuild
index ba2e748..df1781b 100644
--- a/net-libs/ptlib/ptlib-2.4.5-r1.ebuild
+++ b/net-libs/ptlib/ptlib-2.4.5-r1.ebuild
@@ -62,9 +62,18 @@ pkg_setup() {
fi
if ! use video; then
- ewarn "disabling video will remove all video support"
- ewarn "even if other video features have been enabled"
- warning=true
+ if use sdl; then
+ # video disabled and sdl disabled make compilation to crash
+ # upstream has been contacted, see bug 2696064 in their bugtracker
+ eerror "video has been disabled and sdl has been enabled"
+ eerror "${PN} can't build with this configuration"
+ eerror "please, enablde video or disable sdl and re-emerge"
+ die
+ else
+ ewarn "disabling video will remove all video support"
+ ewarn "even if other video features have been enabled"
+ warning=true
+ fi
fi
if use jabber && ! use xml; then