From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2AA93139083 for ; Mon, 25 Dec 2017 00:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3C3CBE107B; Mon, 25 Dec 2017 00:19:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1088DE107B for ; Mon, 25 Dec 2017 00:19:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 320EA33D4A6 for ; Mon, 25 Dec 2017 00:19:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA427AFCE for ; Sun, 24 Dec 2017 17:11:56 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1514135456.9e5b6fd8dd30f499304aed3a2f23a2eb8702b70c.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/tigervnc/metadata.xml net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild net-misc/tigervnc/tigervnc-1.8.0.ebuild X-VCS-Directories: net-misc/tigervnc/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 9e5b6fd8dd30f499304aed3a2f23a2eb8702b70c X-VCS-Branch: master Date: Sun, 24 Dec 2017 17:11:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1a8b0fe3-316e-4e89-8a20-a37ab0c6e414 X-Archives-Hash: d74bcfff87e08134d2815847420bfe17 commit: 9e5b6fd8dd30f499304aed3a2f23a2eb8702b70c Author: xdch47 posteo de> AuthorDate: Tue Dec 19 12:00:40 2017 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sun Dec 24 17:10:56 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e5b6fd8 net-misc/tigervnc: keywords xinerama dri3. Package-Manager: Portage-2.3.13, Repoman-2.3.3 Closes: https://github.com/gentoo/gentoo/pull/6581 net-misc/tigervnc/metadata.xml | 3 ++- net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild | 13 ++++++++----- net-misc/tigervnc/tigervnc-1.8.0.ebuild | 13 ++++++++----- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml index 8dfc0c1b9f1..4dd36932fca 100644 --- a/net-misc/tigervnc/metadata.xml +++ b/net-misc/tigervnc/metadata.xml @@ -10,9 +10,10 @@ Proxy Maintainers - build with DRM support + Build with DRM support Build TigerVNC server Build the Xorg module + Build with DRI3 support TigerVNC/tigervnc diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild index 745ac50ae66..6a4c05c325f 100644 --- 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 167052d8bef..3adc2034305 100644 --- 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