From 50cd038ec0ad2b57f969f1647339ec01448720c2 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 23 May 2011 14:45:48 +0200 Subject: xf86-video-glamo: fix build with gcc-4.6 Signed-off-by: Martin Jansa --- ...-glamo-kms-driver-drop-unused-xf86_config.patch | 35 ++++++++++++++++++++++ .../xorg-driver/xf86-video-glamo_git.bb | 3 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch (limited to 'meta-oe/recipes-graphics/xorg-driver') 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 new file mode 100644 index 0000000000..0d63743638 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo/0001-glamo-kms-driver-drop-unused-xf86_config.patch @@ -0,0 +1,35 @@ +From 963c221aa01be2ea99d39578d91e4aa08ec3ab0a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +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 +--- + 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_git.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb index c9e1d5699a..82263f2738 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-glamo_git.bb @@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" RDEPENDS_${PN} = "xserver-xorg-extension-dri xserver-xorg-extension-dri2 xserver-xorg-extension-glx mesa-dri" PE = "2" PV = "1.0.0+gitr${SRCPV}" -PR = "${INC_PR}.5" +PR = "${INC_PR}.6" SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \ file://0001-glamo-drm-define-GLAMO_CMDQ_MAX_COUNT-instead-of-mag.patch \ + file://0001-glamo-kms-driver-drop-unused-xf86_config.patch \ " S = "${WORKDIR}/git" -- cgit 1.2.3-korg