From fb7f84caf6c8e2959e00fbe0e619f8fd51ee42c7 Mon Sep 17 00:00:00 2001 From: mb Date: Fri, 13 Aug 2010 17:15:11 +0000 Subject: [PATCH] update omapfb patches git-svn-id: svn://svn.openwrt.org/openwrt/packages@22624 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../xf86-video-omap/patches/001-misc-fixes.patch | 27 ++++------------------ 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch b/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch index 79702c652..007179f66 100644 --- a/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch +++ b/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch @@ -1,7 +1,6 @@ --- - src/omapfb-driver.c | 5 +++-- - src/omapfb-xv.c | 6 +++--- - 2 files changed, 6 insertions(+), 5 deletions(-) + src/omapfb-driver.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) --- xf86-video-omapfb-20100810.orig/src/omapfb-driver.c +++ xf86-video-omapfb-20100810/src/omapfb-driver.c @@ -14,30 +13,12 @@ for (i = 0; i < numDevSections; i++) { int fd; -@@ -831,7 +831,8 @@ static XF86ModuleVersionInfo OMAPFBVersR +@@ -831,7 +831,7 @@ static XF86ModuleVersionInfo OMAPFBVersR MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, -+// PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, -+ 0, 0, 1, ++ 99, 99, 99, ABI_CLASS_VIDEODRV, ABI_VIDEODRV_VERSION, NULL, ---- xf86-video-omapfb-20100810.orig/src/omapfb-xv.c -+++ xf86-video-omapfb-20100810/src/omapfb-xv.c -@@ -225,11 +225,11 @@ int OMAPFBXVInit (ScrnInfoPtr pScrn, - */ - // ofb->port->mem_info.type = OMAPFB_MEMTYPE_SRAM; - if (ioctl(ofb->port->fd, OMAPFB_SETUP_MEM, &ofb->port->mem_info) != 0) { -- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Failed to unallocate video plane memory: %s\n", - strerror(errno)); -- OMAPFBPortFreeRec(pScrn); -- return 0; -+// OMAPFBPortFreeRec(pScrn); -+// return 0; - } - } - if(ioctl(ofb->port->fd, OMAPFB_QUERY_PLANE, &ofb->port->plane_info) != 0) { -- 2.11.0