Permalink
Browse files

[xorg-server-ubuntu] Add Arch Linux patches

  • Loading branch information...
1 parent fcd49de commit 99b8b0b8e30aed09e02c50db80643eddf507a8e5 @chenxiaolong committed Nov 19, 2012
Showing with 927 additions and 4 deletions.
  1. +14 −4 xorg-server-ubuntu/PKGBUILD
  2. +643 −0 xorg-server-ubuntu/git-fixes.patch
  3. +270 −0 xorg-server-ubuntu/use-pixman-glyph-cache.patch
@@ -19,16 +19,26 @@ source=("${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2"
'autoconfig-nvidia.patch'
'autoconfig-sis.patch'
'10-quirks.conf'
- '500_pointer_barrier_thresholds.diff')
+ '500_pointer_barrier_thresholds.diff'
+ 'git-fixes.patch'
+ 'use-pixman-glyph-cache.patch')
sha512sums=('840a341f796386156ff4eb599c4b3b96090d3fda9cdbe70c45ff175c8d01b62cb9ba04a6c73ddde90996f8b96be1a3d925c9803a3b629cb4bc317374b7b1e014'
'8e0dc38e28930e1a2682d25608d62d5e8cae9360c677d44760840b2424bf00d30ee434cb141b090dc37da1458fe619011baf375b32f250bd2b46ca536ac92de6'
'3211dbc6d8a84f3f6a77230a8e5fe13355b441768d864c2b3037b893be39f7b8d581c2a5db1e04f399ce19c4ced973b64eaad563d970ee9c7b8a93cb23a0aa18'
'9a1a5568be751435daea720cfc4bad209d62545cc10ea2f49113c41669c8130809a680492256ef331757fe8539d2e0e5e9e67a36f7c48c8d92d9b3e957d28fa2'
- 'b97e38e19f07447deac2cbc2d2cdb8bf1fda569954ac187dae50cdd71ad3e118796b9c75872b782883cfa974b37215612f6e1630559e6a0af028d14e28eca78f')
+ 'b97e38e19f07447deac2cbc2d2cdb8bf1fda569954ac187dae50cdd71ad3e118796b9c75872b782883cfa974b37215612f6e1630559e6a0af028d14e28eca78f'
+ '7e5dd44c2a7e35b2e041a0e90468b6cdfc91cf80da3913fabb53126d306ff5cede693ccc4e5a38ea13ad0eae1ca6bbad1957506cf0ba309ebb10a5a6c2551f82'
+ '90b4a3cac98b1ad4c71af8d4fc71e3a56282d15541a4d948146b75fea1d47b4d00c121853f7622a2b9e13fb0e7dac54e4025d6a352412c25ba8e0b41c7875876')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
+ # Apply upstream fixes from server-1.13 branch
+ patch -Np1 -i "${srcdir}/git-fixes.patch"
+
+ # Use pixman 0.28.0 glyph cache - backported from git master
+ patch -Np1 -i "${srcdir}/use-pixman-glyph-cache.patch"
+
# Use nouveau/nv/nvidia drivers for nvidia devices
patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch"
@@ -82,7 +92,7 @@ build() {
package_xorg-server-ubuntu() {
pkgdesc="Xorg X server"
- depends=('libdrm' 'pixman' 'libgcrypt' 'xorg-server-common' 'xf86-input-evdev')
+ depends=('libxdmcp' 'libxfont' 'libpciaccess' 'libdrm' 'pixman>=0.28.0' 'libgcrypt' 'libxau' 'xorg-server-common' 'xf86-input-evdev')
backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
# see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server' "xorg-server=${pkgver}")
@@ -118,7 +128,7 @@ package_xorg-server-ubuntu() {
package_xorg-server-devel-ubuntu() {
arch=('any')
pkgdesc="Development files for the X.Org X server"
- depends=('xproto' 'randrproto' 'renderproto' 'xextproto' 'inputproto' 'kbproto' 'fontsproto' 'videoproto' 'dri2proto' 'xineramaproto' 'xorg-util-macros' 'pixman' 'libpciaccess')
+ depends=('xproto' 'randrproto' 'renderproto' 'xextproto' 'inputproto' 'kbproto' 'fontsproto' 'videoproto' 'dri2proto' 'xineramaproto' 'xorg-util-macros' 'pixman' 'libpciaccess' 'resourceproto' 'scrnsaverproto' 'xorg-util-macros')
provides=("xorg-server-devel=${pkgver}")
conflicts=('xorg-server-devel')
Oops, something went wrong.

0 comments on commit 99b8b0b

Please sign in to comment.