I have made the following changes intended for : CE:Adaptation:N9xx-common / xorg-x11-drv-fbdev-sgx
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/7016 Thank You, Marko Saukko [This message was auto-generated] --- Request # 7016: Messages from BOSS: State: review at 2012-10-15T11:56:42 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:sage:branches:Mer:fake:Core-next:i586 / xorg-x11-drv-fbdev-sgx -> CE:Adaptation:N9xx-common / xorg-x11-drv-fbdev-sgx changes files: -------------- --- xorg-x11-drv-fbdev-sgx.changes +++ xorg-x11-drv-fbdev-sgx.changes @@ -0,0 +1,4 @@ +* Mon Oct 15 2012 Marko Saukko <[email protected]> - 0.4.0-245 +- Fix build with new xserver with 0001-Match-API-changes-in-X-server.patch +- Match exclusive arch from ti-omap3-sgx package + new: ---- 0001-Match-API-changes-in-X-server.patch spec files: ----------- --- xorg-x11-drv-fbdev-sgx.spec +++ xorg-x11-drv-fbdev-sgx.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.24.1 +# Generated by: spectacle version 0.25 # Name: xorg-x11-drv-fbdev-sgx @@ -10,14 +10,15 @@ Summary: Xorg X11 fbdev video driver Version: 0.4.0 -Release: 0 +Release: 1 Group: Graphics/Display and Graphics Adaptation License: MIT -ExclusiveArch: %{arm} armv8el +ExclusiveArch: armv7hl armv7nhl armv7thl armv7tnhl armv8el URL: http://www.x.org/ Source0: xserver-xorg-video-fbdev_%{version}-245+0m6.tar.gz Source100: xorg-x11-drv-fbdev-sgx.yaml Patch0: xorg-x11-drv-fbdev-sgx-207-nomirror.patch +Patch1: 0001-Match-API-changes-in-X-server.patch Requires: xorg-x11-server-Xorg-setuid >= 1.8.99 BuildRequires: pkgconfig(xorg-server) BuildRequires: pkgconfig(dri2proto) @@ -40,6 +41,8 @@ # xorg-x11-drv-fbdev-sgx-207-nomirror.patch %patch0 -p1 +# 0001-Match-API-changes-in-X-server.patch +%patch1 -p1 # >> setup # << setup @@ -48,10 +51,7 @@ #export CFLAGS="$CFLAGS -O0" # << build pre -%autogen --disable-static -%configure --disable-static \ - --enable-extfbupdate - +%reconfigure --disable-static make %{?jobs:-j%jobs} # >> build post other changes: -------------- ++++++ 0001-Match-API-changes-in-X-server.patch (new) --- 0001-Match-API-changes-in-X-server.patch +++ 0001-Match-API-changes-in-X-server.patch @@ -0,0 +1,222 @@ +From ccb520e424a06c1e9e424167080bf4deaae5e6ae Mon Sep 17 00:00:00 2001 +From: Marko Saukko <[email protected]> +Date: Wed, 3 Oct 2012 08:03:03 +0000 +Subject: [PATCH] Match API changes in X server. + +Ref: http://cgit.freedesktop.org/xorg/xserver/commit/?id=1f0e8bd5eb1a5539689cfc4f5a6b86b530907ec5 + +Signed-off-by: Marko Saukko <[email protected]> +--- + src/fbdev.c | 51 ++++++++++++++++++++++++++++++++++--------------- + src/sgx_pvr2d_alloc.c | 24 +++++++++++++++++++---- + 2 files changed, 56 insertions(+), 19 deletions(-) + +diff --git a/src/fbdev.c b/src/fbdev.c +index 73ea608..068c05c 100644 +--- a/src/fbdev.c ++++ b/src/fbdev.c +@@ -31,6 +31,8 @@ + #include <sys/ioctl.h> + #include <sys/time.h> + ++#include <xorg/xorgVersion.h> ++ + /* all driver need this */ + #include <X11/Xatom.h> + #include "xf86.h" +@@ -77,8 +79,12 @@ static const OptionInfoRec *FBDevAvailableOptions(int chipid, int busid); + static void FBDevIdentify(int flags); + static Bool FBDevProbe(DriverPtr drv, int flags); + static Bool FBDevPreInit(ScrnInfoPtr pScrn, int flags); ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) + static Bool FBDevScreenInit(int Index, ScreenPtr pScreen, int argc, + char **argv); ++#else ++static Bool FBDevScreenInit(ScreenPtr pScreen, int argc, char **argv); ++#endif + static Bool FBDevSwitchMode(int scrnIndex, DisplayModePtr mode, int flags); + static void FBDevAdjustFrame(int scrnIndex, int x, int y, int flags); + static Bool FBDevEnterVT(int scrnIndex, int flags); +@@ -87,7 +93,11 @@ static void FBDevFreeScreen(int scrnIndex, int flags); + static Bool FBDevValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); + static Bool FBDevCreateScreenResources(ScreenPtr pScreen); ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) + static Bool FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen); ++#else ++static Bool FBDevCloseScreen(ScreenPtr pScreen); ++#endif + static Bool fbdev_randr12_preinit(ScrnInfoPtr pScrn); + static void fbdev_randr12_uninit(ScrnInfoPtr pScrn); + +@@ -948,37 +958,40 @@ static void FBDevAdjustFrame(int scrnIndex, int x, int y, int flags) + if (crtc && crtc->enabled) + crtc->funcs->set_origin(crtc, x, y); + } +- +-static Bool FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, +- char **argv) ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) ++static Bool FBDevScreenInit(int Index, ScreenPtr pScreen, int argc, ++ char **argv) ++#else ++static Bool FBDevScreenInit(ScreenPtr pScreen, int argc, char **argv) ++#endif + { +- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + FBDevPtr fPtr = FBDEVPTR(pScrn); + VisualPtr visual; + unsigned int pitch; + + ENTER(); + +- xf86DrvMsgVerb(scrnIndex, X_INFO, 5, ++ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 5, + "\tbitsPerPixel=%d, depth=%d, defaultVisual=%s\n" + "\tmask: %x,%x,%x, offset: %u,%u,%u\n", pScrn->bitsPerPixel, + pScrn->depth, xf86GetVisualName(pScrn->defaultVisual), + (unsigned)pScrn->mask.red, (unsigned)pScrn->mask.green, + (unsigned)pScrn->mask.blue, (unsigned)pScrn->offset.red, + (unsigned)pScrn->offset.green, (unsigned)pScrn->offset.blue); +- xf86DrvMsgVerb(scrnIndex, X_INFO, 5, ++ xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 5, + "\tvirtualX=%d, virtualY=%d\n", + pScrn->virtualX, pScrn->virtualY); + + if (!realloc_fb(pScrn, pScrn->virtualX, pScrn->virtualY, + pScrn->bitsPerPixel, pScrn->depth)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unable to allocate video memory\n"); + return FALSE; + } + + if (!omap_fb_get_info(fPtr->fb[0], NULL, NULL, &pitch)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Unable to get framebuffer pitch\n"); + return FALSE; + } +@@ -989,13 +1002,13 @@ static Bool FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, + miClearVisualTypes(); + if (!miSetVisualTypes + (pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "visual type setup failed" + " for %d bits per pixel [1]\n", pScrn->bitsPerPixel); + return FALSE; + } + if (!miSetPixmapDepths()) { +- xf86DrvMsg(scrnIndex, X_ERROR, "pixmap depth setup failed\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "pixmap depth setup failed\n"); + return FALSE; + } + +@@ -1003,7 +1016,7 @@ static Bool FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, + (pScreen, get_fbmem(fPtr), pScrn->virtualX, pScrn->virtualY, + pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth, + pScrn->bitsPerPixel)) { +- xf86DrvMsg(scrnIndex, X_ERROR, "fbScreenInit failed\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "fbScreenInit failed\n"); + return FALSE; + } + +@@ -1022,7 +1035,7 @@ static Bool FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, + + /* must be after RGB ordering fixed */ + if (!fbPictureInit(pScreen, NULL, 0)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Render extension initialisation failed\n"); + return FALSE; + } +@@ -1055,7 +1068,7 @@ static Bool FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, + RR_Reflect_X | RR_Reflect_Y); + + if (!miCreateDefColormap(pScreen)) { +- xf86DrvMsg(scrnIndex, X_ERROR, ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "internal error: failed to create colormap\n"); + return FALSE; + } +@@ -1138,9 +1151,13 @@ static Bool FBDevCreateScreenResources(ScreenPtr pScreen) + return res; + } + ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) + static Bool FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen) ++#else ++static Bool FBDevCloseScreen(ScreenPtr pScreen) ++#endif + { +- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; ++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); + FBDevPtr fPtr = FBDEVPTR(pScrn); + + ExtFBCloseScreen(pScreen); +@@ -1163,7 +1180,11 @@ static Bool FBDevCloseScreen(int scrnIndex, ScreenPtr pScreen) + pScrn->vtSema = FALSE; + + pScreen->CloseScreen = fPtr->CloseScreen; +- return (*pScreen->CloseScreen) (scrnIndex, pScreen); ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) ++ return (*pScreen->CloseScreen) (scrnIndex, pScreen); ++#else ++ return (*pScreen->CloseScreen) (pScreen); ++#endif + } + + /* -------------------------------------------------------------------- */ +diff --git a/src/sgx_pvr2d_alloc.c b/src/sgx_pvr2d_alloc.c +index 9b0d357..9a96eac 100644 +--- a/src/sgx_pvr2d_alloc.c ++++ b/src/sgx_pvr2d_alloc.c +@@ -20,6 +20,9 @@ + * THE SOFTWARE. + */ + ++#include <xorg/xorg-server.h> ++#include <xorg/xorgVersion.h> ++ + #include "fbdev.h" + #include "sgx_pvr2d.h" + #include "sgx_pvr2d_alloc.h" +@@ -94,16 +97,29 @@ Bool PVR2DDelayedMemDestroy(Bool wait) + } + return FALSE; + } +- ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,13,0,0,0) + static void (*SavedBlockHandler) (int, pointer, pointer, pointer); + + static void PVR2DBlockHandler(int i, pointer blockData, pointer pTimeout, + pointer pReadmask) ++#else ++static void (*SavedBlockHandler) (ScreenPtr, pointer, pointer); ++ ++static void PVR2DBlockHandler(ScreenPtr pScreen, pointer pTimeout, (23 more lines skipped) ++++++ xorg-x11-drv-fbdev-sgx.yaml --- xorg-x11-drv-fbdev-sgx.yaml +++ xorg-x11-drv-fbdev-sgx.yaml @@ -1,15 +1,17 @@ Name: xorg-x11-drv-fbdev-sgx Summary: Xorg X11 fbdev video driver Version: 0.4.0 -Release: 0 +Release: 1 Group: Graphics/Display and Graphics Adaptation License: MIT URL: http://www.x.org/ -ExclusiveArch: "%{arm} armv8el" +ExclusiveArch: "armv7hl armv7nhl armv7thl armv7tnhl armv8el" Sources: - xserver-xorg-video-fbdev_%{version}-245+0m6.tar.gz Patches: - "xorg-x11-drv-fbdev-sgx-207-nomirror.patch" + - 0001-Match-API-changes-in-X-server.patch + Description: "Description: %{summary}" Requires: @@ -30,8 +32,6 @@ Provides: - xorg-x11-drv-fbdev -Configure: autogen -ConfigOptions: - - --enable-extfbupdate +Configure: reconfigure Builder: make
