summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Mazo <ahippo@yandex.com>2016-09-24 22:18:01 +0300
committerPatrice Clement <monsieurp@gentoo.org>2016-10-21 10:52:41 +0200
commit4bad3a71061f79dec34fbc5c28ad54cc7a5c579e (patch)
tree1492b14b439d2f393f25358b8d3d97183e526c7d /net-misc
parentnet-misc/apt-cacher-ng: Depend on dev-libs/openssl (bug #597672). (diff)
downloadgentoo-4bad3a71061f79dec34fbc5c28ad54cc7a5c579e.tar.gz
gentoo-4bad3a71061f79dec34fbc5c28ad54cc7a5c579e.tar.bz2
gentoo-4bad3a71061f79dec34fbc5c28ad54cc7a5c579e.zip
net-misc/tigervnc: add drm USE-flag to fix headless compilation.
Thanks to prometheanfire, libdrm dependency is now correct. This PR also fixes the USE="server -opengl" compilation problem. Gentoo-Bug: https://bugs.gentoo.org/592038 Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/2404 Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/tigervnc/metadata.xml1
-rw-r--r--net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild6
2 files changed, 5 insertions, 2 deletions
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 401f3cee5d26..8df2e3d37a80 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -3,6 +3,7 @@
<pkgmetadata>
<!-- maintainer needed -->
<use>
+ <flag name="drm">build with DRM support</flag>
<flag name="server">Build TigerVNC server</flag>
<flag name="xorgmodule">Build the Xorg module</flag>
</use>
diff --git a/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
index b73f522234d9..df8121d51c2e 100644
--- a/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86"
-IUSE="gnutls java +opengl pam server +xorgmodule"
+IUSE="+drm gnutls java +opengl pam server +xorgmodule"
RDEPEND="virtual/jpeg:0
sys-libs/zlib
@@ -39,6 +39,7 @@ RDEPEND="virtual/jpeg:0
>=x11-misc/xkeyboard-config-2.4.1-r3
opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+ drm? ( x11-libs/libdrm )
)
!net-misc/vnc
!net-misc/tightvnc
@@ -108,6 +109,7 @@ src_configure() {
cd unix/xserver || die
econf \
$(use_enable opengl glx) \
+ $(use_enable drm libdrm) \
--disable-config-hal \
--disable-config-udev \
--disable-devel-docs \
@@ -145,7 +147,7 @@ src_compile() {
if use server; then
# deps of the vnc module and the module itself
local d subdirs=(
- fb xfixes Xext dbe glx randr render damageext miext Xi xkb
+ fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
composite dix mi os hw/vnc
)
for d in "${subdirs[@]}"; do