diff options
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-driver')
10 files changed, 0 insertions, 677 deletions
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch deleted file mode 100644 index 771a2a8e12..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev/fix-it.patch +++ /dev/null @@ -1,153 +0,0 @@ -diff --git a/src/multitouch.c b/src/multitouch.c -index c55d742..4a8192d 100644 ---- a/src/multitouch.c -+++ b/src/multitouch.c -@@ -114,7 +114,7 @@ static int init_properties(DeviceIntPtr dev) - return Success; - } - --static int device_init(DeviceIntPtr dev, LocalDevicePtr local) -+static int device_init(DeviceIntPtr dev, InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - Atom atom; -@@ -222,7 +222,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local) - xf86InitValuatorAxisStruct(dev, val, axes_labels[val], - min, - max, -- 1, 0, 1); -+ 1, 0, 1,Absolute); - xf86InitValuatorDefaults(dev, val); - } - } -@@ -232,7 +232,7 @@ static int device_init(DeviceIntPtr dev, LocalDevicePtr local) - return Success; - } - --static int device_on(LocalDevicePtr local) -+static int device_on(InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - local->fd = xf86OpenSerial(local->options); -@@ -248,7 +248,7 @@ static int device_on(LocalDevicePtr local) - return Success; - } - --static int device_off(LocalDevicePtr local) -+static int device_off(InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - xf86RemoveEnabledDevice(local); -@@ -259,12 +259,12 @@ static int device_off(LocalDevicePtr local) - return Success; - } - --static int device_close(LocalDevicePtr local) -+static int device_close(InputInfoPtr local) - { - return Success; - } - --static void process_state(LocalDevicePtr local, -+static void process_state(InputInfoPtr local, - const struct mtev_mtouch *mt) - { - -@@ -321,22 +321,22 @@ static void process_state(LocalDevicePtr local, - } - - /* Some x-clients assume they get motion events before button down */ -+ xf86Msg(X_INFO,"down %d|pdown %d\n", down, pdown); - if (down) - xf86PostMotionEventP(local->dev, TRUE, - 0, down * MT_AXIS_PER_FINGER, valuators); -- - if(down && pdown == 0) - xf86PostButtonEventP(local->dev, TRUE, - 1, 1, - 0, down * MT_AXIS_PER_FINGER, valuators); -- else if (down == 0 && pdown) -- xf86PostButtonEvent(local->dev, TRUE, 1, 0, 0, 0); -- -+ else if (down == 0 && pdown){ -+ xf86PostButtonEvent(local->dev, TRUE, 1, 1, 0, 0); -+ } - pdown = !!down; - } - - /* called for each full received packet from the touchpad */ --static void read_input(LocalDevicePtr local) -+static void read_input(InputInfoPtr local) - { - struct mtev_mtouch *mt = local->private; - while (mtouch_read_synchronized_event(mt, local->fd)) { -@@ -346,7 +346,7 @@ static void read_input(LocalDevicePtr local) - - static Bool device_control(DeviceIntPtr dev, int mode) - { -- LocalDevicePtr local = dev->public.devicePrivate; -+ InputInfoPtr local = dev->public.devicePrivate; - switch (mode) { - case DEVICE_INIT: - xf86Msg(X_INFO, "device control: init\n"); -@@ -366,39 +366,29 @@ static Bool device_control(DeviceIntPtr dev, int mode) - } - } - --static InputInfoPtr preinit(InputDriverPtr drv, IDevPtr dev, int flags) -+static InputInfoPtr preinit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) - { - struct mtev_mtouch *mt; -- InputInfoPtr local = xf86AllocateInput(drv, 0); -- if (!local) -- goto error; -+ int rc; -+ - mt = calloc(1, sizeof(struct mtev_mtouch)); -+ - if (!mt) - goto error; - -- local->name = dev->identifier; -- local->type_name = XI_TOUCHSCREEN; -- local->device_control = device_control; -- local->read_input = read_input; -- local->private = mt; -- local->flags = XI86_POINTER_CAPABLE | -- XI86_SEND_DRAG_EVENTS; -- -- local->conf_idev = dev; -- -- xf86CollectInputOptions(local, NULL, NULL); -- //xf86OptionListReport(local->options); -- xf86ProcessCommonOptions(local, local->options); -+ pInfo->private = mt; -+ pInfo->type_name = "UNKNOWN"; -+ pInfo->device_control = device_control; -+ pInfo->read_input = read_input; - -+ mt->swap_xy = xf86SetBoolOption(pInfo->options, "SwapAxes", FALSE); -+ mt->invert_x = xf86SetBoolOption(pInfo->options, "InvertX", FALSE); -+ mt->invert_y = xf86SetBoolOption(pInfo->options, "InvertY", FALSE); - -- mt->swap_xy = xf86SetBoolOption(local->options, "SwapAxes", FALSE); -- mt->invert_x = xf86SetBoolOption(local->options, "InvertX", FALSE); -- mt->invert_y = xf86SetBoolOption(local->options, "InvertY", FALSE); -- -- local->flags |= XI86_CONFIGURED; -+ return Success; - - error: -- return local; -+ return !Success; - } - - static void uninit(InputDriverPtr drv, InputInfoPtr local, int flags) -@@ -415,7 +405,6 @@ static InputDriverRec MTEV = { - .PreInit = preinit, - .UnInit = uninit, - .module = NULL, -- .refCount = 0 - }; - - static XF86ModuleVersionInfo VERSION = { diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb deleted file mode 100644 index 5f2adec1a1..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-mtev_git.bb +++ /dev/null @@ -1,22 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-input.inc -SUMMARY = "X.Org X server -- multitouch input driver" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=8a71d0475d08eee76d8b6d0c6dbec543" - -DEPENDS += "pixman" - -PNBLACKLIST[xf86-input-mtev] ?= "BROKEN: doesn't build with B!=S (Makefile without ${S} in sed call) - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -SRC_URI = "git://gitorious.org/xorg/xf86-input-mtev.git file://fix-it.patch" -SRCREV = "1eb469166ffc095c5801475f057f911f97a6e641" -S = "${WORKDIR}/git" -PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.0" - -EXTRA_OEMAKE = "'INCLUDE=-I${STAGING_INCDIR}/xorg -I${STAGING_INCDIR}/pixman-1'" - -#skip xorg-driver-common.inc AC_CHECK_FILE mangling -do_configure_prepend () { - sed 's#gcc#${CC}#g' -i Makefile - return -} diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch deleted file mode 100644 index fcd2f684b1..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001 -From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net> -Date: Wed, 1 Oct 2014 12:35:18 +0300 -Subject: [PATCH] Add config.h include to src/lx_memory.c - -The src/lx_memory.c file uses the xf86.h header file. This file must have -HAVE_STRNDUP defined before calling it when the building platform has a strndup -function. When using config.h, this file doesn't have that define and so fails -to compile. - -The attached patch adds the conditional config.h to this file so it may compile -on the affected platforms. - -The patch is trivial and may be included and used under whatever licensing -desired. - -Closes: Free Desktop Bug #84541 - -Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net> -Upstream-Status: Backport ---- - src/lx_memory.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/lx_memory.c b/src/lx_memory.c -index f26d280..992446f 100644 ---- a/src/lx_memory.c -+++ b/src/lx_memory.c -@@ -22,6 +22,9 @@ - * contributors may be used to endorse or promote products derived from this - * software without specific prior written permission. - */ -+#if HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include "xf86.h" - #include "geode.h" --- -2.1.1 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb deleted file mode 100644 index e543413add..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb +++ /dev/null @@ -1,16 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc -LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36" - -SUMMARY = "X.org server -- Geode GX2/LX display driver" -PR = "${INC_PR}.0" - -SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch" -SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392" -SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7" - -COMPATIBLE_HOST = "i.86.*-linux" - -RDEPENDS_${PN} += "xserver-xorg-module-exa" - -# 2_2.11.16-r21.0/xf86-video-geode-2.11.16/src/gx_driver.c:376:20: error: implicit declaration of function 'xf86MapVidMem' [-Werror=implicit-function-declaration] -PNBLACKLIST[xf86-video-geode] ?= "BROKEN, fails to build - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch deleted file mode 100644 index 25e83209d7..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-fix-build-with-KMS-disabled.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f485e878bc8bb0e381a38a30009308c82fa8d672 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Thu, 16 Aug 2012 08:18:56 +0200 -Subject: [PATCH] fix build with KMS disabled - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/glamo.h b/src/glamo.h -index d4a2f19..5fd5c04 100644 ---- a/src/glamo.h -+++ b/src/glamo.h -@@ -37,8 +37,11 @@ - #include "xf86.h" - #include "exa.h" - #include <linux/fb.h> -+ -+#ifdef HAVE_KMS - #include <libdrm/drm.h> - #include <libdrm/glamo_bo.h> -+#endif - - #define GLAMO_REG_BASE(c) ((c)->attr.address[0]) - #define GLAMO_REG_SIZE(c) (0x2400) --- -1.7.8.6 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch deleted file mode 100644 index fab0b238f6..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-driver-remove-references-to-mibstore.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 040ade8bb86a771fa4e71b41d2080254830ca9f3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 16 Mar 2013 17:44:37 +0100 -Subject: [PATCH] glamo*driver: remove references to mibstore - -* fix build with xserver-1.14 - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo-driver.c | 2 -- - src/glamo-kms-driver.c | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/src/glamo-driver.c b/src/glamo-driver.c -index 10b7762..22f57d7 100644 ---- a/src/glamo-driver.c -+++ b/src/glamo-driver.c -@@ -14,7 +14,6 @@ - #include "xf86_OSproc.h" - - #include "mipointer.h" --#include "mibstore.h" - #include "micmap.h" - #include "colormapst.h" - #include "xf86cmap.h" -@@ -612,7 +611,6 @@ GlamoScreenInit(SCREEN_INIT_ARGS_DECL) - } - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ -diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c -index c5c7a00..f192398 100644 ---- a/src/glamo-kms-driver.c -+++ b/src/glamo-kms-driver.c -@@ -415,7 +415,6 @@ Bool GlamoKMSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, - - GlamoKMSExaInit(pScrn); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); --- -1.8.1.5 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch deleted file mode 100644 index 0d63743638..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 963c221aa01be2ea99d39578d91e4aa08ec3ab0a Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Mon, 23 May 2011 14:29:38 +0200 -Subject: [PATCH] glamo-kms-driver: drop unused xf86_config - -* gcc-4.6 doesn't like unused variables which are only set and never read - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo-kms-driver.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/src/glamo-kms-driver.c b/src/glamo-kms-driver.c -index ce87caa..c5c7a00 100644 ---- a/src/glamo-kms-driver.c -+++ b/src/glamo-kms-driver.c -@@ -208,7 +208,6 @@ static const xf86CrtcConfigFuncsRec crtc_config_funcs = { - - Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags) - { -- xf86CrtcConfigPtr xf86_config; - GlamoPtr pGlamo; - rgb defaultWeight = { 0, 0, 0 }; - int max_width, max_height; -@@ -254,7 +253,6 @@ Bool GlamoKMSPreInit(ScrnInfoPtr pScrn, int flags) - - /* Allocate an xf86CrtcConfig */ - xf86CrtcConfigInit(pScrn, &crtc_config_funcs); -- xf86_config = XF86_CRTC_CONFIG_PTR(pScrn); - - max_width = 480; - max_height = 640; --- -1.7.5.rc3 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch deleted file mode 100644 index cbdc6e762b..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch +++ /dev/null @@ -1,279 +0,0 @@ -From 57e8944e3cced03b9526bd075649d74d97c24899 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Tue, 20 Nov 2012 22:18:23 +0100 -Subject: [PATCH 3/3] glamo-driver: adapt to xserver-0.13 video API - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/compat-api.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/glamo-driver.c | 43 ++++++++++++------------ - 2 files changed, 118 insertions(+), 21 deletions(-) - create mode 100644 src/compat-api.h - -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..b1591b1 ---- /dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,96 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie <airlied@redhat.com> -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+#define FREE_SCREEN_ARGS(x) (x) -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS(flags) pScrn -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/glamo-driver.c b/src/glamo-driver.c -index b13caae..10b7762 100644 ---- a/src/glamo-driver.c -+++ b/src/glamo-driver.c -@@ -43,6 +43,7 @@ - - #include <sys/mman.h> - -+#include "compat-api.h" - - static Bool debug = 0; - -@@ -68,10 +69,10 @@ static Bool - GlamoPreInit(ScrnInfoPtr pScrn, int flags); - - static Bool --GlamoScreenInit(int Index, ScreenPtr pScreen, int argc, char **argv); -+GlamoScreenInit(SCREEN_INIT_ARGS_DECL); - - static Bool --GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen); -+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL); - - static Bool - GlamoCrtcResize(ScrnInfoPtr scrn, int width, int height); -@@ -86,10 +87,10 @@ static void - GlamoRestoreHW(ScrnInfoPtr pScren); - - static Bool --GlamoEnterVT(int scrnIndex, int flags); -+GlamoEnterVT(VT_FUNC_ARGS_DECL); - - static void --GlamoLeaveVT(int scrnIndex, int flags); -+GlamoLeaveVT(VT_FUNC_ARGS_DECL); - - static void - GlamoLoadColormap(ScrnInfoPtr pScrn, int numColors, int *indices, -@@ -248,8 +249,8 @@ GlamoUnmapMMIO(ScrnInfoPtr pScrn) { - } - - static Bool --GlamoSwitchMode(int scrnIndex, DisplayModePtr mode, int flags) { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+GlamoSwitchMode(SWITCH_MODE_ARGS_DECL) { -+ SCRN_INFO_PTR(arg); - xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR (pScrn); - xf86OutputPtr output = config->output[config->compat_output]; - Rotation rotation; -@@ -286,7 +287,7 @@ GlamoFbdevProbe(DriverPtr drv, GDevPtr *devSections, int numDevSections) - - for (i = 0; i < numDevSections; i++) { - -- dev = xf86FindOptionValue(devSections[i]->options, "Device"); -+ dev = (char *) xf86FindOptionValue(devSections[i]->options, "Device"); - if (fbdevHWProbe(NULL, dev, NULL)) { - int entity; - pScrn = NULL; -@@ -430,7 +431,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) - - pGlamo->pEnt = xf86GetEntityInfo(pScrn->entityList[0]); - -- fb_device = xf86FindOptionValue(pGlamo->pEnt->device->options, "Device"); -+ fb_device = (char *) xf86FindOptionValue(pGlamo->pEnt->device->options, "Device"); - - /* open device */ - if (!fbdevHWInit(pScrn, NULL, fb_device)) -@@ -523,7 +524,7 @@ GlamoPreInit(ScrnInfoPtr pScrn, int flags) - - - static Bool --GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+GlamoScreenInit(SCREEN_INIT_ARGS_DECL) - { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - GlamoPtr pGlamo = GlamoPTR(pScrn); -@@ -545,7 +546,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - #endif - - if (NULL == (pGlamo->fbmem = fbdevHWMapVidmem(pScrn))) { -- xf86DrvMsg(scrnIndex, X_ERROR, "mapping of video memory failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mapping of video memory failed\n"); - return FALSE; - } - -@@ -556,13 +557,13 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* mi layer */ - miClearVisualTypes(); - if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) { -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "visual type setup failed for %d bits per pixel [1]\n", - pScrn->bitsPerPixel); - return FALSE; - } - if (!miSetPixmapDepths()) { -- xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pixmap depth setup failed\n"); - return FALSE; - } - -@@ -617,7 +618,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* software cursor */ - miDCInitialize(pScreen, xf86GetPointerScreenFuncs()); - -- GlamoEnterVT(scrnIndex, 0); -+ GlamoEnterVT(VT_FUNC_ARGS(0)); - - xf86CrtcScreenInit(pScreen); - #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,5,0,0,0) -@@ -627,7 +628,7 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* colormap */ - pGlamo->colormap = NULL; - if (!miCreateDefColormap(pScreen)) { -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: miCreateDefColormap failed " - "in GlamoScreenInit()\n"); - return FALSE; -@@ -652,9 +653,9 @@ GlamoScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - - static Bool --GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) -+GlamoCloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - GlamoPtr pGlamo = GlamoPTR(pScrn); - - if (pGlamo->accel) -@@ -675,7 +676,7 @@ GlamoCloseScreen(int scrnIndex, ScreenPtr pScreen) - - pScreen->CreateScreenResources = pGlamo->CreateScreenResources; - pScreen->CloseScreen = pGlamo->CloseScreen; -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static Bool -@@ -826,8 +827,8 @@ GlamoRestoreHW(ScrnInfoPtr pScrn) { - } - - static Bool --GlamoEnterVT(int scrnIndex, int flags) { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+GlamoEnterVT(VT_FUNC_ARGS_DECL) { -+ SCRN_INFO_PTR(arg); - GlamoPtr pGlamo = GlamoPTR(pScrn); - - GlamoSaveHW(pScrn); -@@ -842,8 +843,8 @@ GlamoEnterVT(int scrnIndex, int flags) { - } - - static void --GlamoLeaveVT(int scrnIndex, int flags) { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+GlamoLeaveVT(VT_FUNC_ARGS_DECL) { -+ SCRN_INFO_PTR(arg); - GlamoPtr pGlamo = GlamoPTR(pScrn); - - if (pGlamo->accel) --- -1.8.0 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch deleted file mode 100644 index a82037109e..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0004-glamo.h-use-const-for-jbt6k74_state_path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 180a00634f351a09ceabc5695d8e1acc3e585501 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Fri, 12 Dec 2014 12:00:10 +0100 -Subject: [PATCH] glamo.h: use const for jbt6k74_state_path - -* fix build issue with xserver 1.16: - glamo-driver.c:501:32: error: assignment discards 'const' qualifier from pointer target type [-Werror] - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/glamo.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/glamo.h b/src/glamo.h -index 5fd5c04..5e072be 100644 ---- a/src/glamo.h -+++ b/src/glamo.h -@@ -148,7 +148,7 @@ typedef struct { - #endif - - #ifdef JBT6K74_SET_STATE -- char *jbt6k74_state_path; -+ const char *jbt6k74_state_path; - char saved_jbt6k74_state[14]; - #endif - --- -2.1.3 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb deleted file mode 100644 index 5818d0cc9f..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc -SUMMARY = "X.Org X server -- Glamo display driver with KMS support" -DEPENDS += "libdrm" -RDEPENDS_${PN} += "xserver-xorg-module-exa" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" - -PE = "2" -PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.4" - -SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;branch=master \ - file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \ - file://0001-fix-build-with-KMS-disabled.patch \ - file://0003-glamo-driver-adapt-to-xserver-0.13-video-API.patch \ - file://0001-glamo-driver-remove-references-to-mibstore.patch \ - file://0004-glamo.h-use-const-for-jbt6k74_state_path.patch \ -" - -S = "${WORKDIR}/git" -SRCREV = "cb9ed17035a79e49dde26a1e7e2bc5f10fd8144b" - -EXTRA_OECONF = " --disable-kms " - -PNBLACKLIST[xf86-video-glamo] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130629/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" |