From owner-svn-ports-all@freebsd.org Tue Nov 3 17:48:06 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5B25745ED28; Tue, 3 Nov 2020 17:48:06 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CQch61k9kz4CS8; Tue, 3 Nov 2020 17:48:06 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 010D61E81A; Tue, 3 Nov 2020 17:48:05 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A3Hm5ev054693; Tue, 3 Nov 2020 17:48:05 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A3Hm5AW054691; Tue, 3 Nov 2020 17:48:05 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202011031748.0A3Hm5AW054691@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Tue, 3 Nov 2020 17:48:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r554002 - in head/x11-drivers/xorgxrdp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in head/x11-drivers/xorgxrdp: . files X-SVN-Commit-Revision: 554002 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2020 17:48:06 -0000 Author: 0mp Date: Tue Nov 3 17:48:05 2020 New Revision: 554002 URL: https://svnweb.freebsd.org/changeset/ports/554002 Log: Clean up the port - Set LICENSE_FILE - Switch to USES=localbase - Simplify handling of SUB_FILES for option DRI3 - Fix a couple of typos in pkg-message We should probably install /etc/X11/xrdp/xorg.conf as a @sample, but that's probably something that the maintainer should take a look at. Approved by: portmgr (blanket) Modified: head/x11-drivers/xorgxrdp/Makefile head/x11-drivers/xorgxrdp/files/pkg-message.in Modified: head/x11-drivers/xorgxrdp/Makefile ============================================================================== --- head/x11-drivers/xorgxrdp/Makefile Tue Nov 3 16:03:58 2020 (r554001) +++ head/x11-drivers/xorgxrdp/Makefile Tue Nov 3 17:48:05 2020 (r554002) @@ -12,11 +12,12 @@ MAINTAINER= meta@FreeBSD.org COMMENT= X.Org driver enabling use through an RDP session with xrdp LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= xauth:x11/xauth BUILD_DEPENDS= nasm:devel/nasm -USES= autoreconf libtool:build pkgconfig xorg +USES= autoreconf libtool:build localbase pkgconfig xorg USE_XORG= xorgproto xorg-server USE_LDCONFIG= yes USE_GITHUB= yes @@ -27,8 +28,6 @@ GH_TAGNAME= v0.9.14:xrdp GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -CFLAGS+= -I${LOCALBASE}/include -LIBS= -L${LOCALBASE}/lib CONFIGURE_ENV= XRDP_CFLAGS=-I${WRKSRC_xrdp}/common OPTIONS_DEFINE= DEBUG DRI3 @@ -37,17 +36,12 @@ OPTIONS_DEFAULT= DRI3_DESC= DRI3/Glamor OpenGL Support DRI3_CONFIGURE_ENABLE= glamor DRI3_LIB_DEPENDS= libepoxy.so:graphics/libepoxy +DRI3_SUB_FILES= pkg-message -.include - -.if ${PORT_OPTIONS:MDRI3} -SUB_FILES= pkg-message -.endif - post-patch-DEBUG-on: ${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|#define LOG_LEVEL [0-9]*|#define LOG_LEVEL 20|' pre-configure: @cd ${WRKSRC} && ./bootstrap -.include +.include Modified: head/x11-drivers/xorgxrdp/files/pkg-message.in ============================================================================== --- head/x11-drivers/xorgxrdp/files/pkg-message.in Tue Nov 3 16:03:58 2020 (r554001) +++ head/x11-drivers/xorgxrdp/files/pkg-message.in Tue Nov 3 17:48:05 2020 (r554002) @@ -13,7 +13,7 @@ To configure hardware acceleration, follow the followi # sysrc kld_list="/boot/modules/amdgpu.ko" # sysrc kld_list="/boot/modules/radeonkms.ko" -3. Ensure users who login via xrdp are member of the "video" group +3. Ensure users who login via xrdp are members of the "video" group # pw groupmod video -m username|| pw groupmod wheel -m username 4. Edit /etc/X11/xrdp/xorg.conf to fit your environment @@ -22,7 +22,7 @@ To configure hardware acceleration, follow the followi Find the following line and change it to the actual path. Option "DRMDevice" "/dev/dri/renderD128" - Chenge "0" to "1" of the following line. + Change "0" to "1" of the following line. Option "DRI3" "0" 5. Restart your system and login via xrdp