Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=6e0c57165d763e858bedc878de0faea20ebdef05
commit 6e0c57165d763e858bedc878de0faea20ebdef05
Author: Christian Hamar alias krix <[EMAIL PROTECTED]>
Date: Sun Sep 9 16:30:39 2007 +0200
xorg-server-1.4-1-x86_64
* Version bump
* Reviewed patches which not need anymore
* Added 4 more configure options
- NOTE: we dont use hal/dbus for autoconfig* foo actually
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index d74cf76..cd710af 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -2,29 +2,28 @@
# Maintainer: Christian Hamar alias krix <[EMAIL PROTECTED]>
pkgname=xorg-server
-pkgver=1.2.0
-pkgrel=8
+pkgver=1.4
+pkgrel=1
mesaver=7.0.1
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64')
-depends=('libxfont' 'libx11>=1.1.2' 'xtrans' 'libxau' \
- 'libxext' 'libxkbfile' 'libxdmcp' 'libxmu' 'libxrender' \
- 'libxi>=1.1.1' 'freetype2' 'mesa>=7.0.1' 'font-cursor-misc'
'font-misc-misc' \
- 'xbitmaps' 'xkeyboard-config' 'iceauth' 'rgb' 'xauth' 'xinit' 'libxaw' \
- 'libxpm' 'libxxf86misc' 'libxxf86vm' 'libxkbui' 'liblbxutil' \
- 'xorg-cf-files' 'libxtst' 'font-alias' 'libxcb')
-makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto' 'xextproto'
'xproto' \
+depends=('libxfont>=1.3.1' 'libx11>=1.1.3' 'xtrans>=1.0.4' 'libxau>=1.0.3-2' \
+ 'libxext>=1.0.3' 'libxkbfile>=1.0.4-2' 'libxdmcp>=1.0.2-2'
'libxmu>=1.0.3-2' 'libxrender>=0.9.4' \
+ 'libxi>=1.1.3' 'freetype2' 'mesa>=7.0.1-2' 'font-cursor-misc>=1.0.0-2'
'font-misc-misc>=1.0.0-2' \
+ 'xbitmaps' 'xkeyboard-config>=1.0-2' 'iceauth>=1.0.2' 'rgb>=1.0.1-2'
'xauth>=1.0.2-2' 'xinit>=1.0.5' 'libxaw>=1.0.4' \
+ 'libxpm>=3.5.7' 'libxxf86misc>=1.0.1-2' 'libxxf86vm>=1.0.1-2'
'libxkbui>=1.0.2-2' 'liblbxutil>=1.0.1-2' \
+ 'xorg-cf-files' 'libxtst>=1.0.3' 'font-alias' 'libxcb>=1.0-4' 'pixman')
+makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto>=1.1.0'
'xextproto' 'xproto' \
'xf86dgaproto' 'xf86miscproto' 'xf86rushproto' 'xf86vidmodeproto'
'xf86bigfontproto' \
- 'compositeproto' 'recordproto' 'resourceproto' 'videoproto'
'scrnsaverproto' 'evieext' \
- 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto' 'inputproto'
'bigreqsproto' 'xcmiscproto' \
- 'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir'
'mkfontscale' \
- 'fontcacheproto' 'xorg-sgml-doctools' 'util-macros')
+ 'compositeproto>=0.4' 'recordproto' 'resourceproto' 'videoproto'
'scrnsaverproto' 'evieext' \
+ 'trapproto' 'xineramaproto' 'fontsproto' 'kbproto'
'inputproto>=1.4.2.1' 'bigreqsproto' 'xcmiscproto' \
+ 'glproto' 'xf86driproto' 'libdrm' 'printproto' 'mkfontdir>=1.0.3'
'mkfontscale>=1.0.3-3' \
+ 'fontcacheproto' 'xorg-sgml-doctools>=1.2' 'util-macros>=1.1.5-2')
rodepends=('xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vga'
'xf86-video-vesa' 'libglx')
provides=('xorg-compat')
replaces=('xorg-compat')
backup=('etc/sysconfig/desktop')
-_F_xorg_nr=2
Finclude xorg
source=([EMAIL PROTECTED]
http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2 \
01-kernel-headers-fix.patch \
@@ -35,13 +34,8 @@ source=([EMAIL PROTECTED]
http://dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesav
change-default-dri-driver-dir-X7.1.patch \
mesa-build-config.patch \
F-xorg-x11-server-0.99.3-init-origins-fix.patch0 \
- F-xorg-x11-server-1.1.1-graphics-expose.patch \
xprint-rc-files-fix.patch \
- no-aiglx.patch \
- bug-9367.patch \
- mesa-6.5.3.patch \
- remove__GLinterface.patch \
-
http://xorg.freedesktop.org/archive/X11R7.2/patches/xorg-xserver-1.2.0-xcmisc.diff)
+ no-aiglx.patch)
subpkgs=('libglx')
subdescs=('Glx library for XOrg.')
@@ -55,25 +49,21 @@ build() {
Fpatch change-default-dri-driver-dir-X7.1.patch
Fpatch mesa-build-config.patch
- cd $Fsrcdir/$_F_xorg_name-$_F_xorg_version$_F_xorg_nr-$pkgver || Fdie
+ cd $Fsrcdir/$_F_xorg_name-$pkgver || Fdie
Fpatch 01-kernel-headers-fix.patch
Fpatch 02-access_c_skip_null_addresses.patch
Fpatch 03-black-background.patch
# From fedora, misc fixes.
Fpatch F-xorg-x11-server-0.99.3-init-origins-fix.patch0
- Fpatch F-xorg-x11-server-1.1.1-graphics-expose.patch
# Hack for init scripts and wrong install stuff for xprint
Fpatch xprint-rc-files-fix.patch
## this disables AIGLX by default , uncomment it to enable
## Fpatch no-aiglx.patch
## workaround ATI's closes source c***
## see https://bugs.freedesktop.org/show_bug.cgi?id=9367
- Fpatch bug-9367.patch
- ## SEC stuff , see BTS #1910
- Fpatch xorg-xserver-1.2.0-xcmisc.diff
- ## as always xorg devels -> <-mesa devels mess ..
- Fpatch mesa-6.5.3.patch
- Fpatch remove__GLinterface.patch
+ ##############
+ # DISABLED AT 1.4 (we will see whats up ##
+# Fpatch bug-9367.patch
## GCC 4.2.0 bug do **NOT** remove this hack or it will kill your box!!
## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
echo 'CFLAGS = @CFLAGS@ -O0' >> hw/xfree86/scanpci/Makefile.am
@@ -102,7 +92,11 @@ build() {
--with-builder-addr="[EMAIL PROTECTED]" \
--with-xkb-output=/var/lib/xkb \
--with-xkb-path=/usr/lib/X11/xkb \
- --disable-xorgcfg
+ --disable-xorgcfg \
+ --enable-xcalibrate \
+ --enable-fontcache \
+ --enable-multibuffer \
+ --disable-config-hal # DISABLED THIS for 0.7 release
Fmakeinstall
Ffile /etc/sysconfig/desktop
@@ -116,7 +110,7 @@ build() {
Fsplit libglx usr/lib/xorg/modules/extensions/libglx.*
}
-sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106' \
+sha1sums=('3aa6327f4def4d33ce2a8d6d7587295db231ab6d' \
'deb1002cf377ba8bd9407bd3cf573f8c8be31671' \
'f31702e0029b2d68018598e73ed55c4d6c58367b' \
'859b98a4049400be152032fc09ceff2afe9e6dcf' \
@@ -126,11 +120,6 @@ sha1sums=('3c4e8ae90fafdddb4ec6e640b693c2beb295d106' \
'426b0b08617ec19cba41ab20f3891cab82f205a2' \
'f7f706ec568a80543c6d6096b3d8a833b80399ed' \
'2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \
- '31938c89a107ce89b06287b28c6d355ecaa13217' \
'0eb64d46172b6f2f4462c02dad7964c6d7656076' \
- 'f53de93da5e110867db8b1655b5798d2049f43ae' \
- '22025bd7b96deec8cd31f24fe87a170f1c7898d1' \
- 'f257b56953e9756d38aa01c7f7f5d9a13160576c' \
- '6473a13b65db3e44ba8b369a6a9c667887c41a52' \
- '3557cbe23be6912106ed7220d95301311fb93a26')
+ 'f53de93da5e110867db8b1655b5798d2049f43ae')
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
