[patch] tigervnc-1.11.0-r4.ebuild to tigervnc-9999.ebuild patch

tigervnc-to-9999.patch (text/plain), 2.49 KB, created by Jan Psota on 2021-12-06 18:21:53 UTC

--- tigervnc-1.11.0-r4.ebuild	2021-09-17 10:25:24.161735689 +0200
+++ tigervnc-9999.ebuild	2021-12-06 19:07:15.594244996 +0100
@@ -4,19 +4,19 @@
 EAPI=7
 CMAKE_IN_SOURCE_BUILD=1
 
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg
+inherit autotools cmake flag-o-matic git-r3 systemd xdg
 
-XSERVER_VERSION="1.20.0"
+XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2	)"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule"
+KEYWORDS=""
+IUSE="dri3 +drm gnutls nls +opengl pam server xinerama +xorgmodule"
 
 CDEPEND="
 	virtual/jpeg:0
@@ -28,6 +28,7 @@
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
+	x11-libs/libxcvt
 	x11-libs/pixman
 	server? (
 		x11-libs/libXau
@@ -49,12 +50,10 @@
 RDEPEND="${CDEPEND}
 	!net-misc/tightvnc
 	!net-misc/vnc
-	!net-misc/xf4vnc
-	java? ( virtual/jre:1.8 )"
+	!net-misc/xf4vnc"
 
 DEPEND="${CDEPEND}
 	nls? ( sys-devel/gettext )
-	java? ( virtual/jdk:1.8 )
 	x11-base/xorg-proto
 	media-libs/fontconfig
 	x11-libs/libICE
@@ -74,10 +73,10 @@
 		opengl? ( >=media-libs/mesa-10.3.4-r1 )
 	)"
 
-PATCHES=(
-	# Restore Java viewer
-	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
-)
+src_unpack() {
+	git-r3_src_unpack
+	unpack xorg-server-${XSERVER_VERSION}.tar.xz
+}
 
 src_prepare() {
 	if use server; then
@@ -88,11 +87,12 @@
 
 	if use server; then
 		cd unix/xserver || die
-		eapply "${FILESDIR}"/xserver120.patch
-		eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch
-		sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die
+		eapply ../xserver${XSERVER_VERSION}.patch
 		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
 	fi
+	cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
 }
 
 src_configure() {
@@ -104,7 +104,7 @@
 		-DENABLE_GNUTLS=$(usex gnutls)
 		-DENABLE_NLS=$(usex nls)
 		-DENABLE_PAM=$(usex pam)
-		-DBUILD_JAVA=$(usex java)
+		-DBUILD_JAVA=no
 	)
 
 	cmake_src_configure