Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg74.git;a=commitdiff;h=a91a7d5ece5bcfba01a2ab4493a2441b2a01ce5e
commit a91a7d5ece5bcfba01a2ab4493a2441b2a01ce5e
Author: Devil505 <devil505li...@gmail.com>
Date: Wed Jun 3 22:06:17 2009 +0200
xorg-server-1.6.1-1-x86_64
* version bump
* added a patch for xfree86 Makefile.am
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index 0a725de..477876e 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -2,31 +2,29 @@
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>
pkgname=xorg-server
-pkgver=1.4.2
+pkgver=1.6.1
pkgrel=1
-mesaver=7.0.2
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
-depends=('libxfont>=1.3.1-2' 'libx11>=1.1.3-2' '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.2-2' 'font-cursor-misc>=1.0.0-2'
'font-misc-misc>=1.0.0-2' \
- 'xbitmaps' 'xkeyboard-config>=1.1-2' 'iceauth>=1.0.2-2' 'rgb>=1.0.1-2'
'xauth>=1.0.2-2' 'xinit>=1.0.7' '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>=0.9.6')
-makedepends=('randrproto' 'renderproto' 'fixesproto' 'damageproto>=1.1.0'
'xextproto' 'xproto' \
+depends=('hal>=0.5.11' 'libxfont>=1.4.0' 'libx11>=1.2.1' 'xtrans>=1.2.3'
'libxau>=1.0.4' \
+ 'libxext>=1.0.5-3' 'libxkbfile>=1.0.5' 'libxdmcp>=1.0.2-2'
'libxmu>=1.0.4-2' 'libxrender>=0.9.4-3' \
+ 'libxi>=1.2.1' 'freetype2' 'mesa>=7.4.2-4' 'font-cursor-misc>=1.0.0-3'
'font-misc-misc>=1.0.0-3' \
+ 'xbitmaps' 'xkeyboard-config>=1.6' 'iceauth>=1.0.2-3' 'rgb>=1.0.3'
'xauth>=1.0.3' 'xinit>=1.1.1' 'libxaw>=1.0.5' \
+ 'libxpm>=3.5.7-2' 'libxxf86misc>=1.0.1-3' 'libxxf86vm>=1.0.1-3'
'libxkbui>=1.0.2-2' 'liblbxutil>=1.0.1-4' \
+ 'xorg-cf-files' 'libxtst>=1.0.3-3' 'font-alias' 'libxcb>=1.3'
'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' \
- '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'
'calibrateproto' 'libdmx' 'libxres' 'sdl')
+ '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-3' \
+ 'fontcacheproto' 'xorg-sgml-doctools>=1.2' 'util-macros>=1.2.1'
'calibrateproto' 'libdmx>1.0.2-3' 'libxres>=1.0.3-3' 'sdl' 'libxinerama>=1.0.3')
rodepends=('xf86-input-mouse' 'xf86-input-keyboard' 'xf86-video-vga'
'xf86-video-vesa' 'libglx')
provides=('xorg-compat')
replaces=('xorg-compat')
backup=('etc/sysconfig/desktop')
Finclude sourceforge xorg
source=(${sour...@]} \
-
http://$_F_sourceforge_mirror.dl.sourceforge.net/sourceforge/mesa3d/MesaLib-$mesaver.tar.bz2
\
bug13511.patch \
01-kernel-headers-fix.patch \
02-access_c_skip_null_addresses.patch \
@@ -37,10 +35,10 @@ source=(${sour...@]} \
mesa-build-config.patch \
F-xorg-x11-server-0.99.3-init-origins-fix.patch0 \
xprint-rc-files-fix.patch \
- 1.4-fix-kdrive-automake.patch)
+ 1.4-fix-kdrive-automake.patch \
+ xfree86-Makefile.patch)
-sha1sums=('385348721ecb6da4bc51a2b7ee5784de6be0a8b6' \
- 'd16eaeb1d9d95d11d3b6d289b1ba87108b88da90' \
+sha1sums=('aef6d1cd1cbb97fa3214fde6fbefb03a45578132' \
'cc156003c1e8787b04f6949d4e12f859e939c5e6' \
'f31702e0029b2d68018598e73ed55c4d6c58367b' \
'859b98a4049400be152032fc09ceff2afe9e6dcf' \
@@ -51,7 +49,8 @@ sha1sums=('385348721ecb6da4bc51a2b7ee5784de6be0a8b6' \
'f7f706ec568a80543c6d6096b3d8a833b80399ed' \
'2937d6a50155cc16f73ae44b1e5b6e26cabbb86a' \
'0eb64d46172b6f2f4462c02dad7964c6d7656076' \
- 'f21a54aed8eae1e718f2f0c262c37c36ccccd152')
+ 'f21a54aed8eae1e718f2f0c262c37c36ccccd152' \
+ '029bb1605e5da6c9bdeec5796b80400a851b111a')
subpkgs=('libglx' \
"$pkgname-dmx" "$pkgname-ati" "$pkgname-chips" "$pkgname-xephyr" \
@@ -104,10 +103,10 @@ subarchs=('i686 x86_64 ppc' \
'i686 x86_64 ppc' 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc' 'i686 !x86_64 !ppc')
build() {
- cd $Fsrcdir/Mesa-$mesaver || Fdie
+ #cd $Fsrcdir/Mesa-$mesaver || Fdie
# Mesa specific patches from the mesa package
- Fpatch change-default-dri-driver-dir-X7.1.patch
- Fpatch mesa-build-config.patch
+ #Fpatch change-default-dri-driver-dir-X7.1.patch
+ #Fpatch mesa-build-config.patch
cd $Fsrcdir/$_F_xorg_name-$pkgver || Fdie
Fpatch 01-kernel-headers-fix.patch
@@ -116,11 +115,16 @@ build() {
# From fedora, misc fixes.
Fpatch F-xorg-x11-server-0.99.3-init-origins-fix.patch0
# Hack for init scripts and wrong install stuff for xprint
- Fpatch xprint-rc-files-fix.patch
- Fpatch 1.4-fix-kdrive-automake.patch
+ #Fpatch xprint-rc-files-fix.patch
+ #Fpatch 1.4-fix-kdrive-automake.patch
## fixes from 1.4-branch
Fpatch bug13511.patch
+ # Fix dbus config path
+ #Fsed "$(sysconfdir)" "/etc/" config/Makefile.*
+
+ Fpatch xfree86-Makefile.patch
+
Fautoreconf
Fmake \
@@ -143,7 +147,6 @@ build() {
--sysconfdir=/etc/X11 \
--localstatedir=/var \
--enable-multibuffer \
- --with-mesa-source=$Fsrcdir/Mesa-$mesaver \
--with-vendor-web="http://www.frugalware.org"; \
--with-os-name="Frugalware Linux" \
--with-os-vendor="Frugalware.org Development Team" \
@@ -154,7 +157,14 @@ build() {
--enable-xcalibrate \
--enable-fontcache \
--enable-multibuffer \
- --disable-config-hal # DISABLED THIS for now , not really
complete
+ --enable-xnest \
+ --enable-composite \
+ --enable-glx-tls \
+ --enable-install-setuid \
+ --enable-config-hal \
+ --enable-config-dbus \
+ --enable-record \
+ #--disable-config-hal # DISABLED THIS for now , not really
complete
Fmakeinstall
# TODO - Move away from here
Ffile /etc/sysconfig/desktop
diff --git a/source/x11/xorg-server/xfree86-Makefile.patch
b/source/x11/xorg-server/xfree86-Makefile.patch
new file mode 100644
index 0000000..f8a0362
--- /dev/null
+++ b/source/x11/xorg-server/xfree86-Makefile.patch
@@ -0,0 +1,13 @@
+diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
+index ca452c6..01b9cf3 100644
+--- a/hw/xfree86/common/Makefile.am
++++ b/hw/xfree86/common/Makefile.am
+@@ -51,7 +48,7 @@ sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h
xf86Opt.h \
+ xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
+ xf86cmap.h xf86fbman.h xf86str.h xf86RAC.h xf86Xinput.h xisb.h \
+ $(XVSDKINCS) xorgVersion.h \
+- xf86sbusBus.h xf86xv.h xf86xvmc.h xf86xvpriv.h
++ xf86sbusBus.h
+
+ DISTCLEANFILES = xf86Build.h
+ CLEANFILES = $(BUILT_SOURCES)
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
