Skip to contentSkip to conversation

xserver-xorg-cvt-native: initial add 1.20.5

PATCH New Andreas Müller 1 participant 2 messages Dec 2, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 xserver-xorg-cvt-native: initial add 1.20.5

upcoming mutter requires cvt to calculate source code tables of default video modes - wow

---
V1 -> V2: Fix build on x-less hosts by adding xorgproto-native libxrandr-native to DEPENDS

 .../xserver-xorg-cvt-native_1.20.5.bb         | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb
meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.5.bb new file +41 -0
new file mode 100644
index 000000000..1d75d52d2
@@ -0,0 +1,41 @@
+SUMMARY = "X.Org X cvt"
+HOMEPAGE = "https://linux.die.net/man/1/cvt"
+LICENSE = "MIT-X"
+LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
+
+DEPENDS += "pixman-native xorgproto-native libxrandr-native"
+
+XORG_PN = "xorg-server"
+
+SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
+SRC_URI[md5sum] = "c9fc7e21e11286dbedd22c00df652130"
+SRC_URI[sha256sum] = "a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d"
+
+S = "${WORKDIR}/${XORG_PN}-${PV}"
+B = "${WORKDIR}/build"
+
+inherit native pkgconfig
+
+do_configure[noexec] = "1"
+
+do_compile() {
+    cd ${S}
+    for header in `find -name '*.h'`; do
+        path=`dirname $header`
+        if ! echo "$incpaths" | grep -q "$path" ; then
+            incpaths="$incpaths -I$path"
+        fi
+    done
+    CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`"
+    LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`"
+    ${CC} $CFLAGS -o ${B}/cvt \
+        ${S}/hw/xfree86/utils/cvt/cvt.c \
+        ${S}/hw/xfree86/modes/xf86cvt.c \
+        ${S}/os/xprintf.c \
+        $LDFLAGS
+}
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 755 ${B}/cvt ${D}${bindir}
+}
Signature · 1 line
2.21.0
#1 lore raw

PATCH v2 2/2 mutter: initial add 3.34.1

V1 -> V2:
* rework PACKAGECONFIGs: particularly glx has to be added to opengl/x11 / remove remote-desktop
* add patch to fix GLES2 fallback for ancient targets

---
 .../mutter/0001-cogl-Fix-GLES2-fallback.patch | 37 +++++++
 .../recipes-gnome/mutter/mutter_3.34.1.bb     | 96 +++++++++++++++++++
 2 files changed, 133 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/mutter/mutter/0001-cogl-Fix-GLES2-fallback.patch
 create mode 100644 meta-gnome/recipes-gnome/mutter/mutter_3.34.1.bb
meta-gnome/recipes-gnome/mutter/mutter/0001-cogl-Fix-GLES2-fallback.patch new file +37 -0
new file mode 100644
index 000000000..ec9200042
@@ -0,0 +1,37 @@
+From f4f7e31303d78b2a8a0881b61311b8d750301b8f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <[email protected]>
+Date: Tue, 29 Oct 2019 11:53:27 -0400
+Subject: [PATCH] cogl: Fix GLES2 fallback
+
+Say you're using intel gen3, you poor soul. Your big-GL maxes out at 1.5
+unless you use dirty tricks, but you do have GLES2. We try to fall back
+to GLES in this case, but we only ever say eglBindAPI(EGL_OPENGL_API).
+So when we go to do CreateContext, even though we think we've requested
+GLES 2.0, the driver will compare that "2.0" against the maximum big-GL
+version, and things will fail.
+
+Fix this by binding EGL_OPENGL_ES_API before trying a GLES context.
+
+https://gitlab.gnome.org/GNOME/mutter/issues/635
+
+Upstream-Status: Applied
+---
+ cogl/cogl/winsys/cogl-winsys-egl.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cogl/cogl/winsys/cogl-winsys-egl.c b/cogl/cogl/winsys/cogl-winsys-egl.c
+index 99dcb8bf3..f2b439a67 100644
+--- a/cogl/cogl/winsys/cogl-winsys-egl.c
++++ b/cogl/cogl/winsys/cogl-winsys-egl.c
+@@ -329,6 +329,8 @@ try_create_context (CoglDisplay *display,
+   if (renderer->driver == COGL_DRIVER_GL ||
+       renderer->driver == COGL_DRIVER_GL3)
+     eglBindAPI (EGL_OPENGL_API);
++  else if (renderer->driver == COGL_DRIVER_GLES2)
++    eglBindAPI (EGL_OPENGL_ES_API);
+ 
+   egl_attributes_from_framebuffer_config (display,
+                                           &display->onscreen_template->config,
+-- 
+2.21.0
+
meta-gnome/recipes-gnome/mutter/mutter_3.34.1.bb new file +96 -0

96 lines not on this page · raw message

Signature · 1 line
2.21.0