diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-25 12:33:52 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-04-25 12:33:52 +0000 |
commit | 4dc226ede4df8069f9dfe21bd74ed017f43bc8a7 (patch) | |
tree | 8e28d07885ea4cb5b5d4e91fe1ac00f5498fe95f /main | |
parent | 1b4f5e64de3af882fbec4086a0fdfacb18fdc722 (diff) | |
download | aports-4dc226ede4df8069f9dfe21bd74ed017f43bc8a7.tar.bz2 aports-4dc226ede4df8069f9dfe21bd74ed017f43bc8a7.tar.xz |
main/xorg-server: remove EXA patch. didnt help
Diffstat (limited to 'main')
-rw-r--r-- | main/xorg-server/APKBUILD | 4 | ||||
-rw-r--r-- | main/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.patch | 116 |
2 files changed, 1 insertions, 119 deletions
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD index 1b999cf70..fc9957724 100644 --- a/main/xorg-server/APKBUILD +++ b/main/xorg-server/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xorg-server pkgver=1.12.1 -pkgrel=0 +pkgrel=1 pkgdesc="X.Org X servers" url="http://xorg.freedesktop.org" arch="all" @@ -60,7 +60,6 @@ makedepends=" " source="http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 - EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.patch autoconfig-nvidia.patch autoconfig-sis.patch " @@ -153,6 +152,5 @@ xephyr() { } md5sums="20e73b422bda6f0d1405af676983cc70 xorg-server-1.12.1.tar.bz2 -a6a9b7c29582f7694ac724b14d77f004 EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.patch ea4852dedbb89550f6bc113ca66348a2 autoconfig-nvidia.patch 825ca99ea9348c66abdf2c479e0af485 autoconfig-sis.patch" diff --git a/main/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.patch b/main/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.patch deleted file mode 100644 index 12c110151..000000000 --- a/main/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- xorg-server-1.12.1/exa/exa_glyphs.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_glyphs.c.new 2012-04-15 11:48:51.683214230 +0200 -@@ -686,6 +686,7 @@ - PixmapPtr pMaskPixmap = 0; - PicturePtr pMask = NULL; - ScreenPtr pScreen = pDst->pDrawable->pScreen; -+ ExaScreenPriv(pScreen); - int width = 0, height = 0; - int x, y; - int first_xOff = list->xOff, first_yOff = list->yOff; -@@ -697,7 +698,6 @@ - ExaGlyphBuffer buffer; - - if (maskFormat) { -- ExaScreenPriv(pScreen); - GCPtr pGC; - xRectangle rect; - -@@ -719,22 +719,20 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - component_alpha = NeedsComponent(maskFormat->format); - pMask = CreatePicture(0, &pMaskPixmap->drawable, - maskFormat, CPComponentAlpha, &component_alpha, - serverClient, &error); -- if (!pMask || -- (!component_alpha && pExaScr->info->CheckComposite && -- !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))) -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; -+ -+ if (!component_alpha && pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)) - { - PictFormatPtr argbFormat; - -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- -- if (!pMask) -- return; -- - /* The driver can't seem to composite to a8, let's try argb (but - * without component-alpha) */ - FreePicture((pointer) pMask, (XID) 0); -@@ -748,15 +746,25 @@ - maskFormat->depth, - CREATE_PIXMAP_USAGE_SCRATCH); - if (!pMaskPixmap) -- return; -+ goto fallback; - - pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0, - serverClient, &error); -- if (!pMask) { -- (*pScreen->DestroyPixmap) (pMaskPixmap); -- return; -- } -+ (*pScreen->DestroyPixmap) (pMaskPixmap); -+ if (!pMask) -+ goto fallback; - } -+ -+ if (pExaScr->info->CheckComposite && -+ (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) || -+ (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) { -+ FreePicture ((pointer) pMask, (XID) 0); -+ goto fallback; -+ } -+ - pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen); - ValidateGC(&pMaskPixmap->drawable, pGC); - rect.x = 0; -@@ -769,6 +777,13 @@ - y = -extents.y1; - } - else { -+ if (pExaScr->info->CheckComposite && -+ !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) && -+ (op != PictOpOver || -+ !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) || -+ !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst))) -+ goto fallback; -+ - x = 0; - y = 0; - } -@@ -834,6 +849,10 @@ - xSrc + x - first_xOff, - ySrc + y - first_yOff, 0, 0, x, y, width, height); - FreePicture((pointer) pMask, (XID) 0); -- (*pScreen->DestroyPixmap) (pMaskPixmap); - } -+ -+ return; -+ -+fallback: -+ ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs); - } ---- xorg-server-1.12.1/exa/exa_render.c 2012-03-30 04:57:25.000000000 +0200 -+++ xorg-server-1.12.1/exa_render.c.new 2012-04-15 11:50:35.272482047 +0200 -@@ -878,7 +878,7 @@ - Bool saveMaskRepeat = pMask ? pMask->repeat : 0; - RegionRec region; - -- if (pExaScr->swappedOut) -+ if (pExaScr->fallback_counter || pExaScr->swappedOut) - goto fallback; - - /* Remove repeat in source if useless */ |