Package: xserver-xorg-video-omap3
Version: 0.1.1-2-x2
Severity: normal
Tags: patch
After upgrade to Xorg 7.5 package is removed and can not be rebuilt. The
problem seem to be in xorg include files and some code needs to be removed.
Parts of this patch is from upstream.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: armel (armv7l)
Kernel: Linux 2.6.33-rc5
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages xserver-xorg-video-omap3 depends on:
ii libc6 2.10.2-5 Embedded GNU C Library: Shared lib
ii xserver-xorg-core 2:1.7.4-2 Xorg X server - core server
xserver-xorg-video-omap3 recommends no packages.
xserver-xorg-video-omap3 suggests no packages.
-- no debconf information
-- debsums errors found:
debsums: changed file /usr/lib/xorg/modules/drivers/omapfb_drv.so (from
xserver-xorg-video-omap3 package)
*** xf86-video-omapfb-0.1.1/src/omapfb-driver.c 2009-05-03 22:12:40.000000000 +0200
--- xf86-video-omapfb-0.1.1-x2/src/omapfb-driver.c 2010-01-23 03:54:39.000000000 +0100
***************
*** 42,48 ****
#include "exa.h"
#define DPMS_SERVER
! #include <X11/extensions/dpms.h>
#include <linux/fb.h>
--- 42,48 ----
#include "exa.h"
#define DPMS_SERVER
! #include <X11/extensions/dpmsconst.h>
#include <linux/fb.h>
***************
*** 124,149 ****
OMAPFBChipsets);
}
- static const char *fbSymbols[] = {
- "fbScreenInit",
- "fbPictureInit",
- NULL
- };
-
- static const char *exaSymbols[] = {
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- "exaGetPixmapOffset",
- "exaGetPixmapPitch",
- "exaGetPixmapSize",
- "exaMarkSync",
- "exaWaitSync",
- NULL
- };
-
static void
OMAPFBProbeController(char *ctrl_name)
{
--- 124,129 ----
***************
*** 502,508 ****
/* Load the fallback module */
xf86LoadSubModule(pScrn, "fb");
- xf86LoaderReqSymLists(fbSymbols, NULL);
/* Initialize fallbacks for the screen */
if (!fbScreenInit(pScreen, ofb->fb, pScrn->virtualX,
--- 482,487 ----
***************
*** 586,592 ****
#ifdef USE_EXA
/* EXA init */
xf86LoadSubModule(pScrn, "exa");
- xf86LoaderReqSymLists(exaSymbols, NULL);
/* TODO: This should depend on the AccelMethod option */
ofb->exa = exaDriverAlloc();
--- 565,570 ----
***************
*** 879,885 ****
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&OMAPFB, module, HaveDriverFuncs);
- LoaderRefSymLists(fbSymbols, NULL);
return (pointer)1;
} else {
if (errmaj) *errmaj = LDR_ONCEONLY;
--- 857,862 ----
