Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eabc12e15db4cc9632c568bbd0ffbff4fb76db10
commit eabc12e15db4cc9632c568bbd0ffbff4fb76db10 Author: Michel Hermier <herm...@frugalware.org> Date: Tue Mar 30 23:58:45 2010 +0200 xorg-server-1.7.6-4-i686 * Add a patch that should help nvidia blob experiance (missing composite). See http://www.nvnews.net/vbulletin/showpost.php?p=2221290 * Added USE_DGA flag, this extension should die sooner or later. diff --git a/source/x11/xorg-server/FrugalBuild b/source/x11/xorg-server/FrugalBuild index c39b50e..de712da 100644 --- a/source/x11/xorg-server/FrugalBuild +++ b/source/x11/xorg-server/FrugalBuild @@ -2,13 +2,14 @@ # Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu> USE_DEVEL=${USE_DEVEL:-"n"} +USE_DGA=${USE_DGA:-"y"} USE_KDRIVE=${USE_KDRIVE:-"y"} USE_HAL=${USE_HAL:-"n"} USE_SERVERDMX=${USE_SERVERDMX:-"y"} pkgname=xorg-server pkgver=1.7.6 -pkgrel=3 +pkgrel=4 pkgdesc="Modular X.Org X Server" groups=('x11' 'xorg-core') archs=('i686' 'x86_64' 'ppc') @@ -19,7 +20,7 @@ depends=('libxfont>=1.4.0' 'libx11>=1.3' 'xtrans>=1.2.3' 'libxau>=1.0.5' \ 'libxpm>=3.5.7-2' 'libxxf86misc>=1.0.1-3' 'libxxf86vm>=1.0.1-3' 'libxkbui>=1.0.2-2' \ 'xorg-cf-files' 'libxtst>=1.0.3-3' 'font-alias' 'libxcb>=1.4' 'pixman>=0.15.8' 'libpciaccess>=0.10.5' 'libxv>=1.0.4') makedepends=('randrproto>=1.3.0' 'renderproto>=0.9.3' 'fixesproto' 'damageproto>=1.1.0' 'xextproto>=7.0.5' 'xproto>=7.0.15' \ - 'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \ + 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto' 'xf86bigfontproto' \ 'compositeproto>=0.4' 'recordproto' 'resourceproto' 'videoproto>=2.2.2' 'scrnsaverproto' 'evieext' \ 'trapproto' 'xineramaproto' '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' \ @@ -33,10 +34,12 @@ replaces=('xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via' 'lbxproxy' 'pro backup=('etc/sysconfig/desktop') Finclude sourceforge xorg source=(${sour...@]} \ - desktop) + desktop \ + xge-no-extension-events.diff) sha1sums=('77a8c3dec86960e1be818df3a75d69b5fad6a3c0' \ - '676c8ad10a362615ae54de825e37c18c1f69ae08') + '676c8ad10a362615ae54de825e37c18c1f69ae08' \ + '3b70976077eda7dd6849409db7be5e9f7133c249') if Fuse $USE_DEVEL; then pkgver=1.6.3.901.151.g120286a @@ -129,6 +132,15 @@ else --disable-multibuffer" fi +if Fuse $USE_DGA; then + makedepends=("${makedepen...@]}" 'xf86dgaproto') + Fconfopts="${fconfop...@]} + --enable-dga" +else + Fconfopts="${fconfop...@]} + --disable-dga" +fi + build() { if Fuse $USE_DEVEL; then Funpack_scm diff --git a/source/x11/xorg-server/xge-no-extension-events.diff b/source/x11/xorg-server/xge-no-extension-events.diff new file mode 100644 index 0000000..36b466d --- /dev/null +++ b/source/x11/xorg-server/xge-no-extension-events.diff @@ -0,0 +1,57 @@ +diff --git a/Xext/geext.c b/Xext/geext.c +index 2ba0ca8..f0a3d87 100644 +--- a/Xext/geext.c ++++ b/Xext/geext.c +@@ -36,11 +36,8 @@ + + #define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) + +-int GEEventBase; +-int GEErrorBase; + static int GEClientPrivateKeyIndex; + DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex; +-int GEEventType; /* The opcode for all GenericEvents will have. */ + + int RT_GECLIENT = 0; + +@@ -178,10 +175,6 @@ GEResetProc(ExtensionEntry *extEntry) + { + DeleteCallback(&ClientStateCallback, GEClientCallback, 0); + EventSwapVector[GenericEvent] = NotImplemented; +- +- GEEventBase = 0; +- GEErrorBase = 0; +- GEEventType = 0; + } + + /* Calls the registered event swap function for the extension. +@@ -225,14 +218,10 @@ GEExtensionInit(void) + } + + if((extEntry = AddExtension(GE_NAME, +- GENumberEvents, GENumberErrors, ++ 0, GENumberErrors, + ProcGEDispatch, SProcGEDispatch, + GEResetProc, StandardMinorOpcode)) != 0) + { +- GEEventBase = extEntry->eventBase; +- GEErrorBase = extEntry->errorBase; +- GEEventType = GEEventBase; +- + memset(GEExtensions, 0, sizeof(GEExtensions)); + + EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent; +diff --git a/Xext/geint.h b/Xext/geint.h +index 881d306..10a33ce 100644 +--- a/Xext/geint.h ++++ b/Xext/geint.h +@@ -37,9 +37,6 @@ + #include "extnsionst.h" + #include <X11/extensions/geproto.h> + +-extern _X_EXPORT int GEEventType; +-extern _X_EXPORT int GEEventBase; +-extern _X_EXPORT int GEErrorBase; + extern _X_EXPORT DevPrivateKey GEClientPrivateKey; + + typedef struct _GEClientInfo { _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
