summaryrefslogtreecommitdiff
path: root/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'recipes')
-rw-r--r--recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch25
-rw-r--r--recipes/xorg-driver/xf86-video-glamo_git.bb3
2 files changed, 1 insertions, 27 deletions
diff --git a/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch b/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch
deleted file mode 100644
index 89123443b5..0000000000
--- a/recipes/xorg-driver/xf86-video-glamo/0001-glamo-output-initialize-mode-name-to-NULL.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 993affdb7cdcc4d2bd9c5df784c2d61c75d34701 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Wed, 30 Jun 2010 10:05:23 +0200
-Subject: [PATCH] glamo-output: initialize mode name to NULL with calloc
-
----
- src/glamo-output.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/glamo-output.c b/src/glamo-output.c
-index 10a0f8e..eea3cb2 100644
---- a/src/glamo-output.c
-+++ b/src/glamo-output.c
-@@ -165,7 +165,7 @@ GlamoOutputInit(ScrnInfoPtr pScrn) {
- output->driver_private = pGlamoOutput;
- pGlamoOutput->modes = NULL;
-
-- mode = xnfalloc(sizeof(DisplayModeRec));
-+ mode = xnfcalloc(1, sizeof(DisplayModeRec));
- if (!mode)
- return;
-
---
-1.7.1
-
diff --git a/recipes/xorg-driver/xf86-video-glamo_git.bb b/recipes/xorg-driver/xf86-video-glamo_git.bb
index 71fa207ffa..d08018181d 100644
--- a/recipes/xorg-driver/xf86-video-glamo_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo_git.bb
@@ -7,10 +7,9 @@ PV = "1.0.0+gitr${SRCPV}"
PR = "${INC_PR}.4"
SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=master \
- file://0001-glamo-output-initialize-mode-name-to-NULL.patch \
"
S = "${WORKDIR}/git"
-SRCREV = "e43cf499d0df41eb6ca2a1a7c21af71e31207635"
+SRCREV = "16af3c00195adc68cbd508e3613be4b2349260b3"
EXTRA_OECONF = " --enable-kms "