Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 828469 | Differences between
and this patch

Collapse All | Expand All

(-)tigervnc-1.11.0-r4.ebuild (-17 / +17 lines)
Lines 4-22 Link Here
4
EAPI=7
4
EAPI=7
5
CMAKE_IN_SOURCE_BUILD=1
5
CMAKE_IN_SOURCE_BUILD=1
6
6
7
inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
7
inherit autotools cmake flag-o-matic git-r3 systemd xdg
8
8
9
XSERVER_VERSION="1.20.0"
9
XSERVER_VERSION="21.1.1"
10
10
11
DESCRIPTION="Remote desktop viewer display system"
11
DESCRIPTION="Remote desktop viewer display system"
12
HOMEPAGE="http://www.tigervnc.org"
12
HOMEPAGE="http://www.tigervnc.org"
13
SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
13
SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
14
	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
14
EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
15
15
16
LICENSE="GPL-2"
16
LICENSE="GPL-2"
17
SLOT="0"
17
SLOT="0"
18
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
18
KEYWORDS=""
19
IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
19
IUSE="dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule"
20
20
21
CDEPEND="
21
CDEPEND="
22
	virtual/jpeg:0
22
	virtual/jpeg:0
Lines 28-33 Link Here
28
	x11-libs/libX11
28
	x11-libs/libX11
29
	x11-libs/libXext
29
	x11-libs/libXext
30
	x11-libs/libXrender
30
	x11-libs/libXrender
31
	x11-libs/libxcvt
31
	x11-libs/pixman
32
	x11-libs/pixman
32
	server? (
33
	server? (
33
		x11-libs/libXau
34
		x11-libs/libXau
Lines 49-60 Link Here
49
RDEPEND="${CDEPEND}
50
RDEPEND="${CDEPEND}
50
	!net-misc/tightvnc
51
	!net-misc/tightvnc
51
	!net-misc/vnc
52
	!net-misc/vnc
52
	!net-misc/xf4vnc
53
	!net-misc/xf4vnc"
53
	java? ( virtual/jre:1.8 )"
54
54
55
DEPEND="${CDEPEND}
55
DEPEND="${CDEPEND}
56
	nls? ( sys-devel/gettext )
56
	nls? ( sys-devel/gettext )
57
	java? ( virtual/jdk:1.8 )
58
	x11-base/xorg-proto
57
	x11-base/xorg-proto
59
	media-libs/fontconfig
58
	media-libs/fontconfig
60
	x11-libs/libICE
59
	x11-libs/libICE
Lines 74-83 Link Here
74
		opengl? ( >=media-libs/mesa-10.3.4-r1 )
73
		opengl? ( >=media-libs/mesa-10.3.4-r1 )
75
	)"
74
	)"
76
75
77
PATCHES=(
76
src_unpack() {
78
	# Restore Java viewer
77
	git-r3_src_unpack
79
	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
78
	unpack xorg-server-${XSERVER_VERSION}.tar.xz
80
)
79
}
81
80
82
src_prepare() {
81
src_prepare() {
83
	if use server; then
82
	if use server; then
Lines 88-98 Link Here
88
87
89
	if use server; then
88
	if use server; then
90
		cd unix/xserver || die
89
		cd unix/xserver || die
91
		eapply "${FILESDIR}"/xserver120.patch
90
		eapply ../xserver${XSERVER_VERSION}.patch
92
		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
93
		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
94
		eautoreconf
91
		eautoreconf
92
		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
93
		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
95
	fi
94
	fi
95
	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
96
}
96
}
97
97
98
src_configure() {
98
src_configure() {
Lines 104-110 Link Here
104
		-DENABLE_GNUTLS=$(usex gnutls)
104
		-DENABLE_GNUTLS=$(usex gnutls)
105
		-DENABLE_NLS=$(usex nls)
105
		-DENABLE_NLS=$(usex nls)
106
		-DENABLE_PAM=$(usex pam)
106
		-DENABLE_PAM=$(usex pam)
107
		-DBUILD_JAVA=$(usex java)
107
		-DBUILD_JAVA=no
108
	)
108
	)
109
109
110
	cmake_src_configure
110
	cmake_src_configure

Return to bug 828469