summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2016-07-29 18:32:03 (GMT)
committerBritney Fransen <brfransen@gmail.com>2016-07-29 18:32:03 (GMT)
commitdf1c3e693dc27b64c9522d7f6559d8990a723875 (patch)
tree5842c4889d5fb85028140adfdeafb257a2e6399d
parenta40d73512e20b9aadb9d56320f00d174d4d5c1ff (diff)
downloadlinhes_pkgbuild-df1c3e693dc27b64c9522d7f6559d8990a723875.zip
linhes_pkgbuild-df1c3e693dc27b64c9522d7f6559d8990a723875.tar.gz
linhes_pkgbuild-df1c3e693dc27b64c9522d7f6559d8990a723875.tar.bz2
xorg-server: update to 1.18.4
-rw-r--r--abs/core/xorg-server/PKGBUILD23
-rw-r--r--abs/core/xorg-server/call-eglBindAPI-after-eglInitialize.patch48
2 files changed, 8 insertions, 63 deletions
diff --git a/abs/core/xorg-server/PKGBUILD b/abs/core/xorg-server/PKGBUILD
index f560aca..0f85a53 100644
--- a/abs/core/xorg-server/PKGBUILD
+++ b/abs/core/xorg-server/PKGBUILD
@@ -4,8 +4,8 @@
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-xwayland' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.18.3
-pkgrel=2
+pkgver=1.18.4
+pkgrel=1
arch=('i686' 'x86_64')
license=('custom')
groups=('xorg')
@@ -18,25 +18,18 @@ makedepends=('pixman' 'libx11' 'mesa' 'mesa-libgl' 'xf86driproto' 'xcmiscproto'
'xcb-util' 'xcb-util-image' 'xcb-util-renderutil' 'xcb-util-wm' 'xcb-util-keysyms' 'dri3proto'
'libxshmfence' 'libunwind')
source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2{,.sig}
- xvfb-run
- xvfb-run.1
Xwrapper.config
- call-eglBindAPI-after-eglInitialize.patch)
+ xvfb-run
+ xvfb-run.1)
validpgpkeys=('7B27A3F1A6E18CD9588B4AE8310180050905E40C'
'C383B778255613DFDB409D91DB221A6900000011'
'DD38563A8A8224537D1F90E45B8A2D50A0ECD0D3')
-sha256sums=('ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd'
+sha256sums=('278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8'
'SKIP'
- 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
- '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
'b69ea4a8362b720aee65064534038e33ff8aa558437bcb619d1173f7e8ad3444'
- '45fdc2a1241d458756c41a93c01846e04cc75f3c75f81f48b61533d08280918d')
-
-prepare() {
- cd "${pkgbase}-${pkgver}"
+ 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
+ '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776')
- patch -Np1 -i ../call-eglBindAPI-after-eglInitialize.patch
-}
build() {
cd "${pkgbase}-${pkgver}"
@@ -120,7 +113,7 @@ package_xorg-server() {
# distro specific files must be installed in /usr/share/X11/xorg.conf.d
install -m755 -d "${pkgdir}/etc/X11/xorg.conf.d"
-
+
# LinHES Xwrapper.config
install -m644 "${srcdir}/Xwrapper.config" "${pkgdir}/etc/X11/Xwrapper.config"
diff --git a/abs/core/xorg-server/call-eglBindAPI-after-eglInitialize.patch b/abs/core/xorg-server/call-eglBindAPI-after-eglInitialize.patch
deleted file mode 100644
index 09773a2..0000000
--- a/abs/core/xorg-server/call-eglBindAPI-after-eglInitialize.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/glamor/glamor_egl.c b/glamor/glamor_egl.c
-index 4bcd3ce..16a20a7 100644
---- a/glamor/glamor_egl.c
-+++ b/glamor/glamor_egl.c
-@@ -770,11 +770,6 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
-
- glamor_egl->has_gem = glamor_egl_check_has_gem(fd);
-
--#ifndef GLAMOR_GLES2
-- eglBindAPI(EGL_OPENGL_API);
--#else
-- eglBindAPI(EGL_OPENGL_ES_API);
--#endif
- if (!eglInitialize
- (glamor_egl->display, &glamor_egl->major, &glamor_egl->minor)) {
- xf86DrvMsg(scrn->scrnIndex, X_ERROR, "eglInitialize() failed\n");
-@@ -782,6 +777,12 @@ glamor_egl_init(ScrnInfoPtr scrn, int fd)
- goto error;
- }
-
-+#ifndef GLAMOR_GLES2
-+ eglBindAPI(EGL_OPENGL_API);
-+#else
-+ eglBindAPI(EGL_OPENGL_ES_API);
-+#endif
-+
- version = eglQueryString(glamor_egl->display, EGL_VERSION);
- xf86Msg(X_INFO, "%s: EGL version %s:\n", glamor_name, version);
-
-diff --git a/hw/xwayland/xwayland-glamor.c b/hw/xwayland/xwayland-glamor.c
-index ad66cf6..73ccd71 100644
---- a/hw/xwayland/xwayland-glamor.c
-+++ b/hw/xwayland/xwayland-glamor.c
-@@ -298,12 +298,13 @@ xwl_drm_init_egl(struct xwl_screen *xwl_screen)
- return;
- }
-
-- eglBindAPI(EGL_OPENGL_API);
- if (!eglInitialize(xwl_screen->egl_display, &major, &minor)) {
- ErrorF("eglInitialize() failed\n");
- return;
- }
-
-+ eglBindAPI(EGL_OPENGL_API);
-+
- version = eglQueryString(xwl_screen->egl_display, EGL_VERSION);
- ErrorF("glamor: EGL version %s:\n", version);
-