From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S8BP0-00065q-8e for garchives@archives.gentoo.org; Thu, 15 Mar 2012 14:11:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 65E1DE0C22; Thu, 15 Mar 2012 14:11:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0EBFAE0C19 for ; Thu, 15 Mar 2012 14:11:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 471851B40AD for ; Thu, 15 Mar 2012 14:11:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id EA6ADE5432 for ; Thu, 15 Mar 2012 14:10:57 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1331249946.51fb94347503e887ffc8667248d7fa4cf33bf191.leio@gentoo> Subject: [gentoo-commits] proj/loongson:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/ X-VCS-Repository: proj/loongson X-VCS-Files: x11-base/xorg-server/Manifest x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch x11-base/xorg-server/xorg-server-1.7.5.ebuild X-VCS-Directories: x11-base/xorg-server/files/ x11-base/xorg-server/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: 51fb94347503e887ffc8667248d7fa4cf33bf191 X-VCS-Branch: master Date: Thu, 15 Mar 2012 14:10:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 71860e27-9033-4bcd-b61c-dcfaf65c8498 X-Archives-Hash: ba432517673a82e04b39499ccaff0b40 commit: 51fb94347503e887ffc8667248d7fa4cf33bf191 Author: Mart Raudsepp gentoo org> AuthorDate: Thu Mar 8 23:39:06 2012 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Thu Mar 8 23:39:06 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/loongson.git;= a=3Dcommit;h=3D51fb9434 Remove ancient xorg-server-1.7 version --- x11-base/xorg-server/Manifest | 4 - ...r-events-is-true-for-passive-grabs-add-th.patch | 83 ------ .../files/xorg-server-1.7.5-loongson.patch | 53 ---- x11-base/xorg-server/xorg-server-1.7.5.ebuild | 268 --------------= ------ 4 files changed, 0 insertions(+), 408 deletions(-) diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifes= t index d56a4f5..69f62f3 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,11 +1,9 @@ -AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.= patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f321= 83eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527= 064e9493fdd3c66801f26ab974df6a AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a9= 3b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 = 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a= 3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543= b683dcc388bae7619a24eb9741c1cd678ed3df97c01406 AUX xdm.confd-3 853 RMD160 363cd18f760650923e16579bf55f661e93dad63b SHA1= 0027b98f2aeb5c43219fa4f9b7d81a05101bec6f SHA256 00af0d957ff1b4f31c1aa470= 1d93a54080408548792deafac5414cbfa13b89ec AUX xdm.initd 5392 RMD160 eec0b0ccefeee366e891afc73d195240b447421f SHA1 = d3ce725e86fa3889f77403354b7f69d8184181ae SHA256 0c087c42d46563fd9d63da655= 753128aab2a0815efb83f906db3f54ba5c886ce AUX xdm.initd-2 5428 RMD160 85c40a4874e1f3358077056294947f4b5f7f7a3a SHA= 1 11ee3c7a7000ae4ac9ab7d33667c44f98193266f SHA256 8582cc4265da2f93f498252= b88e0dc055f78152b1daa9fbd7ecc0852f463730c AUX xdm.initd-3 5396 RMD160 eb1741ec3a80f83948150610a595115ff96d4833 SHA= 1 788097c7b72ae7c3df2348b2b503405b50046156 SHA256 10181710766bac1dc33093e= e2775d63f58a43d2d9ffcc709d0b9181749912b70 -AUX xorg-server-1.7.5-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed= 53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa= 2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552 AUX xorg-server-1.8-nouveau-default.patch 963 RMD160 cb8e530815c21a60150= 52594204470d89185bd2b SHA1 a865eeb7818ee2c25d4f94d7b3cf94d9b844fd5c SHA25= 6 40525090aa8342c50401f53d2c66e6bee5ff26db02f7ebf23aab42e33af0fb31 AUX xorg-server-1.8.2-loongson.patch 1899 RMD160 5705d24c037697d7c8f4eed= 53e6fd0c6b0962040 SHA1 27b6440970ffcceec5bb45c09de16a8ee8a6ef1e SHA256 fa= 2b1769ff6d5b1879053d64328bd1a08f9ead1b676ceda06a897d1f7c509552 AUX xorg-server-1.9-nouveau-default.patch 916 RMD160 0ebdf0fb76364b7fd0c= 520c3a2f7cc2cc1a83446 SHA1 daddde0f4f4276e12b87354d2e6825ed5c74c6eb SHA25= 6 a7ff421dd928e3025194279f9afb7cc033a896b3417abe339741e9c6ed4b54ea @@ -16,12 +14,10 @@ AUX xorg-server-9999-loongson.patch 4107 RMD160 19aed= 186ec0163a4a1a81574040592ab AUX xorg-server-disable-acpi.patch 663 RMD160 7074ca5276369b746ea7606a07= 95232aafe07c90 SHA1 d300a37dd2e0a8aa3965948c13f6995e6767841d SHA256 5b3cc= 7c8bea18fe3ba81851d2846d19ffd8fab9cdf5d8f3a274846847e734200 AUX xorg-server-loongson-fix-smi-16bpp.patch 478 RMD160 bc4383c3ce55e051= e255cd972d496542ac9a5eb5 SHA1 e020301ec281e8fdd4bf9d05f8d62448ae4ac20a SH= A256 39d65416a4a8f8db3c73165109c265c92c7977b4b54f9092cf2551a855e392ca AUX xorg-sets.conf 199 RMD160 33815115b6e8b8360af4f0778b0e2c5fb1a9aaee S= HA1 b5a2fd01a97558fa909c67f510d8a59b55e20f57 SHA256 1201d0337ac69d9715f44= 54a86dfb8a7bd1ae6f4c2578042fc08f283a997597c -DIST xorg-server-1.7.5.tar.bz2 4926990 RMD160 900863aeb73967e33265e0445d= daa61feeecc452 SHA1 c385293b66a6b0bc6bad648588f611d844c26ee7 SHA256 91e5f= 3d05c3e7270f4122235b6ab071210cc79579dcb842ffd4e71199b6bb7aa DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02= b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157= e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2 DIST xorg-server-1.9.0.tar.bz2 5345092 RMD160 9d0152458e4d82681422705d9a= b0c7808a0aa372 SHA1 a18d2212df80446b597b71b8948d133f52c399cc SHA256 1064f= 04c648285af9960e9c8e9cd5b8efabd58113c229e3af2408da39e829ad3 DIST xorg-server-1.9.2.902.tar.bz2 5287890 RMD160 c02f539db2b85b0c97bfd9= 0c15aff534196f2a11 SHA1 80f8276a8f547d67ce67c787aa4728a3c457b5f3 SHA256 b= 89064cc9473f48aa2a6a81c330d6107b95a6ea08fda9a62404f834b353e2af9 DIST xorg-server-1.9.4.tar.bz2 5191944 RMD160 1a5531de1eba9939b012e0c7f5= 628f2ffa553273 SHA1 e8d5776fe973f15c0e907fd827106f8d296acf7e SHA256 ad110= 47ebba58f2e37b03c70c986db3ea0cc0f1a19d2d3612713ab77b8ec2458 -EBUILD xorg-server-1.7.5.ebuild 7170 RMD160 826bc1ab53d6703b79798b9c7966= 4ba641574278 SHA1 e6c410063e2862c3a81af6e0cf2207c7341257d4 SHA256 a995838= 4cc851512a108af346a8169771df4940d94d0f45f07f401262676d853 EBUILD xorg-server-1.8.2.ebuild 8241 RMD160 2fa4126a8c52b3f8be9ae45b0d08= 7cfe669e4d1d SHA1 8fea1dede1e3bcd9c5a0729920e3a6750043251a SHA256 52f9a39= 25448037b9e68aa538c238401c07b0ce19850371dd925a46e905da37a EBUILD xorg-server-1.9.0.ebuild 7853 RMD160 a5e96a4414e17fecde10ab9b16e8= d726d909c140 SHA1 00c4a70acc477aa1cf95ae9eef9af7930efeed9a SHA256 9c4b389= edecbd3baeef6c46bd525ae3434a02ad2d816c47f27f70165ec40d76f EBUILD xorg-server-1.9.2.902.ebuild 8067 RMD160 f835be6b42d62dc44050145f= fedf8c0ce7eac99e SHA1 ca35dedcba423f17be3be2dd15af65834c262c6f SHA256 ba8= 01538aca09efd026508a8ffcaf18e9208530b303dc91cbd46cbcf5c19fa82 diff --git a/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-event= s-is-true-for-passive-grabs-add-th.patch b/x11-base/xorg-server/files/1.7= .3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch deleted file mode 100644 index 82f4f50..0000000 --- a/x11-base/xorg-server/files/1.7.3.901-0001-dix-if-owner-events-is-tr= ue-for-passive-grabs-add-th.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 873ef3430e92b0756c0dbe5033f6aec38a20d6ad Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 16 Dec 2009 13:43:22 +1000 -Subject: [PATCH] dix: if owner-events is true for passive grabs, add the= window mask (#25400) - -A client requesting a GrabModeSync button grab, owner-events true, with = only -the ButtonRelease mask set would never receive the press event even if t= he -grab window had the ButtonPress mask set. - -The protocol requires that if owner-events is true, then the delivery ma= sk -is the combination of the grab mask + the window event mask. - -X.Org Bug 25400 - -Signed-off-by: Peter Hutterer ---- - dix/events.c | 36 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 36 insertions(+), 0 deletions(-) - -diff --git a/dix/events.c b/dix/events.c -index 7e0867c..12b12a8 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -3590,6 +3590,8 @@ CheckPassiveGrabsOnWindow( - xE =3D &core; - count =3D 1; - mask =3D grab->eventMask; -+ if (grab->ownerEvents) -+ mask |=3D pWin->eventMask; - } else if (match & XI2_MATCH) - { - rc =3D EventToXI2((InternalEvent*)event, &xE); -@@ -3611,6 +3613,24 @@ CheckPassiveGrabsOnWindow( - mask =3D grab->xi2mask[device->id][((xGenericEvent*= )xE)->evtype/8]; - else if (event->type =3D=3D XI_Enter || event->type =3D= =3D XI_FocusIn) - mask =3D grab->xi2mask[device->id][event->type/8]; -+ -+ if (grab->ownerEvents && wOtherInputMasks(grab->window)= ) -+ { -+ InputClientsPtr icp =3D -+ wOtherInputMasks(grab->window)->inputClients; -+ -+ while(icp) -+ { -+ if (rClient(icp) =3D=3D rClient(grab)) -+ { -+ int evtype =3D (xE) ? ((xGenericEvent*)xE)-= >evtype : event->type; -+ mask |=3D icp->xi2mask[device->id][evtype/8= ]; -+ break; -+ } -+ -+ icp =3D icp->next; -+ } -+ } - } else - { - rc =3D EventToXI((InternalEvent*)event, &xE, &count); -@@ -3622,6 +3642,22 @@ CheckPassiveGrabsOnWindow( - continue; - } - mask =3D grab->eventMask; -+ if (grab->ownerEvents && wOtherInputMasks(grab->window)= ) -+ { -+ InputClientsPtr icp =3D -+ wOtherInputMasks(grab->window)->inputClients; -+ -+ while(icp) -+ { -+ if (rClient(icp) =3D=3D rClient(grab)) -+ { -+ mask |=3D icp->mask[device->id]; -+ break; -+ } -+ -+ icp =3D icp->next; -+ } -+ } - } -=20 - (*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE); ---=20 -1.6.5.2 - diff --git a/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch = b/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch deleted file mode 100644 index 4351f28..0000000 --- a/x11-base/xorg-server/files/xorg-server-1.7.5-loongson.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/hw/xfree86/dri/sarea.h b/hw/xfree86/dri/sarea.h -index 1528cc1..6be12b9 100644 ---- a/hw/xfree86/dri/sarea.h -+++ b/hw/xfree86/dri/sarea.h -@@ -42,6 +42,8 @@ - /* SAREA area needs to be at least a page */ - #if defined(__alpha__) - #define SAREA_MAX 0x2000 -+#elif defined(__mips__) -+#define SAREA_MAX 0x4000 - #elif defined(__ia64__) - #define SAREA_MAX 0x10000 /* 64kB */ - #else -diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-sup= port/linux/lnx_video.c -index 688106a..1552860 100644 ---- a/hw/xfree86/os-support/linux/lnx_video.c -+++ b/hw/xfree86/os-support/linux/lnx_video.c -@@ -505,9 +505,10 @@ _X_EXPORT volatile unsigned char *ioBase =3D NULL; - _X_EXPORT Bool - xf86EnableIO(void) - { --#if defined(__powerpc__) -+#if defined(__powerpc__) || defined(__mips__) - int fd; - unsigned int ioBase_phys; -+ extern unsigned int IOPortBase; - #endif -=20 - if (ExtendedEnabled) -@@ -532,7 +533,22 @@ xf86EnableIO(void) - #endif - } - close(fd); --#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__= ) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !def= ined(__arm__) && !defined(__m32r__) -+#elif defined(__mips__) -+ fd =3D open("/dev/mem", O_RDWR); -+ IOPortBase =3D (volatile unsigned char *)mmap(0, 0x20000, -+ PROT_READ | PROT_WRITE, MAP_SHARED, fd, -+ 0x1fd00000); -+ if (IOPortBase =3D=3D MAP_FAILED) { -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: Failed to map iobase (%s)\n", -+ strerror(errno)); -+ return FALSE; -+ } -+ close(fd); -+ xf86Msg(X_WARNING, -+ "xf86EnableIOPorts: map iobase (%x)\n", -+ IOPortBase); -+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) = && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defi= ned(__m32r__) - if (ioperm(0, 1024, 1) || iopl(3)) { - if (errno =3D=3D ENODEV) - ErrorF("xf86EnableIOPorts: no I/O ports found\n= "); diff --git a/x11-base/xorg-server/xorg-server-1.7.5.ebuild b/x11-base/xor= g-server/xorg-server-1.7.5.ebuild deleted file mode 100644 index ef1e134..0000000 --- a/x11-base/xorg-server/xorg-server-1.7.5.ebuild +++ /dev/null @@ -1,268 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.= 5.ebuild,v 1.1 2010/02/16 10:55:20 scarabeus Exp $ - -EAPI=3D"2" - -# Must be before x-modular eclass is inherited -#SNAPSHOT=3D"yes" - -inherit x-modular multilib versionator - -EGIT_REPO_URI=3D"git://anongit.freedesktop.org/git/xorg/xserver" - -OPENGL_DIR=3D"xorg-x11" - -DESCRIPTION=3D"X.Org X servers" -KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc = ~x86 ~x86-fbsd" - -IUSE_SERVERS=3D"dmx kdrive xorg" -IUSE=3D"${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" -RDEPEND=3D"hal? ( sys-apps/hal ) - tslib? ( >=3Dx11-libs/tslib-1.0 x11-proto/xcalibrateproto ) - dev-libs/openssl - >=3Dx11-libs/libXfont-1.3.3 - >=3Dx11-libs/xtrans-1.2.2 - >=3Dx11-libs/libXau-1.0.4 - >=3Dx11-libs/libxkbfile-1.0.4 - >=3Dx11-libs/libXdmcp-1.0.2 - >=3Dx11-libs/libpciaccess-0.10.3 - >=3Dx11-libs/pixman-0.15.20 - media-libs/freetype - >=3Dx11-misc/xbitmaps-1.0.1 - >=3Dx11-misc/xkeyboard-config-1.4 - x11-apps/xkbcomp - >=3Dx11-apps/iceauth-1.0.2 - >=3Dx11-apps/rgb-1.0.3 - >=3Dx11-apps/xauth-1.0.3 - >=3Dx11-apps/xinit-1.0.8-r3 - >=3Dapp-admin/eselect-opengl-1.0.8 - dmx? ( - x11-libs/libXt - >=3Dx11-libs/libdmx-1.0.99.1 - >=3Dx11-libs/libX11-1.1.5 - >=3Dx11-libs/libXaw-1.0.4 - >=3Dx11-libs/libXext-1.0.5 - >=3Dx11-libs/libXfixes-4.0.3 - >=3Dx11-libs/libXi-1.2.99.1 - >=3Dx11-libs/libXmu-1.0.3 - >=3Dx11-libs/libXtst-1.0.3 - ) - !minimal? ( - >=3Dx11-libs/libX11-1.1.5 - >=3Dx11-libs/libXext-1.0.5 - >=3Dx11-libs/libXres-1.0.3 - >=3Dmedia-libs/mesa-7.4[nptl=3D] - ) - >=3Dx11-libs/libxkbui-1.0.2 - kdrive? ( - >=3Dx11-libs/libXext-1.0.5 - sdl? ( media-libs/libsdl ) )" - # Xres is dmx-dependent - # Xaw is dmx-dependent - # Xpm is dmx-dependent, pulls in Xt - # xkbcomp is launched at startup but not checked by ./configure - -## Deps that don't have a version in configure.ac but do here: -# x11-proto/resourceproto -# x11-proto/fontsproto -# x11-libs/libXau -# x11-libs/libXfont -# x11-libs/libXdmcp -# x11-libs/libXext -# x11-libs/libX11 -# x11-libs/libXrender -# x11-libs/libXmu -# x11-libs/libXfixes -# x11-libs/libXtst -# x11-proto/xineramaproto -# x11-proto/dmxproto -## Deps that are larger here than in configure.ac -# x11-libs/libpciaccess-0.8.0 -# - -DEPEND=3D"${RDEPEND} - !!net-dialup/dtrace - sys-devel/flex - >=3Dx11-proto/randrproto-1.2.99.3 - >=3Dx11-proto/renderproto-0.11 - >=3Dx11-proto/fixesproto-4.1 - >=3Dx11-proto/damageproto-1.1 - >=3Dx11-proto/xextproto-7.0.99.3 - >=3Dx11-proto/xproto-7.0.13 - >=3Dx11-proto/xf86dgaproto-2.0.99.1 - >=3Dx11-proto/xf86rushproto-1.1.2 - >=3Dx11-proto/xf86vidmodeproto-2.2.99.1 - >=3Dx11-proto/compositeproto-0.4 - >=3Dx11-proto/recordproto-1.13.99.1 - >=3Dx11-proto/resourceproto-1.0.2 - >=3Dx11-proto/videoproto-2.2.2 - >=3Dx11-proto/scrnsaverproto-1.1 - >=3Dx11-proto/trapproto-3.4.3 - >=3Dx11-proto/xineramaproto-1.1.3 - >=3Dx11-proto/fontsproto-2.0.2 - >=3Dx11-proto/kbproto-1.0.3 - >=3Dx11-proto/inputproto-1.9.99.902 - >=3Dx11-proto/bigreqsproto-1.1.0 - >=3Dx11-proto/xcmiscproto-1.2.0 - >=3Dx11-proto/glproto-1.4.9 - dmx? ( >=3Dx11-proto/dmxproto-2.2.99.1 ) - !minimal? ( - >=3Dx11-proto/xf86driproto-2.1.0 - >=3Dx11-proto/dri2proto-2.1 - >=3Dx11-libs/libdrm-2.3.0 - )" - -PDEPEND=3D"xorg? ( >=3Dx11-base/xorg-drivers-$(get_version_component_ran= ge 1-2) )" - -EPATCH_FORCE=3D"yes" -EPATCH_SUFFIX=3D"patch" - -# These have been sent upstream -UPSTREAMED_PATCHES=3D( - #"${WORKDIR}/patches/" - - # Fix from bug http://bugs.freedesktop.org/show_bug.cgi?id=3D25400 - "${FILESDIR}/1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-gra= bs-add-th.patch" - - # A workaround for http://bugs.freedesktop.org/show_bug.cgi?id=3D21622 - "${FILESDIR}/xorg-server-loongson-fix-smi-16bpp.patch" - ) - -PATCHES=3D( - "${FILESDIR}/${P}-loongson.patch" - "${UPSTREAMED_PATCHES[@]}" - ) - -pkg_setup() { - use minimal || ensure_a_server_is_building - - # SDL only available in kdrive build - if use kdrive && use sdl; then - conf_opts=3D"${conf_opts} --enable-xsdl" - else - conf_opts=3D"${conf_opts} --disable-xsdl" - fi - - # localstatedir is used for the log location; we need to override the d= efault - # from ebuild.sh - # sysconfdir is used for the xorg.conf location; same applies - # --enable-install-setuid needed because sparcs default off - CONFIGURE_OPTIONS=3D" - $(use_enable ipv6) - $(use_enable dmx) - $(use_enable kdrive) - $(use_enable tslib) - $(use_enable tslib xcalibrate) - $(use_enable !minimal xvfb) - $(use_enable !minimal xnest) - $(use_enable !minimal record) - $(use_enable !minimal xfree86-utils) - $(use_enable !minimal install-libxf86config) - $(use_enable !minimal dri) - $(use_enable !minimal dri2) - $(use_enable !minimal glx) - $(use_enable xorg) - $(use_enable nptl glx-tls) - $(use_enable hal config-hal) - --sysconfdir=3D/etc/X11 - --localstatedir=3D/var - --enable-install-setuid - --with-fontdir=3D/usr/share/fonts - --with-xkb-output=3D/var/lib/xkb - --without-dtrace - ${conf_opts}" - - # (#121394) Causes window corruption - filter-flags -fweb - - # Incompatible with GCC 3.x SSP on x86, bug #244352 - if use x86 ; then - if [[ $(gcc-major-version) -lt 4 ]]; then - filter-flags -fstack-protector - fi - fi - - OLD_IMPLEM=3D"$(eselect opengl show)" - eselect opengl set ${OPENGL_DIR} -} - -src_install() { - x-modular_src_install - - dynamic_libgl_install - - server_based_install - - if ! use minimal && use xorg; then - # Install xorg.conf.example (see bugs #151421 and #151670) - insinto /etc/X11 - doins hw/xfree86/xorg.conf.example \ - || die "couldn't install xorg.conf.example" - fi -} - -pkg_postinst() { - switch_opengl_implem - - echo - ewarn "You must rebuild all drivers if upgrading from xorg-server 1.6" - ewarn "or earlier, because the ABI changed. If you cannot start X becau= se" - ewarn "of module version mismatch errors, this is your problem." - - echo - ewarn "You can generate a list of all installed packages in the x11-dri= vers" - ewarn "category using this command:" - ewarn "emerge portage-utils; qlist -I -C x11-drivers/" - - ebeep 5 - epause 10 -} - -pkg_postrm() { - # Get rid of module dir to ensure opengl-update works properly - if ! has_version x11-base/xorg-server; then - if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then - rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules - fi - fi -} - -dynamic_libgl_install() { - # next section is to setup the dynamic libGL stuff - ebegin "Moving GL files for dynamic switching" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - local x=3D"" - for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,= dri2}*; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/extensions - fi - done - eend 0 -} - -server_based_install() { - if ! use xorg; then - rm "${D}"/usr/share/man/man1/Xserver.1x \ - "${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \ - "${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ - "${D}"/usr/share/man/man1/Xserver.1x - fi -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set ${OLD_IMPLEM} -} - -ensure_a_server_is_building() { - for server in ${IUSE_SERVERS}; do - use ${server} && return; - done - eerror "You need to specify at least one server to build." - eerror "Valid servers are: ${IUSE_SERVERS}." - die "No servers were specified to build." -}