summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--glamor.patch8
3 files changed, 8 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c4f6cb832c0e..ac806d5b1ab0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -19,7 +19,7 @@ pkgbase = xorgxrdp-glamor
validpgpkeys = 61ECEABBF2BB40E3A35DF30A9F72CDBC01BF10EB
sha256sums = e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215
sha256sums = SKIP
- sha256sums = 2fd812f4e7cb649d9af4c75b0115b31154e8ac5b8d95c601251f515b177cb847
+ sha256sums = 10d289d1a11c9a5a8b4c6af534c2f9e7900ae2b4351860a063ba572010d95912
pkgname = xorgxrdp-glamor
diff --git a/PKGBUILD b/PKGBUILD
index 1c9764c9457a..a67997e6be1e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@ source=("https://github.com/neutrinolabs/xorgxrdp/releases/download/v$pkgver/xor
'glamor.patch')
sha256sums=('e6b5f3df44cbf147dcbbc326cdd08c95fe28dba80c2a216e046fe42d962f9215'
'SKIP'
- '2fd812f4e7cb649d9af4c75b0115b31154e8ac5b8d95c601251f515b177cb847')
+ '10d289d1a11c9a5a8b4c6af534c2f9e7900ae2b4351860a063ba572010d95912')
validpgpkeys=('61ECEABBF2BB40E3A35DF30A9F72CDBC01BF10EB') # Koichiro IWAO <meta@vmeta.jp>
prepare () {
diff --git a/glamor.patch b/glamor.patch
index 10fcecd60cfe..b20f8a553376 100644
--- a/glamor.patch
+++ b/glamor.patch
@@ -1,13 +1,17 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -25,6 +25,7 @@ PKG_CHECK_MODULES([XORG_SERVER], [xorg-server >= 0], [],
+@@ -25,9 +25,11 @@ 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([XORG_SERVER_DRM], [drm >= 0], [], [AC_MSG_ERROR([please install libdrm-dev or libdrm-devel])])
++ PKG_CHECK_MODULES([LIBDRM], [libdrm >= 0], [], [AC_MSG_ERROR([please install libdrm-dev or libdrm-devel])])
PKG_CHECK_MODULES([XORG_SERVER_GBM], [gbm >= 0], [], [AC_MSG_ERROR([please install libgbm-dev or mesa-libgbm-devel])])
PKG_CHECK_MODULES([XORG_SERVER_EPOXY], [epoxy >= 0], [], [AC_MSG_ERROR([please install libepoxy-dev or libepoxy-devel])])
PKG_CHECK_MODULES([XORG_SERVER_EGL], [egl >= 0], [], [AC_MSG_ERROR([please install libegl1-mesa-dev or mesa-libEGL-devel])])
++ PKG_CHECK_VAR([XORG_SERVER_MODULES], [xorg-server], [moduledir])
+ fi
+
+ if test "x$XRDP_CFLAGS" = "x"; then