Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=x11testing.git;a=commitdiff;h=8af6354874a5b8e9f5a1d3a2aef9c5530343db65
commit 8af6354874a5b8e9f5a1d3a2aef9c5530343db65 Author: Michel Hermier <[email protected]> Date: Wed Oct 10 15:15:22 2012 +0200 xorg-server-1.13.0-1-i686 * Bump version. diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index 47ae27c..806b5fb 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -8,8 +8,8 @@ USE_UDEV=${USE_UDEV:-"y"} USE_SERVERDMX=${USE_SERVERDMX:-"y"} pkgname=xorg-server -pkgver=1.12.3 -pkgrel=2 +pkgver=1.13.0 +pkgrel=1 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64' 'arm') @@ -23,18 +23,18 @@ makedepends=('randrproto>=1.3.0' 'renderproto>=0.9.3' 'fixesproto' 'damageproto> 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \ 'compositeproto>=0.4' 'recordproto' 'resourceproto' 'videoproto>=2.2.2' 'scrnsaverproto' 'evieext' \ 'trapproto' 'fontsproto' 'kbproto' 'inputproto>=1.5' 'bigreqsproto' 'xcmiscproto' \ - 'glproto' 'xf86driproto>=2.0.4' 'libdrm>=2.4.11' 'printproto>=1.0.4' 'mkfontdir>=1.0.4' 'mkfontscale>=1.0.6-1' \ + 'glproto' 'xf86driproto>=2.0.4' 'libdrm>=2.4.39' 'printproto>=1.0.4' 'mkfontdir>=1.0.4' 'mkfontscale>=1.0.6-1' \ 'fontcacheproto' 'xorg-sgml-doctools>=1.4' 'util-macros>=1.8.0' 'calibrateproto' 'libdmx>=1.0.2-3' 'libxres>=1.0.3-3' 'libxinerama>=1.0.3' 'bigreqsproto' 'font-util' 'libgl-headers-mesa') -rodepends=('libdri' 'libglx' 'xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vesa') -provides=('xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via' 'lbxproxy' 'proxymngr') +rodepends=('libglx' 'xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vesa') -replaces=('xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via' 'lbxproxy' 'proxymngr' \ - 'liblbxutil' 'xgl' 'xorg-server-sdl') +provides=('libdri') +replaces=('libdri') +conflicts=('libdri') backup=('etc/sysconfig/desktop' 'etc/X11/xorg.conf.d/10-evdev.conf') _F_archive_grepv="99" Finclude xorg -sha1sums=('f3f3d59f3c5e15459152987ffc644f06a0d1374f') +sha1sums=('b29aef6ab4924e2b034ccb26b289e929d61a2555') if Fuse $USE_DEVEL; then pkgver=1.6.3.901.151.g120286a @@ -46,19 +46,16 @@ fi source=("${source[@]}" \ desktop \ - 10-evdev.conf \ - exa-gfx-corruption-workaround.patch) + 10-evdev.conf) sha1sums=("${sha1sums[@]}" \ 'e2e25648e1968cf942a0a0458656879042c16939' \ - '3fa8d717bce03296e6b097279a410d9672000b08' \ - 'b174513367cc854e4d4440e3394161d1d0222491') + '3fa8d717bce03296e6b097279a410d9672000b08') Fconfopts="${Fconfopts[@]} --disable-static \ --enable-ipv6 \ --enable-dri \ - --with-dri-driver-path=/usr/lib/dri \ --enable-xcsecurity \ --enable-xorg \ --disable-xfake \ @@ -66,7 +63,6 @@ Fconfopts="${Fconfopts[@]} --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ --with-xkb-path=/usr/lib/X11/xkb \ - --enable-xcalibrate \ --enable-xnest \ --enable-composite \ --enable-glx-tls \ @@ -87,13 +83,11 @@ else --disable-config-udev" fi -subpkgs=('libdri' 'libglx') -subdescs=('Dri library for XOrg.' \ - 'Glx library for XOrg.') -subdepends=('glibc' \ - 'glibc') -subgroups=('x11 xorg-core' 'x11 xorg-core') -subarchs=('i686 x86_64 arm' 'i686 x86_64 arm') +subpkgs=('libglx') +subdescs=('Glx library for XOrg.') +subdepends=('glibc') +subgroups=('x11 xorg-core') +subarchs=('i686 x86_64 arm') if Fuse $USE_KDRIVE; then subpkgs=("${subpkgs[@]}" "$pkgname-xephyr" \ @@ -158,10 +152,6 @@ build() { # TODO - Move away from here Ffile /etc/sysconfig/desktop - ## Split libdri for fglrx - #Fsplit libdri usr/include/xorg/dri* - Fsplit libdri usr/lib/xorg/modules/extensions/libdri.* - Fsplit libglx usr/lib/xorg/modules/extensions/libglx.* ## the servers =) diff --git a/source/x11/xorg-server/exa-gfx-corruption-workaround.patch b/source/x11/xorg-server/exa-gfx-corruption-workaround.patch deleted file mode 100644 index fb30467..0000000 --- a/source/x11/xorg-server/exa-gfx-corruption-workaround.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 */ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
