Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=67e7b4be692cfb4d627c392a4b31fbce3d898278
commit 67e7b4be692cfb4d627c392a4b31fbce3d898278
Author: bouleetbil <bouleet...@frogdev.info>
Date: Sun Jun 13 20:43:23 2010 +0000
xorg-server-1.8.1-2-i686
*drop useless patch
*enable udev support
*automatise layout keyboard with the local
*enable support touchpad by default (more simple)
*now works without xorg.conf and should works out of box !!!
diff --git a/source/x11/xorg-server/10-evdev.conf
b/source/x11/xorg-server/10-evdev.conf
new file mode 100644
index 0000000..88e10af
--- /dev/null
+++ b/source/x11/xorg-server/10-evdev.conf
@@ -0,0 +1,8 @@
+Section "InputClass"
+ Identifier "evdev keyboard catchall"
+ MatchIsKeyboard "on"
+ MatchDevicePath "/dev/input/event*"
+ Driver "evdev"
+ Option "xkb_layout" "Keyboard_Layout"
+EndSection
+
diff --git a/source/x11/xorg-server/20-synaptics.conf
b/source/x11/xorg-server/20-synaptics.conf
new file mode 100644
index 0000000..19290e9
--- /dev/null
+++ b/source/x11/xorg-server/20-synaptics.conf
@@ -0,0 +1,14 @@
+Section "InputClass"
+Identifier "Touchpad"
+Driver "synaptics"
+MatchIsTouchpad "on"
+Option "SHMConfig" "true"
+Option "MinSpeed" "0.20"
+Option "MaxSpeed" "0.60"
+Option "AccelFactor" "0.020"
+Option "HorizEdgeScroll" "true"
+Option "HorizScrollDelta" "100"
+Option "VertEdgeScroll" "true"
+Option "VertScrollDelta" "100"
+Option "TapButton1" "1"
+EndSection
diff --git a/source/x11/xorg-server/FrugalBuild
b/source/x11/xorg-server/FrugalBuild
index 93f14d9..b3e1649 100644
--- a/source/x11/xorg-server/FrugalBuild
+++ b/source/x11/xorg-server/FrugalBuild
@@ -4,13 +4,13 @@
USE_DEVEL=${USE_DEVEL:-"n"}
USE_DGA=${USE_DGA:-"y"}
USE_KDRIVE=${USE_KDRIVE:-"y"}
-USE_UDEV=${USE_UDEV:-"n"}
+USE_UDEV=${USE_UDEV:-"y"}
USE_SERVERDMX=${USE_SERVERDMX:-"y"}
USE_MULTIBUFFER=${USE_MULTIBUFFER:-"n"}
pkgname=xorg-server
pkgver=1.8.1
-pkgrel=1
+pkgrel=2
pkgdesc="Modular X.Org X Server"
groups=('x11' 'xorg-core')
archs=('i686' 'x86_64' 'ppc')
@@ -32,13 +32,16 @@ provides=('xorg-server-smi' 'xorg-server-vesa'
'xorg-server-via' 'lbxproxy' 'pro
replaces=('xorg-server-smi' 'xorg-server-vesa' 'xorg-server-via' 'lbxproxy'
'proxymngr' \
'liblbxutil' 'xgl' 'xorg-server-sdl')
-backup=('etc/sysconfig/desktop')
+backup=('etc/sysconfig/desktop' 'etc/X11/xorg.conf.d/10-evdev.conf' \
+ 'etc/X11/xorg.conf.d/20-synaptics.conf')
Finclude sourceforge xorg
source=(${sour...@]} \
- desktop)
+ desktop 10-evdev.conf 20-synaptics.conf)
sha1sums=('cba0d3b3d28696609a1f9b110d4d129cd066e133' \
- '676c8ad10a362615ae54de825e37c18c1f69ae08')
+ '676c8ad10a362615ae54de825e37c18c1f69ae08' \
+ '75f196f82ae19a335b83971b6fbb0f49a9bf6a58' \
+ '6c0156d129ddd2fb5277b76af1738298c2d09d4d')
if Fuse $USE_DEVEL; then
pkgver=1.6.3.901.151.g120286a
@@ -74,7 +77,7 @@ if Fuse $USE_UDEV; then
depends=(${depen...@]} 'dbus' 'udev')
rodepends=(${rodepen...@]} 'xf86-input-evdev')
Fconfopts="${fconfop...@]} \
- --enable-config-dbus \
+ --disable-config-dbus \
--disable-config-hal \
--enable-config-udev"
else
@@ -127,7 +130,7 @@ if Fuse $USE_SERVERDMX; then
else
Fconfopts="${fconfop...@]} --disable-multibuffer"
fi
-
+
else
Fconfopts="${fconfop...@]}
--disable-dmx \
@@ -182,6 +185,9 @@ build() {
## -fbdev
Fsplit $pkgname-fbdev usr/bin/Xfbdev
fi
+ Fmkdir etc/X11/xorg.conf.d
+ Fcp 10-evdev.conf etc/X11/xorg.conf.d/
+ Fcp 20-synaptics.conf etc/X11/xorg.conf.d/
}
# optimization OK
diff --git a/source/x11/xorg-server/xge-no-extension-events.diff
b/source/x11/xorg-server/xge-no-extension-events.diff
deleted file mode 100644
index 36b466d..0000000
--- a/source/x11/xorg-server/xge-no-extension-events.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/Xext/geext.c b/Xext/geext.c
-index 2ba0ca8..f0a3d87 100644
---- a/Xext/geext.c
-+++ b/Xext/geext.c
-@@ -36,11 +36,8 @@
-
- #define rClient(obj) (clients[CLIENT_ID((obj)->resource)])
-
--int GEEventBase;
--int GEErrorBase;
- static int GEClientPrivateKeyIndex;
- DevPrivateKey GEClientPrivateKey = &GEClientPrivateKeyIndex;
--int GEEventType; /* The opcode for all GenericEvents will have. */
-
- int RT_GECLIENT = 0;
-
-@@ -178,10 +175,6 @@ GEResetProc(ExtensionEntry *extEntry)
- {
- DeleteCallback(&ClientStateCallback, GEClientCallback, 0);
- EventSwapVector[GenericEvent] = NotImplemented;
--
-- GEEventBase = 0;
-- GEErrorBase = 0;
-- GEEventType = 0;
- }
-
- /* Calls the registered event swap function for the extension.
-@@ -225,14 +218,10 @@ GEExtensionInit(void)
- }
-
- if((extEntry = AddExtension(GE_NAME,
-- GENumberEvents, GENumberErrors,
-+ 0, GENumberErrors,
- ProcGEDispatch, SProcGEDispatch,
- GEResetProc, StandardMinorOpcode)) != 0)
- {
-- GEEventBase = extEntry->eventBase;
-- GEErrorBase = extEntry->errorBase;
-- GEEventType = GEEventBase;
--
- memset(GEExtensions, 0, sizeof(GEExtensions));
-
- EventSwapVector[GenericEvent] = (EventSwapPtr) SGEGenericEvent;
-diff --git a/Xext/geint.h b/Xext/geint.h
-index 881d306..10a33ce 100644
---- a/Xext/geint.h
-+++ b/Xext/geint.h
-@@ -37,9 +37,6 @@
- #include "extnsionst.h"
- #include <X11/extensions/geproto.h>
-
--extern _X_EXPORT int GEEventType;
--extern _X_EXPORT int GEEventBase;
--extern _X_EXPORT int GEErrorBase;
- extern _X_EXPORT DevPrivateKey GEClientPrivateKey;
-
- typedef struct _GEClientInfo {
diff --git a/source/x11/xorg-server/xorg-server.install
b/source/x11/xorg-server/xorg-server.install
new file mode 100644
index 0000000..c10d8a0
--- /dev/null
+++ b/source/x11/xorg-server/xorg-server.install
@@ -0,0 +1,16 @@
+post_install()
+{
+ echo "Update layout keyboard with ${LANG:0:2}"
+ sed -i "/xkb_layout/s/Keyboard_Layout/${LANG:0:2}/"
/etc/X11/xorg.conf.d/10-evdev.conf
+}
+
+post_upgrade()
+{
+ post_install
+}
+
+
+op=$1
+shift
+
+$op $*
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
