diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | glamor.patch | 29 |
3 files changed, 4 insertions, 33 deletions
@@ -1,7 +1,7 @@ pkgbase = xorgxrdp-glamor pkgdesc = Xorg drivers for xrdp, with glamor enabled. Only works on Intel and AMD GPUs. pkgver = 0.2.16 - pkgrel = 1 + pkgrel = 2 url = https://github.com/neutrinolabs/xorgxrdp arch = i686 arch = x86_64 @@ -19,7 +19,7 @@ pkgbase = xorgxrdp-glamor validpgpkeys = 61ECEABBF2BB40E3A35DF30A9F72CDBC01BF10EB sha256sums = e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215 sha256sums = SKIP - sha256sums = 2d9f0b6a223aa65d553c07356d7862193af04a7afac792c28822a6304306a2f4 + sha256sums = c3c219a863508c076f4f24ae2407be0997a915fa6f118ca8bbc83cd333d421f0 pkgname = xorgxrdp-glamor @@ -3,7 +3,7 @@ _pkgname=xorgxrdp pkgname=xorgxrdp-glamor pkgver=0.2.16 -pkgrel=1 +pkgrel=2 pkgdesc="Xorg drivers for xrdp, with glamor enabled. Only works on Intel and AMD GPUs." arch=('i686' 'x86_64') url="https://github.com/neutrinolabs/xorgxrdp" @@ -17,7 +17,7 @@ source=("https://github.com/neutrinolabs/xorgxrdp/releases/download/v$pkgver/xor 'glamor.patch') sha256sums=('e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215' 'SKIP' - '2d9f0b6a223aa65d553c07356d7862193af04a7afac792c28822a6304306a2f4') + 'c3c219a863508c076f4f24ae2407be0997a915fa6f118ca8bbc83cd333d421f0') validpgpkeys=('61ECEABBF2BB40E3A35DF30A9F72CDBC01BF10EB') # Koichiro IWAO <meta@vmeta.jp> prepare () { diff --git a/glamor.patch b/glamor.patch index cc662a0652d5..0199a1276208 100644 --- a/glamor.patch +++ b/glamor.patch @@ -1,18 +1,3 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,9 @@ PKG_CHECK_MODULES([XORG_SERVER], [xorg-server >= 0], [], - [AC_MSG_ERROR([please install xserver-xorg-dev, xorg-x11-server-sdk or xorg-x11-server-devel])]) - if test "x${enable_glamor}" = "xyes"; then - PKG_CHECK_MODULES([XORG_SERVER_GLAMOR], [xorg-server >= 1.19.0]) -+ PKG_CHECK_MODULES([LIBDRM], [libdrm]) -+ PKG_CHECK_MODULES([EPOXY], [epoxy]) -+ PKG_CHECK_VAR([XORG_SERVER_MODULES], [xorg-server], [moduledir]) - fi - - if test "x$XRDP_CFLAGS" = "x"; then - - - --- a/module/Makefile.am +++ b/module/Makefile.am @@ -22,12 +22,13 @@ if WITH_GLAMOR @@ -67,17 +52,3 @@ xrdpkeyb_drv_ladir = $(moduledir)/input - - ---- a/xrdpdev/xorg.conf -+++ b/xrdpdev/xorg.conf -@@ -7,6 +7,9 @@ - EndSection - - Section "ServerFlags" -+ # This line prevents "ServerLayout" sections in xorg.conf.d files -+ # overriding the "X11 Server" layout (xrdp #1784) -+ Option "DefaultServerLayout" "X11 Server" - Option "DontVTSwitch" "on" - Option "AutoAddDevices" "off" - EndSection |