net-misc/tigervnc: keywords xinerama dri3.

Package-Manager: Portage-2.3.13, Repoman-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/6581

diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 8dfc0c1b9f1d0f990396f4465d0c028168ce5ed6..4dd36932fca4d667e9b7d233ab84e0c06f3e33ed 100644 (file)
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -10,9 +10,10 @@
         <name>Proxy Maintainers</name>
     </maintainer>
   <use>
-    <flag name="drm">build with DRM support</flag>
+    <flag name="drm">Build with DRM support</flag>
     <flag name="server">Build TigerVNC server</flag>
     <flag name="xorgmodule">Build the Xorg module</flag>
+    <flag name="dri3">Build with DRI3 support </flag>
   </use>
   <upstream>
     <remote-id type="github">TigerVNC/tigervnc</remote-id>

diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
index 745ac50ae66340a23c8754b74498af2cc7c86291..6a4c05c325fb220001b1487417ff8811e63a49fe 100644 (file)
--- a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r1.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="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule xinerama dri3"
 
 CDEPEND="virtual/jpeg:0
        sys-libs/zlib
@@ -40,7 +40,10 @@ CDEPEND="virtual/jpeg:0
                opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
                xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
                drm? ( x11-libs/libdrm )
-       )"
+       )
+       xinerama? ( x11-libs/libXinerama )
+       dri3? ( x11-proto/dri3proto )
+       "
 
 RDEPEND="${CDEPEND}
        !net-misc/tightvnc
@@ -121,7 +124,7 @@ src_configure() {
                        --disable-devel-docs \
                        --disable-dmx \
                        --disable-dri \
-                       --disable-dri3 \
+                       $(use_enable dri3) \
                        --disable-glamor \
                        --disable-kdrive \
                        --disable-libunwind \
@@ -133,7 +136,7 @@ src_configure() {
                        --disable-tslib \
                        --disable-unit-tests \
                        --disable-xephyr \
-                       --disable-xinerama \
+                       $(use_enable xinerama) \
                        --disable-xnest \
                        --disable-xorg \
                        --disable-xvfb \
@@ -153,7 +156,7 @@ src_compile() {
        if use server; then
                # deps of the vnc module and the module itself
                local d subdirs=(
-                       fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+                       fb xfixes Xext dbe $(usex opengl glx "") $(usex dri3 dri3 "") randr render damageext miext Xi xkb
                        composite dix mi os hw/vnc
                )
                for d in "${subdirs[@]}"; do

diff --git a/net-misc/tigervnc/tigervnc-1.8.0.ebuild b/net-misc/tigervnc/tigervnc-1.8.0.ebuild
index 167052d8bef3fa37c2f68dc1bdfc7196b68e70ef..3adc2034305816059eb86a31e85f35b7e5358b51 100644 (file)
--- a/net-misc/tigervnc/tigervnc-1.8.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.8.0.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="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule xinerama dri3"
 
 CDEPEND="virtual/jpeg:0
        sys-libs/zlib
@@ -40,7 +40,10 @@ CDEPEND="virtual/jpeg:0
                opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
                xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
                drm? ( x11-libs/libdrm )
-       )"
+       )
+       xinerama? ( x11-libs/libXinerama )
+       dri3? ( x11-proto/dri3proto )
+       "
 
 RDEPEND="${CDEPEND}
        !net-misc/tightvnc
@@ -120,7 +123,7 @@ src_configure() {
                        --disable-devel-docs \
                        --disable-dmx \
                        --disable-dri \
-                       --disable-dri3 \
+                       $(use_enable dri3) \
                        --disable-glamor \
                        --disable-kdrive \
                        --disable-libunwind \
@@ -132,7 +135,7 @@ src_configure() {
                        --disable-tslib \
                        --disable-unit-tests \
                        --disable-xephyr \
-                       --disable-xinerama \
+                       $(use_enable xinerama) \
                        --disable-xnest \
                        --disable-xorg \
                        --disable-xvfb \
@@ -152,7 +155,7 @@ src_compile() {
        if use server; then
                # deps of the vnc module and the module itself
                local d subdirs=(
-                       fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+                       fb xfixes Xext dbe $(usex opengl glx "") $(usex dri3 dri3 "") randr render damageext miext Xi xkb
                        composite dix mi os hw/vnc
                )
                for d in "${subdirs[@]}"; do