Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=ff6940110ca98c443d2a491f67af9da4e29dc1c2
commit ff6940110ca98c443d2a491f67af9da4e29dc1c2
Author: Elentir <elen...@frugalware.org>
Date: Thu Jun 3 18:58:23 2010 +0200
xorg-server-minimal-1.8.1-1-i686
* version bump
diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild
b/source/x11-extra/xorg-server-minimal/FrugalBuild
index 678702d..9ac320e 100644
--- a/source/x11-extra/xorg-server-minimal/FrugalBuild
+++ b/source/x11-extra/xorg-server-minimal/FrugalBuild
@@ -1,28 +1,28 @@
-# Compiling Time: 6.34 SBU
-# Maintainer: Elentir <elen...@mailoo.org>
+# Compiling Time: 1.23 SBU
+# Maintainer: Elentir <elen...@frugalware.org>
pkgname=xorg-server-minimal
_F_xorg_name=xorg-server
-pkgver=1.7.5
+pkgver=1.8.1
pkgrel=1
pkgdesc="X.Org X Server for Fwife Install CD"
groups=('x11-extra')
archs=('i686' 'x86_64' )
depends=('libxfont>=1.4.0' 'libx11>=1.3' 'xtrans>=1.2.3' 'libxau>=1.0.4'
'libsm' \
'libxkbfile>=1.0.5' 'libxdmcp>=1.0.2-2' 'libxrender>=0.9.4-3' 'libxext' \
- 'freetype2' 'xkeyboard-config>=1.7' 'pixman>=0.16.0'
'libpciaccess>=0.10.8')
+ 'freetype2' 'xkeyboard-config>=1.7' 'pixman>=0.18.2'
'libpciaccess>=0.10.8')
makedepends=('randrproto>=1.3.0' 'renderproto>=0.9.3' 'fixesproto'
'damageproto>=1.1.0' 'xproto>=7.0.15' \
'xf86dgaproto' 'compositeproto>=0.4' 'resourceproto' 'videoproto>=2.2.2'
'scrnsaverproto' 'evieext' \
'fontsproto' 'kbproto' 'inputproto>=1.5' 'bigreqsproto' 'xcmiscproto'
'xextproto>=7.0.99.3' \
- 'fontcacheproto' 'util-macros>=1.2.1')
+ 'fontcacheproto' 'util-macros>=1.8.0' 'recordproto' 'font-util>=1.1.1')
Finclude xorg
## fix up2date by grepv'ing the beta and other weird version number
-up2date="lynx -dump $_F_xorg_url | grep -v '1.7.99' | grep -v '902' | grep -v
'901' | Flasttar"
+up2date="lynx -dump $_F_xorg_url | grep -v '902' | grep -v '901' | Flasttar"
F_cd_path=$_F_xorg_name-$pkgver
options=("nodocs")
source=($source hack-since-suffix-support-is-half-br0ken.patch)
-sha1sums=('c385293b66a6b0bc6bad648588f611d844c26ee7' \
- 'aee256e862e7cae581f155df159843212416e81b')
+sha1sums=('cba0d3b3d28696609a1f9b110d4d129cd066e133' \
+ 'a3d4c81bd6b5efea6734ea813923ead8930096a4')
Fconfopts="$Fconfopts --enable-install-setuid \
--disable-kdrive --disable-xvfb\
--disable-glx --disable-xvmc \
@@ -33,7 +33,9 @@ Fconfopts="$Fconfopts --enable-install-setuid \
--disable-screensaver --disable-xres \
--disable-composite --with-xkb-output=/var/lib/xkb \
--with-xkb-path=/usr/lib/X11/xkb --disable-xnest \
- --disable-dbe --program-suffix='-fwife'
--with-module-dir=/usr/lib/xorg-fwife/modules"
+ --disable-dbe --program-suffix='-fwife' \
+ --with-module-dir=/usr/lib/xorg-fwife/modules \
+ --disable-config-dbus --disable-config-udev"
export CFLAGS="`echo $CFLAGS |sed 's|-O2|-Os|g'`"
@@ -46,9 +48,8 @@ build()
Fmakeinstall
Frm usr/include
Frm usr/share/{aclocal,man}
- Frm usr/lib/xorg/protocol.txt
+ Frm usr/lib/{xorg,pkgconfig}
Frm var/lib/xkb/README.compiled
- Frm usr/lib/pkgconfig
Frm usr/lib/xorg-fwife/modules/multimedia
}
# optimization OK
diff --git
a/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
index 1d84c6d..ab3a594 100644
---
a/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
+++
b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch
@@ -1,5 +1,6 @@
---- xorg-server-1.7.4/hw/xfree86/Makefile.am 2009-11-30 06:42:31.000000000
+0100
-+++ xorg-server-1.7.4-p/hw/xfree86/Makefile.am 2010-02-10 17:39:45.000000000
+0100
+diff -Naur xorg-server-1.8.1/hw/xfree86/Makefile.am
xorg-server-1.8.1-2/hw/xfree86/Makefile.am
+--- xorg-server-1.8.1/hw/xfree86/Makefile.am 2010-05-05 00:21:24.000000000
+0200
++++ xorg-server-1.8.1/hw/xfree86/Makefile.am 2010-06-03 17:16:00.039142074
+0200
@@ -102,10 +102,10 @@
@@ -18,8 +19,8 @@
-DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\"
relink:
-- rm -f Xorg && $(MAKE) Xorg
-+ rm -f Xorg-fwife && $(MAKE) Xorg
+- $(AM_V_at)rm -f Xorg && $(MAKE) Xorg
++ $(AM_V_at)rm -f Xorg-fwife && $(MAKE) Xorg
xorg.conf.example.pre: xorgconf.cpp
cp $(srcdir)/xorgconf.cpp $@
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
