[oe-commits] Koen Kooi : xf86-video-omapfb: more fixes for recent xorg

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: ddcd0de3398b85cfedb959ca6d4e21e1cf6d6e18
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ddcd0de3398b85cfedb959ca6d4e21e1cf6d6e18

Author: Koen Kooi <koen at openembedded.org>
Date:   Wed Dec 23 23:53:37 2009 +0100

xf86-video-omapfb: more fixes for recent xorg

---

 ...mapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch |   12 +++++++++---
 recipes/xorg-driver/xf86-video-omapfb_git.bb       |    2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch b/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch
index 045691c..5008bba 100644
--- a/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch
+++ b/recipes/xorg-driver/xf86-video-omapfb/0001-omapfb-driver-hack-out-dpms-for-xorg-1.7.x.patch
@@ -46,6 +46,12 @@ index a9d5fbc..ef92ce4 100644
  
  void
  OMAPFBPrintCapabilities(ScrnInfoPtr pScrn,
--- 
-1.6.2.4
-
+@@ -879,7 +878,7 @@ OMAPFBSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+ 	if (!setupDone) {
+ 		setupDone = TRUE;
+ 		xf86AddDriver(&OMAPFB, module, HaveDriverFuncs);
+-		LoaderRefSymLists(fbSymbols, NULL);
++		//LoaderRefSymLists(fbSymbols, NULL);
+ 		return (pointer)1;
+ 	} else {
+ 		if (errmaj) *errmaj = LDR_ONCEONLY;
diff --git a/recipes/xorg-driver/xf86-video-omapfb_git.bb b/recipes/xorg-driver/xf86-video-omapfb_git.bb
index f9dfe31..567331d 100644
--- a/recipes/xorg-driver/xf86-video-omapfb_git.bb
+++ b/recipes/xorg-driver/xf86-video-omapfb_git.bb
@@ -2,6 +2,8 @@ require xorg-driver-video.inc
 
 DESCRIPTION = "X.Org X server -- OMAP display driver"
 
+PR_append = "a"
+
 SRCREV = "5317aae587a2bf48f07a8c06bfaf7bcbfd23bafc"
 PV = "0.1.1+${PR}+gitr${SRCREV}"
 PE = "1"