IPFire-SCM August 2010

ipfire-scm@lists.ipfire.org

1 participants
47 discussions

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d2acf4f15b628d3208bc0b64bbcbf5c966045050
by git＠ipfire.org 27 Aug '10

27 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via d2acf4f15b628d3208bc0b64bbcbf5c966045050 (commit) from b91f052330367cef3ad8260735ffa45e1179b46c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d2acf4f15b628d3208bc0b64bbcbf5c966045050 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 18:07:46 2010 +0200 Fix x server dependency in xorg driver files. ----------------------------------------------------------------------- Summary of changes: pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 2 +- .../xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 2 +- pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 2 +- pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm index 4939399..2a63386 100644 --- a/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm +++ b/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm @@ -34,7 +34,7 @@ PKG_URL = http://www.x.org/ PKG_LICENSE = MIT PKG_SUMMARY = Xorg X11 evdev input driver. -PKG_DEPS += libxbkfile xkeyboard-config xorg-server +PKG_DEPS += libxbkfile xkeyboard-config xorg-x11-server define PKG_DESCRIPTION X.Org X11 evdev input driver. diff --git a/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm index 51353b1..86aa44b 100644 --- a/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm +++ b/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm @@ -35,7 +35,7 @@ PKG_LICENSE = MIT PKG_SUMMARY = Xorg X11 keyboard input driver. PKG_BUILD_DEPS += libpciaccess libX11 pkg-config xorg-x11-util-macros -PKG_DEPS+= xorg-server +PKG_DEPS += xorg-x11-server define PKG_DESCRIPTION X.Org X11 keyboard input driver. diff --git a/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm index 0d83825..f8227ff 100644 --- a/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm +++ b/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm @@ -35,7 +35,7 @@ PKG_LICENSE = MIT PKG_SUMMARY = Xorg X11 mouse input driver. PKG_BUILD_DEPS += libpciaccess libX11 pkg-config xorg-x11-util-macros -PKG_DEPS+= xorg-server +PKG_DEPS += xorg-x11-server define PKG_DESCRIPTION X.Org X11 mouse input driver. diff --git a/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm index ece63c2..2fa4036 100644 --- a/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm +++ b/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm @@ -35,7 +35,7 @@ PKG_LICENSE = MIT PKG_SUMMARY = Xorg X11 vesa video driver. PKG_BUILD_DEPS += libpciaccess libX11 pkg-config xorg-x11-util-macros -PKG_DEPS+= xorg-server +PKG_DEPS += xorg-x11-server define PKG_DESCRIPTION X.Org X11 vesa video driver. hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. b91f052330367cef3ad8260735ffa45e1179b46c
by git＠ipfire.org 27 Aug '10

27 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via b91f052330367cef3ad8260735ffa45e1179b46c (commit) via c8152d106188d8fac05370a7704c4003e4722841 (commit) via 13e5c9f494c04cbb6742f49deb4c967bc2d57f46 (commit) via 5c472486ef63fbe1ebe10351dfb6d541cc375b2b (commit) via aef6765d5fc5faa607bb9d5b47a16bc70d956856 (commit) via 7d6ed06d4544e0c391bfca65e002685f1ff0ebe3 (commit) via c8880961daf39257167a414463d430434ee19b1d (commit) via 6e11f54a81ece286fc670ad65e571fc22f06741c (commit) via 9784d37738049f6f528f8a622feedaa07ccf4404 (commit) via 39b450d4de8a902cc5c69825908c8da39b950164 (commit) via 32685f255ef31fe648852d2f550672a05315a225 (commit) via ac50f5020f833dfd4bcd27532a23994beea23822 (commit) via f48a2b07a26db73343eef352097d6d8ab0a15652 (commit) via 629b98633df10f07d289a9a7ca6301b9a2897d30 (commit) via 8d92364abf0d34f16faaa3b68531b05c2e713c5d (commit) from 9eec6c0b5945014b2eb047b255efa443c83ec4ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b91f052330367cef3ad8260735ffa45e1179b46c Merge: c8152d1 13e5c9f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 27 17:23:44 2010 +0200 Merge commit 'stevee/updates' into next commit c8152d106188d8fac05370a7704c4003e4722841 Merge: 9eec6c0 9784d37 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 27 17:23:24 2010 +0200 Merge commit 'stevee/x-fixes' into next commit 13e5c9f494c04cbb6742f49deb4c967bc2d57f46 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 17:15:43 2010 +0200 sudo: Add missing URL information. commit 5c472486ef63fbe1ebe10351dfb6d541cc375b2b Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 17:14:55 2010 +0200 sudo: Update to 1.7.4p3. Fixes #52. commit aef6765d5fc5faa607bb9d5b47a16bc70d956856 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 17:06:36 2010 +0200 libssh2: Update to 1.2.7. Fixes #51. commit 7d6ed06d4544e0c391bfca65e002685f1ff0ebe3 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 16:52:43 2010 +0200 make: Add Michael Tremer as maintainer. commit c8880961daf39257167a414463d430434ee19b1d Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 16:51:32 2010 +0200 make: Update to 3.82. commit 6e11f54a81ece286fc670ad65e571fc22f06741c Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 16:29:12 2010 +0200 vsftpd: Update to 2.3.2. Fixes #48. commit 9784d37738049f6f528f8a622feedaa07ccf4404 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 15:29:53 2010 +0200 Add myself as maintainer for x-server related packages. commit 39b450d4de8a902cc5c69825908c8da39b950164 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 15:06:14 2010 +0200 xorg-x11-server: Some small cosmetic fixes and also create a development package. commit 32685f255ef31fe648852d2f550672a05315a225 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 14:59:57 2010 +0200 xorg-x11-server: Fix Naoki-Makefile after rename of the package. commit ac50f5020f833dfd4bcd27532a23994beea23822 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 14:56:52 2010 +0200 xorg-x11-server: Set myself as maintainer. commit f48a2b07a26db73343eef352097d6d8ab0a15652 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 14:48:00 2010 +0200 xorg-server: Rename package to xorg-x11-server. commit 629b98633df10f07d289a9a7ca6301b9a2897d30 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 14:42:36 2010 +0200 xorg-server: Add default xorg.conf to load needed modules. We are using a BIND_NOW feature from the GNU ld, so the xorg server can't load the modules automatically and we had to load them manually. This fixes #49. commit 8d92364abf0d34f16faaa3b68531b05c2e713c5d Merge: e86c7a1 aebdc8e Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 14:32:59 2010 +0200 Merge branch 'x-server' of ssh://git.ipfire.org/pub/git/people/stevee/ipfire-3.x into x-fixes ----------------------------------------------------------------------- Summary of changes: pkgs/core/libX11/libX11.nm | 2 +- pkgs/core/libXau/libXau.nm | 2 +- pkgs/core/libXext/libXext.nm | 2 +- pkgs/core/libXfont/libXfont.nm | 2 +- pkgs/core/libfontenc/libfontenc.nm | 3 +- pkgs/core/libssh2/libssh2.nm | 2 +- pkgs/core/libxcb/libxcb.nm | 2 +- pkgs/core/libxkbfile/libxkbfile.nm | 2 +- pkgs/core/libxslt/libxslt.nm | 2 +- pkgs/core/make/make.nm | 4 +- .../make/patches/make-3.79.1-noclock_gettime.patch | 13 - pkgs/core/make/patches/make-3.80-getcwd.patch | 15 -- pkgs/core/make/patches/make-3.81-fdleak.patch | 60 ----- pkgs/core/make/patches/make-3.81-jobserver.patch | 18 -- pkgs/core/make/patches/make-3.81-memory.patch | 261 -------------------- pkgs/core/make/patches/make-3.81-newlines.patch | 23 -- pkgs/core/make/patches/make-3.81-rlimit.patch | 111 --------- .../make/patches/make-3.81-strcpy-overlap.patch | 16 -- ...porting.patch => make-3.82-err-reporting.patch} | 93 ++++---- pkgs/core/make/patches/make-3.82-getcwd.patch | 14 + .../{make-3.80-j8k.patch => make-3.82-j8k.patch} | 13 +- pkgs/core/make/patches/make-3.82-jobserver.patch | 19 ++ pkgs/core/make/patches/make-3.82-newlines.patch | 30 +++ .../make/patches/make-3.82-noclock_gettime.patch | 14 + pkgs/core/make/patches/make-3.82-weird-shell.patch | 16 ++ pkgs/core/sudo/sudo.nm | 4 +- pkgs/core/vsftpd/vsftpd.nm | 2 +- pkgs/core/xcb-proto/xcb-proto.nm | 2 +- pkgs/core/xkeyboard-config/xkeyboard-config.nm | 2 +- pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 2 +- .../xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 2 +- pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 2 +- pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 2 +- .../xorg-x11-font-utils/xorg-x11-font-utils.nm | 2 +- pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm | 2 +- .../xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 2 +- .../10-quirks.conf | 0 .../patches/xserver-1.4.99-pic-libxf86config.patch | 0 .../patches/xserver-1.4.99-ssh-isnt-local.patch | 0 .../patches/xserver-1.5.0-bg-none-root.patch | 0 .../patches/xserver-1.5.0-projector-fb-size.patch | 0 .../patches/xserver-1.5.1-mode-debug.patch | 0 .../patches/xserver-1.6.0-displayfd.patch | 0 .../xserver-1.6.0-less-acpi-brokenness.patch | 0 .../patches/xserver-1.6.1-nouveau.patch | 0 .../patches/xserver-1.6.99-default-modes.patch | 0 .../xserver-1.6.99-randr-error-debugging.patch | 0 .../patches/xserver-1.6.99-right-of.patch | 0 .../xserver-1.7.0-randr-gamma-restore.patch | 0 .../patches/xserver-1.7.1-gamma-kdm-fix.patch | 0 .../patches/xserver-1.7.1-multilib.patch | 0 .../patches/xserver-1.8-disable-vboxvideo.patch | 0 .../patches/xserver-1.8-no-connected-outputs.patch | 0 .../patches/xserver-1.8-randr-initial.patch | 0 .../patches/xserver-1.8-udev-warning.patch | 0 .../xserver-1.8.2-XTEST-PointerKeys-fixes.patch | 0 .../xorg-x11-server.nm} | 20 +- .../xorg.conf} | 8 +- .../xorg-x11-util-macros/xorg-x11-util-macros.nm | 2 +- pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 2 +- .../xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm | 2 +- 61 files changed, 196 insertions(+), 601 deletions(-) delete mode 100644 pkgs/core/make/patches/make-3.79.1-noclock_gettime.patch delete mode 100644 pkgs/core/make/patches/make-3.80-getcwd.patch delete mode 100644 pkgs/core/make/patches/make-3.81-fdleak.patch delete mode 100644 pkgs/core/make/patches/make-3.81-jobserver.patch delete mode 100644 pkgs/core/make/patches/make-3.81-memory.patch delete mode 100644 pkgs/core/make/patches/make-3.81-newlines.patch delete mode 100644 pkgs/core/make/patches/make-3.81-rlimit.patch delete mode 100644 pkgs/core/make/patches/make-3.81-strcpy-overlap.patch rename pkgs/core/make/patches/{make-3.81-err-reporting.patch => make-3.82-err-reporting.patch} (58%) create mode 100644 pkgs/core/make/patches/make-3.82-getcwd.patch rename pkgs/core/make/patches/{make-3.80-j8k.patch => make-3.82-j8k.patch} (63%) create mode 100644 pkgs/core/make/patches/make-3.82-jobserver.patch create mode 100644 pkgs/core/make/patches/make-3.82-newlines.patch create mode 100644 pkgs/core/make/patches/make-3.82-noclock_gettime.patch create mode 100644 pkgs/core/make/patches/make-3.82-weird-shell.patch rename pkgs/core/{xorg-server => xorg-x11-server}/10-quirks.conf (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.4.99-pic-libxf86config.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.4.99-ssh-isnt-local.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.5.0-bg-none-root.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.5.0-projector-fb-size.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.5.1-mode-debug.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.6.0-displayfd.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.6.0-less-acpi-brokenness.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.6.1-nouveau.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.6.99-default-modes.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.6.99-randr-error-debugging.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.6.99-right-of.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.7.0-randr-gamma-restore.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.7.1-gamma-kdm-fix.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.7.1-multilib.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.8-disable-vboxvideo.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.8-no-connected-outputs.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.8-randr-initial.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.8-udev-warning.patch (100%) rename pkgs/core/{xorg-server => xorg-x11-server}/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch (100%) rename pkgs/core/{xorg-server/xorg-server.nm => xorg-x11-server/xorg-x11-server.nm} (87%) copy pkgs/core/{network/src/functions.ethernet => xorg-x11-server/xorg.conf} (94%) Difference in files: diff --git a/pkgs/core/libX11/libX11.nm b/pkgs/core/libX11/libX11.nm index 760f5f9..bd618cf 100644 --- a/pkgs/core/libX11/libX11.nm +++ b/pkgs/core/libX11/libX11.nm @@ -28,7 +28,7 @@ PKG_NAME = libX11 PKG_VER = 1.3.2 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = System/Libraries PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/libXau/libXau.nm b/pkgs/core/libXau/libXau.nm index 9b5de66..1a78bf7 100644 --- a/pkgs/core/libXau/libXau.nm +++ b/pkgs/core/libXau/libXau.nm @@ -28,7 +28,7 @@ PKG_NAME = libXau PKG_VER = 1.0.6 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://xcb.freedesktop.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/libXext/libXext.nm b/pkgs/core/libXext/libXext.nm index d0bf204..0009e80 100644 --- a/pkgs/core/libXext/libXext.nm +++ b/pkgs/core/libXext/libXext.nm @@ -28,7 +28,7 @@ PKG_NAME = libXext PKG_VER = 1.1.2 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/libXfont/libXfont.nm b/pkgs/core/libXfont/libXfont.nm index ae9316f..277472b5 100644 --- a/pkgs/core/libXfont/libXfont.nm +++ b/pkgs/core/libXfont/libXfont.nm @@ -28,7 +28,7 @@ PKG_NAME = libXfont PKG_VER = 1.4.2 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/libfontenc/libfontenc.nm b/pkgs/core/libfontenc/libfontenc.nm index 91a6516..2de3e09 100644 --- a/pkgs/core/libfontenc/libfontenc.nm +++ b/pkgs/core/libfontenc/libfontenc.nm @@ -28,14 +28,13 @@ PKG_NAME = libfontenc PKG_VER = 1.0.5 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://www.x.org/ PKG_LICENSE = MIT PKG_SUMMARY = X.Org X11 libfontenc runtime library. PKG_BUILD_DEPS+= pkg-config xorg-x11-proto-devel zlib -PKG_DEPS += define PKG_DESCRIPTION X.Org X11 libfontenc runtime library. diff --git a/pkgs/core/libssh2/libssh2.nm b/pkgs/core/libssh2/libssh2.nm index 7002b2c..a6ce100 100644 --- a/pkgs/core/libssh2/libssh2.nm +++ b/pkgs/core/libssh2/libssh2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libssh2 -PKG_VER = 1.2.6 +PKG_VER = 1.2.7 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/libxcb/libxcb.nm b/pkgs/core/libxcb/libxcb.nm index d83a7f1..79736fa 100644 --- a/pkgs/core/libxcb/libxcb.nm +++ b/pkgs/core/libxcb/libxcb.nm @@ -28,7 +28,7 @@ PKG_NAME = libxcb PKG_VER = 1.7 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://xcb.freedesktop.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/libxkbfile/libxkbfile.nm b/pkgs/core/libxkbfile/libxkbfile.nm index ed2e38a..ebced19 100644 --- a/pkgs/core/libxkbfile/libxkbfile.nm +++ b/pkgs/core/libxkbfile/libxkbfile.nm @@ -28,7 +28,7 @@ PKG_NAME = libxkbfile PKG_VER = 1.0.6 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://www.x.org PKG_LICENSE = MIT diff --git a/pkgs/core/libxslt/libxslt.nm b/pkgs/core/libxslt/libxslt.nm index 89d6d87..bd3b5b4 100644 --- a/pkgs/core/libxslt/libxslt.nm +++ b/pkgs/core/libxslt/libxslt.nm @@ -28,7 +28,7 @@ PKG_NAME = libxslt PKG_VER = 1.1.26 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = Development/Libraries PKG_URL = http://xmlsoft.org/XSLT/ PKG_LICENSE = MIT diff --git a/pkgs/core/make/make.nm b/pkgs/core/make/make.nm index 7c7fd63..694a215 100644 --- a/pkgs/core/make/make.nm +++ b/pkgs/core/make/make.nm @@ -25,10 +25,10 @@ include $(PKGROOT)/Include PKG_NAME = make -PKG_VER = 3.81 +PKG_VER = 3.82 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> PKG_GROUP = Development/Tools PKG_URL = http://www.gnu.org/software/make/ PKG_LICENSE = GPLv2+ diff --git a/pkgs/core/make/patches/make-3.79.1-noclock_gettime.patch b/pkgs/core/make/patches/make-3.79.1-noclock_gettime.patch deleted file mode 100644 index 0638849..0000000 --- a/pkgs/core/make/patches/make-3.79.1-noclock_gettime.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urp make-3.81/configure make-3.81-pm/configure ---- make-3.81/configure 2006-04-01 08:40:00.000000000 +0200 -+++ make-3.81-pm/configure 2008-09-22 10:50:40.000000000 +0200 -@@ -8018,7 +8018,7 @@ fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$ac_cv_search_clock_gettime" = no; then -- for ac_lib in rt posix4; do -+ for ac_lib in posix4; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -Only in make-3.81-pm/: configure.orig diff --git a/pkgs/core/make/patches/make-3.80-getcwd.patch b/pkgs/core/make/patches/make-3.80-getcwd.patch deleted file mode 100644 index 1e54709..0000000 --- a/pkgs/core/make/patches/make-3.80-getcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -Only in make-3.81-pm/: configure.orig -diff -urp make-3.81/make.h make-3.81-pm/make.h ---- make-3.81/make.h 2006-02-16 00:54:43.000000000 +0100 -+++ make-3.81-pm/make.h 2008-09-22 10:53:35.000000000 +0200 -@@ -488,7 +488,7 @@ extern long int lseek (); - #endif /* Not GNU C library or POSIX. */ - - #ifdef HAVE_GETCWD --# if !defined(VMS) && !defined(__DECC) -+# if !defined(VMS) && !defined(__DECC) && !defined(getcwd) - extern char *getcwd (); - # endif - #else -Only in make-3.81-pm/: make.h~ -Only in make-3.81-pm/: make.h.orig diff --git a/pkgs/core/make/patches/make-3.80-j8k.patch b/pkgs/core/make/patches/make-3.80-j8k.patch deleted file mode 100644 index 1acd4f9..0000000 --- a/pkgs/core/make/patches/make-3.80-j8k.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- make-3.80/main.c.jj 2002-08-09 21:27:17.000000000 -0400 -+++ make-3.80/main.c 2004-12-13 12:48:25.000000000 -0500 -@@ -1549,6 +1549,20 @@ int main (int argc, char ** argv) - } - } - -+#ifdef PIPE_BUF -+ if (job_slots > PIPE_BUF) -+#elif defined _POSIX_PIPE_BUF -+ if (job_slots > _POSIX_PIPE_BUF) -+#else -+ if (job_slots > 512) -+#endif -+ { -+ error (NILF, -+ _("More parallel jobs (-jN) than this platform can handle requested.")); -+ error (NILF, _("Resetting to single job (-j1) mode.")); -+ job_slots = 1; -+ } -+ - /* If we have >1 slot but no jobserver-fds, then we're a top-level make. - Set up the pipe and install the fds option for our children. */ - diff --git a/pkgs/core/make/patches/make-3.81-err-reporting.patch b/pkgs/core/make/patches/make-3.81-err-reporting.patch deleted file mode 100644 index eaee702..0000000 --- a/pkgs/core/make/patches/make-3.81-err-reporting.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff -urp make-3.81/misc.c make-3.81-pm/misc.c ---- make-3.81/misc.c 2006-04-01 08:36:40.000000000 +0200 -+++ make-3.81-pm/misc.c 2008-09-22 12:45:18.000000000 +0200 -@@ -311,17 +311,31 @@ strerror (int errnum) - /* Print an error message from errno. */ - - void -+perror_with_name_err (const char *str, const char *name, int errnum) -+{ -+ error (NILF, _("%s%s: %s"), str, name, strerror (errnum)); -+} -+ -+void - perror_with_name (const char *str, const char *name) - { -- error (NILF, _("%s%s: %s"), str, name, strerror (errno)); -+ perror_with_name_err (str, name, errno); - } - - /* Print an error message from errno and exit. */ - - void -+pfatal_with_name_err (const char *name, int errnum) -+{ -+ fatal (NILF, _("%s: %s"), name, strerror (errnum)); -+ -+ /* NOTREACHED */ -+} -+ -+void - pfatal_with_name (const char *name) - { -- fatal (NILF, _("%s: %s"), name, strerror (errno)); -+ pfatal_with_name_err (name, errno); - - /* NOTREACHED */ - } -diff -urp make-3.81/main.c make-3.81-pm/main.c ---- make-3.81/main.c 2008-09-22 12:45:07.000000000 +0200 -+++ make-3.81-pm/main.c 2008-09-22 12:45:18.000000000 +0200 -@@ -1502,13 +1502,13 @@ main (int argc, char **argv, char **envp - strcat (template, DEFAULT_TMPFILE); - outfile = open_tmpfile (&stdin_nm, template); - if (outfile == 0) -- pfatal_with_name (_("fopen (temporary file)")); -+ pfatal_with_name_err (_("fopen (temporary file)"), errno); - while (!feof (stdin) && ! ferror (stdin)) - { - char buf[2048]; - unsigned int n = fread (buf, 1, sizeof (buf), stdin); - if (n > 0 && fwrite (buf, 1, n, outfile) != n) -- pfatal_with_name (_("fwrite (temporary file)")); -+ pfatal_with_name_err (_("fwrite (temporary file)"), errno); - } - (void) fclose (outfile); - -@@ -1681,7 +1681,7 @@ main (int argc, char **argv, char **envp - else if ((job_rfd = dup (job_fds[0])) < 0) - { - if (errno != EBADF) -- pfatal_with_name (_("dup jobserver")); -+ pfatal_with_name_err (_("dup jobserver"), errno); - - error (NILF, - _("warning: jobserver unavailable: using -j1. Add `+' to parent make rule.")); -@@ -1721,7 +1721,7 @@ main (int argc, char **argv, char **envp - char c = '+'; - - if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0) -- pfatal_with_name (_("creating jobs pipe")); -+ pfatal_with_name_err (_("creating jobs pipe"), errno); - - /* Every make assumes that it always has one job it can run. For the - submakes it's the token they were given by their parent. For the -@@ -1736,7 +1736,7 @@ main (int argc, char **argv, char **envp - - EINTRLOOP (r, write (job_fds[1], &c, 1)); - if (r != 1) -- pfatal_with_name (_("init jobserver pipe")); -+ pfatal_with_name_err (_("init jobserver pipe"), errno); - } - - /* Fill in the jobserver_fds struct for our children. */ -@@ -2151,7 +2151,7 @@ main (int argc, char **argv, char **envp - /* If there is a temp file from reading a makefile from stdin, get rid of - it now. */ - if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT) -- perror_with_name (_("unlink (temporary file): "), stdin_nm); -+ perror_with_name_err (_("unlink (temporary file): "), stdin_nm, errno); - - { - int status; -diff -urp make-3.81/make.h make-3.81-pm/make.h ---- make-3.81/make.h 2008-09-22 12:45:07.000000000 +0200 -+++ make-3.81-pm/make.h 2008-09-22 12:45:18.000000000 +0200 -@@ -414,6 +414,8 @@ extern void die PARAMS ((int)) __attribu - extern void log_working_directory PARAMS ((int)); - extern void pfatal_with_name PARAMS ((const char *)) __attribute__ ((noreturn)); - extern void perror_with_name PARAMS ((const char *, const char *)); -+extern void pfatal_with_name_err PARAMS ((const char *, int errnum)) __attribute__ ((noreturn)); -+extern void perror_with_name_err PARAMS ((const char *, const char *, int errnum)); - extern char *savestring PARAMS ((const char *, unsigned int)); - extern char *concat PARAMS ((const char *, const char *, const char *)); - extern char *xmalloc PARAMS ((unsigned int)); -diff -urp make-3.81/job.c make-3.81-pm/job.c ---- make-3.81/job.c 2006-03-20 04:03:04.000000000 +0100 -+++ make-3.81-pm/job.c 2008-09-22 12:45:18.000000000 +0200 -@@ -859,7 +859,7 @@ free_child (struct child *child) - - EINTRLOOP (r, write (job_fds[1], &token, 1)); - if (r != 1) -- pfatal_with_name (_("write jobserver")); -+ pfatal_with_name_err (_("write jobserver"), errno); - - DB (DB_JOBS, (_("Released token for child 0x%08lx (%s).\n"), - (unsigned long int) child, child->file->name)); -@@ -1699,6 +1699,7 @@ new_job (struct file *file) - - /* Set interruptible system calls, and read() for a job token. */ - set_child_handler_action_flags (1, waiting_jobs != NULL); -+ errno = 0; - got_token = read (job_rfd, &token, 1); - saved_errno = errno; - set_child_handler_action_flags (0, waiting_jobs != NULL); -@@ -1713,10 +1714,14 @@ new_job (struct file *file) - - /* If the error _wasn't_ expected (EINTR or EBADF), punt. Otherwise, - go back and reap_children(), and try again. */ -- errno = saved_errno; -- if (errno != EINTR && errno != EBADF) -- pfatal_with_name (_("read jobs pipe")); -- if (errno == EBADF) -+ if (saved_errno != EINTR && saved_errno != EBADF) -+ { -+ if (got_token == 0) -+ fatal (NILF, _("read jobs pipe EOF")); -+ else -+ pfatal_with_name_err (_("read jobs pipe"), saved_errno); -+ } -+ if (saved_errno == EBADF) - DB (DB_JOBS, ("Read returned EBADF.\n")); - } - #endif -@@ -1831,7 +1836,7 @@ load_too_high (void) - error (NILF, - _("cannot enforce load limits on this operating system")); - else -- perror_with_name (_("cannot enforce load limit: "), "getloadavg"); -+ perror_with_name_err (_("cannot enforce load limit: "), "getloadavg", errno); - } - lossage = errno; - load = 0; diff --git a/pkgs/core/make/patches/make-3.81-fdleak.patch b/pkgs/core/make/patches/make-3.81-fdleak.patch deleted file mode 100644 index 442ee54..0000000 --- a/pkgs/core/make/patches/make-3.81-fdleak.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -urp make-3.81/read.c make-3.81-leak/read.c ---- make-3.81/read.c 2006-03-17 15:24:20.000000000 +0100 -+++ make-3.81-leak/read.c 2008-09-16 16:43:12.000000000 +0200 -@@ -296,6 +300,37 @@ restore_conditionals (struct conditional - conditionals = saved; - } - -+/* If possible, open the file and mark it close-on-exec, so that make -+ doesn't leak the descriptor to binaries called via $(shell ...).*/ -+static FILE * -+open_makefile (char *filename) -+{ -+ FILE *fp; -+ -+#if HAVE_FDOPEN -+ int fd = open (filename, O_RDONLY); -+ int save; -+ if (fd < 0) -+ return NULL; -+ -+ fp = fdopen (fd, "r"); -+ if (fp == NULL) -+ { -+ save = errno; -+ close (fd); -+ errno = save; -+ return NULL; -+ } -+ -+ CLOSE_ON_EXEC (fd); -+ -+#else -+ fp = fopen (filename, "r"); -+#endif -+ -+ return fp; -+} -+ - static int - eval_makefile (char *filename, int flags) - { -@@ -335,7 +376,8 @@ eval_makefile (char *filename, int flags - filename = expanded; - } - -- ebuf.fp = fopen (filename, "r"); -+ ebuf.fp = open_makefile (filename); -+ - /* Save the error code so we print the right message later. */ - makefile_errno = errno; - -@@ -348,7 +390,7 @@ eval_makefile (char *filename, int flags - for (i = 0; include_directories[i] != 0; ++i) - { - included = concat (include_directories[i], "/", filename); -- ebuf.fp = fopen (included, "r"); -+ ebuf.fp = open_makefile (included); - if (ebuf.fp) - { - filename = included; diff --git a/pkgs/core/make/patches/make-3.81-jobserver.patch b/pkgs/core/make/patches/make-3.81-jobserver.patch deleted file mode 100644 index df65107..0000000 --- a/pkgs/core/make/patches/make-3.81-jobserver.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urp make-3.81/main.c make-3.81-pm/main.c ---- make-3.81/main.c 2007-09-24 15:28:34.000000000 +0200 -+++ make-3.81-pm/main.c 2007-09-24 15:32:50.000000000 +0200 -@@ -1669,8 +1669,12 @@ main (int argc, char **argv, char **envp - - if (job_slots > 0) - { -- close (job_fds[0]); -- close (job_fds[1]); -+ if (restarts == 0) -+ { -+ close (job_fds[0]); -+ close (job_fds[1]); -+ } -+ - job_fds[0] = job_fds[1] = -1; - free (jobserver_fds->list); - free (jobserver_fds); diff --git a/pkgs/core/make/patches/make-3.81-memory.patch b/pkgs/core/make/patches/make-3.81-memory.patch deleted file mode 100644 index 7a7bf9f..0000000 --- a/pkgs/core/make/patches/make-3.81-memory.patch +++ /dev/null @@ -1,261 +0,0 @@ -diff -Bburpd make-3.81_orig/file.c make-3.81/file.c ---- make-3.81_orig/file.c 2006-05-23 13:59:11.000000000 +0200 -+++ make-3.81/file.c 2006-05-23 14:39:34.000000000 +0200 -@@ -490,7 +490,7 @@ expand_deps (struct file *f) - - o = subst_expand (buffer, d->name, "%", "$*", 1, 2, 0); - -- free (d->name); -+ hash_strfree (d->name); - d->name = savestring (buffer, o - buffer); - d->staticpattern = 0; /* Clear staticpattern so that we don't - re-expand %s below. */ -@@ -549,7 +549,7 @@ expand_deps (struct file *f) - dp->name[0] = '\0'; - else - { -- free (dp->name); -+ hash_strfree (dp->name); - dp->name = savestring (buffer, o - buffer); - } - } -@@ -580,7 +580,7 @@ expand_deps (struct file *f) - if (d1->file == 0) - d1->file = enter_file (d1->name); - else -- free (d1->name); -+ hash_strfree (d1->name); - d1->name = 0; - d1->staticpattern = 0; - d1->need_2nd_expansion = 0; -Only in make-3.81: file.c~ -diff -Bburpd make-3.81_orig/implicit.c make-3.81/implicit.c ---- make-3.81_orig/implicit.c 2006-05-23 13:59:11.000000000 +0200 -+++ make-3.81/implicit.c 2006-05-23 14:40:01.000000000 +0200 -@@ -864,7 +864,7 @@ pattern_search (struct file *file, int a - dep->file = enter_file (dep->name); - /* enter_file uses dep->name _if_ we created a new file. */ - if (dep->name != dep->file->name) -- free (dep->name); -+ hash_strfree (dep->name); - dep->name = 0; - dep->file->tried_implicit |= dep->changed; - } -Only in make-3.81: implicit.c~ -diff -Bburpd make-3.81_orig/main.c make-3.81/main.c ---- make-3.81_orig/main.c 2006-05-23 13:59:11.000000000 +0200 -+++ make-3.81/main.c 2006-05-23 14:40:49.000000000 +0200 -@@ -540,6 +540,7 @@ initialize_global_hash_tables (void) - init_hash_files (); - hash_init_directories (); - hash_init_function_table (); -+ init_hash_strings (); - } - - static struct file * -Only in make-3.81: main.c~ -diff -Bburpd make-3.81_orig/make.h make-3.81/make.h ---- make-3.81_orig/make.h 2006-05-23 13:59:11.000000000 +0200 -+++ make-3.81/make.h 2006-05-23 14:41:21.000000000 +0200 -@@ -431,6 +431,11 @@ extern void print_spaces PARAMS ((unsign - extern char *find_percent PARAMS ((char *)); - extern FILE *open_tmpfile PARAMS ((char **, const char *)); - -+extern void init_hash_strings PARAMS ((void)); -+extern char *hash_strdup PARAMS ((const char *)); -+extern char *hash_savestring PARAMS ((const char *, unsigned int)); -+extern void hash_strfree PARAMS ((char *)); -+ - #ifndef NO_ARCHIVES - extern int ar_name PARAMS ((char *)); - extern void ar_parse_name PARAMS ((char *, char **, char **)); -Only in make-3.81: make.h~ -diff -Bburpd make-3.81_orig/misc.c make-3.81/misc.c ---- make-3.81_orig/misc.c 2006-05-23 13:59:11.000000000 +0200 -+++ make-3.81/misc.c 2006-05-23 14:42:59.000000000 +0200 -@@ -16,8 +16,10 @@ You should have received a copy of the G - GNU Make; see the file COPYING. If not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ - -+#include <assert.h> - #include "make.h" - #include "dep.h" -+#include "hash.h" - #include "debug.h" - - /* Variadic functions. We go through contortions to allow proper function -@@ -511,7 +513,7 @@ void - free_dep (struct dep *d) - { - if (d->name != 0) -- free (d->name); -+ hash_strfree (d->name); - - if (d->stem != 0) - free (d->stem); -@@ -535,7 +537,7 @@ copy_dep_chain (const struct dep *d) - bcopy ((char *) d, (char *) c, sizeof (struct dep)); - - if (c->name != 0) -- c->name = xstrdup (c->name); -+ c->name = hash_strdup (c->name); - if (c->stem != 0) - c->stem = xstrdup (c->stem); - -@@ -909,3 +911,154 @@ close_stdout (void) - exit (EXIT_FAILURE); - } - } -+ -+/* Hash table of duplicated strings. */ -+ -+struct hash_string -+{ -+ char *string; -+ unsigned int count; -+}; -+ -+static unsigned long -+string_hash_1 (key) -+ const void *key; -+{ -+ return_ISTRING_HASH_1 (((const struct hash_string *) key)->string); -+} -+ -+static unsigned long -+string_hash_2 (key) -+ const void *key; -+{ -+ return_ISTRING_HASH_2 (((const struct hash_string *) key)->string); -+} -+ -+static int -+string_hash_cmp (x, y) -+ const void *x; -+ const void *y; -+{ -+ return_ISTRING_COMPARE (((const struct hash_string *) x)->string, -+ ((const struct hash_string *) y)->string); -+} -+ -+static struct hash_table strings; -+ -+void -+init_hash_strings () -+{ -+ hash_init (&strings, 1000, string_hash_1, string_hash_2, -+ string_hash_cmp); -+} -+ -+/* Keep track duplicated string and return the old one if exists. */ -+ -+char * -+hash_strdup (ptr) -+ const char *ptr; -+{ -+ struct hash_string *h, key; -+ -+ if (*ptr == '\0') -+ return ""; -+ -+ key.string = (char *) ptr; -+ key.count = 0; -+ h = (struct hash_string *) hash_find_item (&strings, &key); -+ if (h == NULL) -+ { -+ char *result = (char *) malloc (strlen (ptr) + 1); -+ -+ if (result == NULL) -+ fatal (NILF, _("virtual memory exhausted")); -+ -+ strcpy (result, ptr); -+ -+ h = (struct hash_string *) malloc (sizeof (struct hash_string)); -+ if (h == NULL) -+ fatal (NILF, _("virtual memory exhausted")); -+ -+ h->string = result; -+ h->count = 1; -+ hash_insert (&strings, h); -+ } -+ else -+ { -+ h->count++; -+ assert (h->count != 0); -+ } -+ -+ return h->string; -+} -+ -+char * -+hash_savestring (str, length) -+ const char *str; -+ unsigned int length; -+{ -+ struct hash_string *h, key; -+ -+ if (length == 0 || *str == '\0') -+ return ""; -+ -+ key.string = alloca (length + 1); -+ key.count = 0; -+ bcopy (str, key.string, length); -+ key.string [length] = '\0'; -+ -+ h = (struct hash_string *) hash_find_item (&strings, &key); -+ if (h == NULL) -+ { -+ char *out = (char *) xmalloc (length + 1); -+ bcopy (str, out, length); -+ out[length] = '\0'; -+ -+ h = (struct hash_string *) malloc (sizeof (struct hash_string)); -+ if (h == NULL) -+ fatal (NILF, _("virtual memory exhausted")); -+ -+ h->string = out; -+ h->count = 1; -+ hash_insert (&strings, h); -+ } -+ else -+ { -+ h->count++; -+ assert (h->count != 0); -+ } -+ -+ return h->string; -+} -+ -+void -+hash_strfree (ptr) -+ char *ptr; -+{ -+ struct hash_string *h, key; -+ -+ if (*ptr == '\0') -+ return; -+ -+ key.string = ptr; -+ key.count = 0; -+ h = (struct hash_string *) hash_find_item (&strings, &key); -+ -+ /* Check if string comes from hash_strdup or hash_savestring. */ -+ if (h == NULL || h->string != ptr) -+ { -+ free (ptr); -+ return; -+ } -+ -+ h->count--; -+ if (h->count == 0) -+ { -+ struct hash_string *d; -+ -+ d = hash_delete (&strings, h); -+ assert (d == h); -+ free (h->string); -+ free (h); -+ } -+} -Only in make-3.81: misc.c~ -Only in make-3.81: read.c~ diff --git a/pkgs/core/make/patches/make-3.81-newlines.patch b/pkgs/core/make/patches/make-3.81-newlines.patch deleted file mode 100644 index d9bb313..0000000 --- a/pkgs/core/make/patches/make-3.81-newlines.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- make-3.81-orig/job.c 2007-02-21 19:10:54.000000000 +0100 -+++ make-3.81-pm/job.c 2007-02-22 18:13:59.000000000 +0100 -@@ -2706,7 +2706,7 @@ - unsigned int line_len = strlen (line); - - char *new_line = (char *) alloca (shell_len + (sizeof (minus_c) - 1) -- + (line_len * 2) + 1); -+ + (line_len * 4) + 1); - char *command_ptr = NULL; /* used for batch_mode_shell mode */ - - # ifdef __EMX__ /* is this necessary? */ -@@ -2740,9 +2740,10 @@ - #endif - if (PRESERVE_BSNL) - { -- *(ap++) = '\\'; -+ *(ap++) = '\''; - *(ap++) = '\\'; - *(ap++) = '\n'; -+ *(ap++) = '\''; - } - - ++p; diff --git a/pkgs/core/make/patches/make-3.81-rlimit.patch b/pkgs/core/make/patches/make-3.81-rlimit.patch deleted file mode 100644 index f88f0fe..0000000 --- a/pkgs/core/make/patches/make-3.81-rlimit.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -urp make-3.81/job.c make-3.81-pm/job.c ---- make-3.81/job.c 2008-03-25 18:15:38.000000000 +0100 -+++ make-3.81-pm/job.c 2008-03-25 17:51:11.000000000 +0100 -@@ -2079,6 +2079,9 @@ exec_command (char **argv, char **envp) - # else - - /* Run the program. */ -+#ifdef SET_STACK_SIZE -+ restore_original_stack_rlimit (); -+#endif - environ = envp; - execvp (argv[0], argv); - -diff -urp make-3.81/main.c make-3.81-pm/main.c ---- make-3.81/main.c 2008-03-25 18:15:38.000000000 +0100 -+++ make-3.81-pm/main.c 2008-03-25 18:14:04.000000000 +0100 -@@ -44,12 +44,53 @@ Foundation, Inc., 51 Franklin St, Fifth - # include <fcntl.h> - #endif - --#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) --# define SET_STACK_SIZE --#endif -- - #ifdef SET_STACK_SIZE - # include <sys/resource.h> -+/* Whether the rlimit was set successfuly */ -+static int setrlimit_succeeded = 0; -+/* Original rlim_cur */ -+static rlim_t setrlimit_orig_cur = 0; -+ -+/* Get rid of any avoidable limit on stack size so that alloca does -+ not fail. */ -+void -+set_max_stack_rlimit (void) -+{ -+ struct rlimit rlim; -+ -+ /* Back off if the limit is still set, probably due to failure in -+ restore_original_stack_rlimit. */ -+ if (setrlimit_succeeded) -+ return; -+ -+ if (getrlimit (RLIMIT_STACK, &rlim) == 0) -+ { -+ setrlimit_orig_cur = rlim.rlim_cur; -+ rlim.rlim_cur = rlim.rlim_max; -+ if (setrlimit (RLIMIT_STACK, &rlim) != -1) -+ setrlimit_succeeded = 1; -+ } -+} -+ -+/* Set the rlimit back to its original value. To be called before -+ process spawn. */ -+void -+restore_original_stack_rlimit (void) -+{ -+ struct rlimit rlim; -+ -+ if (!setrlimit_succeeded) -+ return; -+ -+ if (getrlimit (RLIMIT_STACK, &rlim) == 0) -+ { -+ rlim.rlim_cur = setrlimit_orig_cur; -+ setrlimit (RLIMIT_STACK, &rlim); -+ /* Don't reset the setrlimit_succeeded flag. This can be called -+ after vfork, in which case the flag is in memory shared with -+ the parent. */ -+ } -+} - #endif - - #ifdef _AMIGA -@@ -915,17 +956,7 @@ main (int argc, char **argv, char **envp - #endif - - #ifdef SET_STACK_SIZE -- /* Get rid of any avoidable limit on stack size. */ -- { -- struct rlimit rlim; -- -- /* Set the stack limit huge so that alloca does not fail. */ -- if (getrlimit (RLIMIT_STACK, &rlim) == 0) -- { -- rlim.rlim_cur = rlim.rlim_max; -- setrlimit (RLIMIT_STACK, &rlim); -- } -- } -+ set_max_stack_rlimit (); - #endif - - #ifdef HAVE_ATEXIT -diff -urp make-3.81/make.h make-3.81-pm/make.h ---- make-3.81/make.h 2008-03-25 18:15:38.000000000 +0100 -+++ make-3.81-pm/make.h 2008-03-25 17:51:10.000000000 +0100 -@@ -346,6 +346,13 @@ extern int strcmpi (const char *,const c - #define N_(msgid) gettext_noop (msgid) - #define S_(msg1,msg2,num) ngettext (msg1,msg2,num) - -+/* Handle rlimit */ -+#if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) -+# define SET_STACK_SIZE -+void set_max_stack_rlimit (void); -+void restore_original_stack_rlimit (void); -+#endif -+ - /* Handle other OSs. */ - #if defined(HAVE_DOS_PATHS) - # define PATH_SEPARATOR_CHAR ';' -diff -urp make-3.81/w32/Makefile make-3.81-pm/w32/Makefile diff --git a/pkgs/core/make/patches/make-3.81-strcpy-overlap.patch b/pkgs/core/make/patches/make-3.81-strcpy-overlap.patch deleted file mode 100644 index d045737..0000000 --- a/pkgs/core/make/patches/make-3.81-strcpy-overlap.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: job.c -=================================================================== -RCS file: /sources/make/make/job.c,v -retrieving revision 1.193 -diff -u -r1.193 job.c ---- a/job.c 9 Jun 2009 15:35:38 -0000 1.193 -+++ b/job.c 31 Jul 2009 11:42:16 -0000 -@@ -1600,7 +1600,7 @@ - /* There are no more references in this line to worry about. - Copy the remaining uninteresting text to the output. */ - if (out != in) -- strcpy (out, in); -+ memmove (out, in, strlen (in) + 1); - - /* Finally, expand the line. */ - lines[i] = allocated_variable_expand_for_file (cmds->command_lines[i], diff --git a/pkgs/core/make/patches/make-3.82-err-reporting.patch b/pkgs/core/make/patches/make-3.82-err-reporting.patch new file mode 100644 index 0000000..2f5b3c6 --- /dev/null +++ b/pkgs/core/make/patches/make-3.82-err-reporting.patch @@ -0,0 +1,157 @@ +diff -urp make-3.82/misc.c make-3.82-pm/misc.c +--- make-3.82/misc.c 2010-07-19 09:10:54.000000000 +0200 ++++ make-3.82-pm/misc.c 2010-08-11 15:26:45.000000000 +0200 +@@ -342,17 +342,31 @@ strerror (int errnum) + /* Print an error message from errno. */ + + void ++perror_with_name_err (const char *str, const char *name, int errnum) ++{ ++ error (NILF, _("%s%s: %s"), str, name, strerror (errnum)); ++} ++ ++void + perror_with_name (const char *str, const char *name) + { +- error (NILF, _("%s%s: %s"), str, name, strerror (errno)); ++ perror_with_name_err (str, name, errno); + } + + /* Print an error message from errno and exit. */ + + void ++pfatal_with_name_err (const char *name, int errnum) ++{ ++ fatal (NILF, _("%s: %s"), name, strerror (errnum)); ++ ++ /* NOTREACHED */ ++} ++ ++void + pfatal_with_name (const char *name) + { +- fatal (NILF, _("%s: %s"), name, strerror (errno)); ++ pfatal_with_name_err (name, errno); + + /* NOTREACHED */ + } +diff -urp make-3.82/main.c make-3.82-pm/main.c +--- make-3.82/main.c 2010-08-11 15:34:12.000000000 +0200 ++++ make-3.82-pm/main.c 2010-08-11 15:30:11.000000000 +0200 +@@ -1536,13 +1536,13 @@ main (int argc, char **argv, char **envp + strcat (template, DEFAULT_TMPFILE); + outfile = open_tmpfile (&stdin_nm, template); + if (outfile == 0) +- pfatal_with_name (_("fopen (temporary file)")); ++ pfatal_with_name_err (_("fopen (temporary file)"), errno); + while (!feof (stdin) && ! ferror (stdin)) + { + char buf[2048]; + unsigned int n = fread (buf, 1, sizeof (buf), stdin); + if (n > 0 && fwrite (buf, 1, n, outfile) != n) +- pfatal_with_name (_("fwrite (temporary file)")); ++ pfatal_with_name_err (_("fwrite (temporary file)"), errno); + } + fclose (outfile); + +@@ -1747,7 +1747,7 @@ main (int argc, char **argv, char **envp + else if ((job_rfd = dup (job_fds[0])) < 0) + { + if (errno != EBADF) +- pfatal_with_name (_("dup jobserver")); ++ pfatal_with_name_err (_("dup jobserver"), errno); + + error (NILF, + _("warning: jobserver unavailable: using -j1. Add `+' to parent make rule.")); +@@ -1788,7 +1788,7 @@ main (int argc, char **argv, char **envp + char c = '+'; + + if (pipe (job_fds) < 0 || (job_rfd = dup (job_fds[0])) < 0) +- pfatal_with_name (_("creating jobs pipe")); ++ pfatal_with_name_err (_("creating jobs pipe"), errno); + + /* Every make assumes that it always has one job it can run. For the + submakes it's the token they were given by their parent. For the +@@ -1803,7 +1803,7 @@ main (int argc, char **argv, char **envp + + EINTRLOOP (r, write (job_fds[1], &c, 1)); + if (r != 1) +- pfatal_with_name (_("init jobserver pipe")); ++ pfatal_with_name_err (_("init jobserver pipe"), errno); + } + + /* Fill in the jobserver_fds struct for our children. */ +@@ -2226,7 +2226,7 @@ main (int argc, char **argv, char **envp + /* If there is a temp file from reading a makefile from stdin, get rid of + it now. */ + if (stdin_nm && unlink (stdin_nm) < 0 && errno != ENOENT) +- perror_with_name (_("unlink (temporary file): "), stdin_nm); ++ perror_with_name_err (_("unlink (temporary file): "), stdin_nm, errno); + + /* If there were no command-line goals, use the default. */ + if (goals == 0) +Только в make-3.82-pm: job.c~ +Только в make-3.82-pm: main.c~ +diff -urp make-3.82/make.h make-3.82-pm/make.h +--- make-3.82/make.h 2010-08-11 15:34:12.000000000 +0200 ++++ make-3.82-pm/make.h 2010-08-11 15:31:26.000000000 +0200 +@@ -385,6 +385,8 @@ void die (int) __attribute__ ((noreturn) + void log_working_directory (int); + void pfatal_with_name (const char *) __attribute__ ((noreturn)); + void perror_with_name (const char *, const char *); ++void pfatal_with_name_err (const char *, int errnum) __attribute__ ((noreturn)); ++void perror_with_name_err (const char *, const char *, int errnum); + void *xmalloc (unsigned int); + void *xcalloc (unsigned int); + void *xrealloc (void *, unsigned int); +diff -urp make-3.82/job.c make-3.82-pm/job.c +--- make-3.82/job.c 2010-07-24 10:27:50.000000000 +0200 ++++ make-3.82-pm/job.c 2010-08-11 15:33:54.000000000 +0200 +@@ -917,7 +917,7 @@ free_child (struct child *child) + + EINTRLOOP (r, write (job_fds[1], &token, 1)); + if (r != 1) +- pfatal_with_name (_("write jobserver")); ++ pfatal_with_name_err (_("write jobserver"), errno); + + DB (DB_JOBS, (_("Released token for child %p (%s).\n"), + child, child->file->name)); +@@ -1768,6 +1768,7 @@ new_job (struct file *file) + + /* Set interruptible system calls, and read() for a job token. */ + set_child_handler_action_flags (1, waiting_jobs != NULL); ++ errno = 0; + got_token = read (job_rfd, &token, 1); + saved_errno = errno; + set_child_handler_action_flags (0, waiting_jobs != NULL); +@@ -1782,10 +1783,14 @@ new_job (struct file *file) + + /* If the error _wasn't_ expected (EINTR or EBADF), punt. Otherwise, + go back and reap_children(), and try again. */ +- errno = saved_errno; +- if (errno != EINTR && errno != EBADF) +- pfatal_with_name (_("read jobs pipe")); +- if (errno == EBADF) ++ if (saved_errno != EINTR && saved_errno != EBADF) ++ { ++ if (got_token == 0) ++ fatal (NILF, _("read jobs pipe EOF")); ++ else ++ pfatal_with_name_err (_("read jobs pipe"), saved_errno); ++ } ++ if (saved_errno == EBADF) + DB (DB_JOBS, ("Read returned EBADF.\n")); + } + #endif +@@ -1909,7 +1914,8 @@ load_too_high (void) + error (NILF, + _("cannot enforce load limits on this operating system")); + else +- perror_with_name (_("cannot enforce load limit: "), "getloadavg"); ++ perror_with_name_err (_("cannot enforce load limit: "), ++ "getloadavg", errno); + } + lossage = errno; + load = 0; +Только в make-3.82-pm: make.h~ +Только в make-3.82-pm: misc.c.orig diff --git a/pkgs/core/make/patches/make-3.82-getcwd.patch b/pkgs/core/make/patches/make-3.82-getcwd.patch new file mode 100644 index 0000000..b688732 --- /dev/null +++ b/pkgs/core/make/patches/make-3.82-getcwd.patch @@ -0,0 +1,14 @@ +diff -up make-3.82/make.h\~ make-3.82/make.h +--- make-3.82/make.h~ 2010-07-20 15:12:06.000000000 +0200 ++++ make-3.82/make.h 2010-08-11 15:19:09.000000000 +0200 +@@ -472,7 +472,7 @@ long int lseek (); + #endif /* Not GNU C library or POSIX. */ + + #ifdef HAVE_GETCWD +-# if !defined(VMS) && !defined(__DECC) ++# if !defined(VMS) && !defined(__DECC) && !defined(getcwd) + char *getcwd (); + # endif + #else + +Diff finished. Wed Aug 11 15:19:12 2010 diff --git a/pkgs/core/make/patches/make-3.82-j8k.patch b/pkgs/core/make/patches/make-3.82-j8k.patch new file mode 100644 index 0000000..b5fa357 --- /dev/null +++ b/pkgs/core/make/patches/make-3.82-j8k.patch @@ -0,0 +1,26 @@ +diff -up make-3.82/main.c\~ make-3.82/main.c +--- make-3.82/main.c~ 2010-07-19 09:10:53.000000000 +0200 ++++ make-3.82/main.c 2010-08-11 15:12:09.000000000 +0200 +@@ -1765,6 +1765,20 @@ main (int argc, char **argv, char **envp + } + } + ++#ifdef PIPE_BUF ++ if (job_slots > PIPE_BUF) ++#elif defined _POSIX_PIPE_BUF ++ if (job_slots > _POSIX_PIPE_BUF) ++#else ++ if (job_slots > 512) ++#endif ++ { ++ error (NILF, ++ _("More parallel jobs (-jN) than this platform can handle requested.")); ++ error (NILF, _("Resetting to single job (-j1) mode.")); ++ job_slots = 1; ++ } ++ + /* If we have >1 slot but no jobserver-fds, then we're a top-level make. + Set up the pipe and install the fds option for our children. */ + + +Diff finished. Wed Aug 11 15:12:32 2010 diff --git a/pkgs/core/make/patches/make-3.82-jobserver.patch b/pkgs/core/make/patches/make-3.82-jobserver.patch new file mode 100644 index 0000000..2a85503 --- /dev/null +++ b/pkgs/core/make/patches/make-3.82-jobserver.patch @@ -0,0 +1,19 @@ +diff -up make-3.82/main.c\~ make-3.82/main.c +--- make-3.82/main.c~ 2010-08-12 14:59:20.000000000 +0200 ++++ make-3.82/main.c 2010-08-12 15:00:07.000000000 +0200 +@@ -1756,8 +1756,11 @@ main (int argc, char **argv, char **envp + + if (job_slots > 0) + { +- close (job_fds[0]); +- close (job_fds[1]); ++ if (restarts == 0) ++ { ++ close (job_fds[0]); ++ close (job_fds[1]); ++ } + job_fds[0] = job_fds[1] = -1; + free (jobserver_fds->list); + free (jobserver_fds); + +Diff finished. Thu Aug 12 15:00:22 2010 diff --git a/pkgs/core/make/patches/make-3.82-newlines.patch b/pkgs/core/make/patches/make-3.82-newlines.patch new file mode 100644 index 0000000..d86018a --- /dev/null +++ b/pkgs/core/make/patches/make-3.82-newlines.patch @@ -0,0 +1,30 @@ +diff -up make-3.82/job.c\~ make-3.82/job.c +--- make-3.82/job.c~ 2010-08-12 14:57:15.000000000 +0200 ++++ make-3.82/job.c 2010-08-12 14:58:23.000000000 +0200 +@@ -2876,7 +2876,7 @@ construct_command_argv_internal (char *l + } + + new_line = alloca (shell_len + 1 + sflags_len + 1 +- + (line_len*2) + 1); ++ + (line_len*4) + 1); + ap = new_line; + memcpy (ap, shell, shell_len); + ap += shell_len; +@@ -2904,13 +2904,14 @@ construct_command_argv_internal (char *l + #endif + if (PRESERVE_BSNL) + { +- *(ap++) = '\\'; ++ *(ap++) = '\''; + /* Only non-batch execution needs another backslash, + because it will be passed through a recursive + invocation of this function. */ + if (!batch_mode_shell) + *(ap++) = '\\'; + *(ap++) = '\n'; ++ *(ap++) = '\''; + } + ++p; + continue; + +Diff finished. Thu Aug 12 14:58:34 2010 diff --git a/pkgs/core/make/patches/make-3.82-noclock_gettime.patch b/pkgs/core/make/patches/make-3.82-noclock_gettime.patch new file mode 100644 index 0000000..f63e1fc --- /dev/null +++ b/pkgs/core/make/patches/make-3.82-noclock_gettime.patch @@ -0,0 +1,14 @@ +diff -up make-3.82/configure\~ make-3.82/configure +--- make-3.82/configure~ 2010-07-28 07:41:51.000000000 +0200 ++++ make-3.82/configure 2010-08-11 15:07:50.000000000 +0200 +@@ -7215,7 +7215,7 @@ return clock_gettime (); + return 0; + } + _ACEOF +-for ac_lib in '' rt posix4; do ++for ac_lib in '' posix4; do + if test -z "$ac_lib"; then + ac_res="none required" + else + +Diff finished. Wed Aug 11 15:07:59 2010 diff --git a/pkgs/core/make/patches/make-3.82-weird-shell.patch b/pkgs/core/make/patches/make-3.82-weird-shell.patch new file mode 100644 index 0000000..dfdaf89 --- /dev/null +++ b/pkgs/core/make/patches/make-3.82-weird-shell.patch @@ -0,0 +1,16 @@ +diff -up make-3.82/job.c\~ make-3.82/job.c +--- make-3.82/job.c~ 2010-08-11 16:13:33.000000000 +0200 ++++ make-3.82/job.c 2010-08-12 14:20:08.000000000 +0200 +@@ -2442,7 +2442,11 @@ construct_command_argv_internal (char *l + + /* See if it is safe to parse commands internally. */ + if (shell == 0) +- shell = default_shell; ++ { ++ shell = default_shell; ++ if (shellflags == 0) ++ shellflags = "-c"; ++ } + #ifdef WINDOWS32 + else if (strcmp (shell, default_shell)) + { diff --git a/pkgs/core/sudo/sudo.nm b/pkgs/core/sudo/sudo.nm index 5f3f74a..46855b8 100644 --- a/pkgs/core/sudo/sudo.nm +++ b/pkgs/core/sudo/sudo.nm @@ -25,12 +25,12 @@ include $(PKGROOT)/Include PKG_NAME = sudo -PKG_VER = 1.7.2p1 +PKG_VER = 1.7.4p3 PKG_REL = 0 PKG_MAINTAINER = PKG_GROUP = Applications/System -PKG_URL = +PKG_URL = http://www.sudo.ws/sudo/download.html PKG_LICENSE = BSD PKG_SUMMARY = Allows restricted root access for specified users. diff --git a/pkgs/core/vsftpd/vsftpd.nm b/pkgs/core/vsftpd/vsftpd.nm index c26ec54..70ad729 100644 --- a/pkgs/core/vsftpd/vsftpd.nm +++ b/pkgs/core/vsftpd/vsftpd.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = vsftpd -PKG_VER = 2.2.2 +PKG_VER = 2.3.2 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/xcb-proto/xcb-proto.nm b/pkgs/core/xcb-proto/xcb-proto.nm index 94d84f3..ea87f4b 100644 --- a/pkgs/core/xcb-proto/xcb-proto.nm +++ b/pkgs/core/xcb-proto/xcb-proto.nm @@ -28,7 +28,7 @@ PKG_NAME = xcb-proto PKG_VER = 1.6 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Headers PKG_URL = http://xcb.freedesktop.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xkeyboard-config/xkeyboard-config.nm b/pkgs/core/xkeyboard-config/xkeyboard-config.nm index d15b1f4..4907e95 100644 --- a/pkgs/core/xkeyboard-config/xkeyboard-config.nm +++ b/pkgs/core/xkeyboard-config/xkeyboard-config.nm @@ -28,7 +28,7 @@ PKG_NAME = xkeyboard-config PKG_VER = 1.9 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Utils PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-server/10-quirks.conf b/pkgs/core/xorg-server/10-quirks.conf deleted file mode 100644 index 82d3ec2..0000000 --- a/pkgs/core/xorg-server/10-quirks.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection - -# https://bugzilla.redhat.com/show_bug.cgi?id=523914 -# Mouse does not move in PV Xen guest -# Explicitly tell evdev to not ignore the absolute axes. -Section "InputClass" - Identifier "Xen Virtual Pointer axis blacklist" - MatchProduct "Xen Virtual Pointer" - Option "IgnoreAbsoluteAxes" "off" - Option "IgnoreRelativeAxes" "off" -EndSection diff --git a/pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch b/pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch deleted file mode 100644 index d040900..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 04bd8e2fa6be557f58a0e417b0f3befc56f5ef59 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <x(a)fedoraproject.org> -Date: Thu, 1 Jul 2010 15:45:03 +1000 -Subject: [PATCH] Build libxf86config with -fPIC. - ---- - hw/xfree86/parser/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am -index caf7079..655e73f 100644 ---- a/hw/xfree86/parser/Makefile.am -+++ b/hw/xfree86/parser/Makefile.am -@@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \ - - libxf86config_a_SOURCES = \ - $(INTERNAL_SOURCES) --libxf86config_a_CFLAGS = $(AM_CFLAGS) -+libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC -fvisibility=hidden - - AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ --- -1.7.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch deleted file mode 100644 index d532fe1..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Mon, 10 Dec 2007 11:26:57 -0500 -Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients. - ---- - Xext/shm.c | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -diff --git a/Xext/shm.c b/Xext/shm.c -index 5937a03..5376c19 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -381,8 +381,21 @@ - mode_t mask; - int uidset = 0, gidset = 0; - LocalClientCredRec *lcc; -+ Bool is_ssh = FALSE; - - if (GetLocalClientCreds(client, &lcc) != -1) { -+#ifdef linux -+ if (lcc->fieldsSet & LCC_PID_SET) { -+ /* ssh isn't actually a local client */ -+ char exe[64], buf[64]; -+ -+ memset(buf, 0, 64); -+ snprintf(exe, 64, "/proc/%d/exe", lcc->pid); -+ readlink(exe, buf, 63); -+ if (strstr(buf, "/ssh")) -+ is_ssh = TRUE; -+ } -+#endif - - if (lcc->fieldsSet & LCC_UID_SET) { - uid = lcc->euid; -@@ -401,6 +414,9 @@ - } - #endif - FreeLocalClientCreds(lcc); -+ -+ if (is_ssh) -+ return -1; - - if (uidset) { - /* User id 0 always gets access */ --- -1.5.3.4 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch b/pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch deleted file mode 100644 index ae65d0b..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch +++ /dev/null @@ -1,155 +0,0 @@ -From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <x(a)fedoraproject.org> -Date: Wed, 20 Jan 2010 14:46:12 +1300 -Subject: [PATCH] Add nr for background=none root - ---- - dix/globals.c | 1 + - dix/window.c | 12 +++++++----- - hw/xfree86/common/xf86Init.c | 11 +++++++++++ - hw/xfree86/common/xf86str.h | 5 ++++- - include/opaque.h | 1 + - os/utils.c | 3 +++ - 6 files changed, 27 insertions(+), 6 deletions(-) - -diff --git a/dix/globals.c b/dix/globals.c -index c24a94f..907a5e8 100644 ---- a/dix/globals.c -+++ b/dix/globals.c -@@ -124,6 +124,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in - CursorPtr rootCursor; - Bool party_like_its_1989 = FALSE; - Bool whiteRoot = FALSE; -+Bool bgNoneRoot = FALSE; - - int cursorScreenDevPriv[MAXSCREENS]; - -diff --git a/dix/window.c b/dix/window.c -index caff1cb..be1d1c4 100644 ---- a/dix/window.c -+++ b/dix/window.c -@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin) - pWin->optional->cursor = rootCursor; - rootCursor->refcnt++; - -+ pWin->backingStore = defaultBackingStore; -+ pWin->forcedBS = (defaultBackingStore != NotUseful); - - if (party_like_its_1989) { - MakeRootTile(pWin); - backFlag |= CWBackPixmap; -+ pScreen->ChangeWindowAttributes(pWin, backFlag); -+ } else if (bgNoneRoot) { -+ /* nothing, handled in xf86CreateRootWindow */ - } else { - if (whiteRoot) - pWin->background.pixel = pScreen->whitePixel; - else - pWin->background.pixel = pScreen->blackPixel; - backFlag |= CWBackPixel; -- } - -- pWin->backingStore = defaultBackingStore; -- pWin->forcedBS = (defaultBackingStore != NotUseful); -- /* We SHOULD check for an error value here XXX */ -- (*pScreen->ChangeWindowAttributes)(pWin, backFlag); -+ pScreen->ChangeWindowAttributes(pWin, backFlag); -+ } - - MapWindow(pWin, serverClient); - } -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index 6707448..776b898 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -77,6 +77,7 @@ - #ifdef RENDER - #include "picturestr.h" - #endif -+#include "xace.h" - - #include "xf86VGAarbiter.h" - #include "globals.h" -@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin) - int ret = TRUE; - int err = Success; - ScreenPtr pScreen = pWin->drawable.pScreen; -+ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - RootWinPropPtr pProp; - CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) - dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); -@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin) - } - } - -+ if (bgNoneRoot && pScrn->canDoBGNoneRoot) { -+ pWin->backgroundState = XaceBackgroundNoneState(pWin); -+ pWin->background.pixel = pScreen->whitePixel; -+ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore); -+ } else { -+ pWin->background.pixel = pScreen->blackPixel; -+ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore); -+ } -+ - DebugF("xf86CreateRootWindow() returns %d\n", ret); - return (ret); - } -diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index de1f1b6..5c3aa00 100644 ---- a/hw/xfree86/common/xf86str.h -+++ b/hw/xfree86/common/xf86str.h -@@ -503,7 +503,7 @@ typedef struct _confdrirec { - } confDRIRec, *confDRIPtr; - - /* These values should be adjusted when new fields are added to ScrnInfoRec */ --#define NUM_RESERVED_INTS 16 -+#define NUM_RESERVED_INTS 15 - #define NUM_RESERVED_POINTERS 14 - #define NUM_RESERVED_FUNCS 11 - -@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec { - ClockRangePtr clockRanges; - int adjustFlags; - -+ /* -nr support */ -+ int canDoBGNoneRoot; -+ - /* - * These can be used when the minor ABI version is incremented. - * The NUM_* parameters must be reduced appropriately to keep the -diff --git a/include/opaque.h b/include/opaque.h -index b3c7c70..fcc8c95 100644 ---- a/include/opaque.h -+++ b/include/opaque.h -@@ -71,6 +71,7 @@ extern _X_EXPORT Bool defeatAccessControl; - extern _X_EXPORT long maxBigRequestSize; - extern _X_EXPORT Bool party_like_its_1989; - extern _X_EXPORT Bool whiteRoot; -+extern _X_EXPORT Bool bgNoneRoot; - - extern _X_EXPORT Bool CoreDump; - -diff --git a/os/utils.c b/os/utils.c -index d7c8388..40583d0 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -513,6 +513,7 @@ void UseMsg(void) - #endif - ErrorF("-nolisten string don't listen on protocol\n"); - ErrorF("-noreset don't reset after last client exists\n"); -+ ErrorF("-nr create root window with no background\n"); - ErrorF("-reset reset after last client exists\n"); - ErrorF("-p # screen-saver pattern duration (minutes)\n"); - ErrorF("-pn accept failure to listen on all ports\n"); -@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[]) - defaultBackingStore = WhenMapped; - else if ( strcmp( argv[i], "-wr") == 0) - whiteRoot = TRUE; -+ else if ( strcmp( argv[i], "-nr") == 0) -+ bgNoneRoot = TRUE; - else if ( strcmp( argv[i], "-maxbigreqsize") == 0) { - if(++i < argc) { - long reqSizeArg = atol(argv[i]); --- -1.6.6 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch b/pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch deleted file mode 100644 index c6178b8..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch +++ /dev/null @@ -1,32 +0,0 @@ -From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann(a)redhat.com> -Date: Thu, 11 Sep 2008 12:51:31 -0400 -Subject: [PATCH] Make room for an external monitor if we have enough video RAM - ---- - hw/xfree86/modes/xf86Crtc.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 4de7e05..9bcf81b 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, - if (crtc_height > height) - height = crtc_height; - } -+ -+ /* Make room for an external monitor if we have enough video ram */ -+ if (scrn->videoRam >= 65536) -+ width += 1920; -+ else if (scrn->videoRam >= 32768) -+ width += 1280; -+ else if (scrn->videoRam >= 16384) -+ width += 1024; -+ - if (config->maxWidth && width > config->maxWidth) width = config->maxWidth; - if (config->maxHeight && height > config->maxHeight) height = config->maxHeight; - if (config->minWidth && width < config->minWidth) width = config->minWidth; --- -1.6.0.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch b/pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch deleted file mode 100644 index 11fe5ad..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 079910986a1b8f5042e16ee2ba3ad9ed843b67ca Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Tue, 7 Oct 2008 11:09:14 -0400 -Subject: [PATCH] Force ModeDebug on. - ---- - hw/xfree86/modes/xf86Crtc.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 9bcf81b..a953c8a 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -2084,8 +2084,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - xf86ProcessOptions (scrn->scrnIndex, - scrn->options, - config->options); -- config->debug_modes = xf86ReturnOptValBool (config->options, -- OPTION_MODEDEBUG, FALSE); -+ config->debug_modes = TRUE; - - if (scrn->display->virtualX) - width = scrn->display->virtualX; --- -1.6.0.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch b/pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch deleted file mode 100644 index 09e7b49..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 1766352059d0db67bff3f7dd0820563a30f54858 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Thu, 18 Jun 2009 16:56:41 +1000 -Subject: [PATCH] displayfd hack - ---- - dix/globals.c | 1 + - include/opaque.h | 1 + - os/connection.c | 72 ++++++++++++++++++++++++++++++++++++----------------- - os/utils.c | 11 ++++++++ - 4 files changed, 62 insertions(+), 23 deletions(-) - -diff --git a/dix/globals.c b/dix/globals.c -index 907a5e8..c1e64d3 100644 ---- a/dix/globals.c -+++ b/dix/globals.c -@@ -135,6 +135,7 @@ int defaultColorVisualClass = -1; - int monitorResolution = 0; - - char *display; -+int displayfd; - char *ConnectionInfo; - - CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; -diff --git a/include/opaque.h b/include/opaque.h -index fcc8c95..2a08e2d 100644 ---- a/include/opaque.h -+++ b/include/opaque.h -@@ -50,6 +50,7 @@ extern _X_EXPORT int ScreenSaverAllowExposures; - extern _X_EXPORT int defaultScreenSaverBlanking; - extern _X_EXPORT int defaultScreenSaverAllowExposures; - extern _X_EXPORT char *display; -+extern _X_EXPORT int displayfd; - - extern _X_EXPORT int defaultBackingStore; - extern _X_EXPORT Bool disableBackingStore; -diff --git a/os/connection.c b/os/connection.c -index 0c72b67..05d95c4 100644 ---- a/os/connection.c -+++ b/os/connection.c -@@ -146,6 +146,7 @@ Bool NewOutputPending; /* not yet attempted to write some new output */ - Bool AnyClientsWriteBlocked; /* true if some client blocked on write */ - - static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */ -+static char dynamic_display[7]; - Bool PartialNetwork; /* continue even if unable to bind all addrs */ - static Pid_t ParentProcess; - -@@ -357,9 +358,23 @@ NotifyParentProcess(void) - kill (ParentProcess, SIGUSR1); - } - } -+ if (dynamic_display[0]) -+ write(displayfd, dynamic_display, strlen(dynamic_display)); - #endif - } - -+static Bool -+TryCreateSocket(int num, int *partial) -+{ -+ char port[20]; -+ -+ sprintf(port, "%d", num); -+ -+ return _XSERVTransMakeAllCOTSServerListeners(port, partial, -+ &ListenTransCount, -+ &ListenTransConns); -+} -+ - /***************** - * CreateWellKnownSockets - * At initialization, create the sockets to listen on for new clients. -@@ -370,7 +385,6 @@ CreateWellKnownSockets(void) - { - int i; - int partial; -- char port[20]; - - FD_ZERO(&AllSockets); - FD_ZERO(&AllClients); -@@ -385,32 +399,44 @@ CreateWellKnownSockets(void) - - FD_ZERO (&WellKnownConnections); - -- sprintf (port, "%d", atoi (display)); -- -- if ((_XSERVTransMakeAllCOTSServerListeners (port, &partial, -- &ListenTransCount, &ListenTransConns) >= 0) && -- (ListenTransCount >= 1)) -+ if (display) - { -- if (!PartialNetwork && partial) -- { -- FatalError ("Failed to establish all listening sockets"); -- } -- else -+ if (TryCreateSocket(atoi(display), &partial) && -+ (ListenTransCount >= 1)) -+ if (!PartialNetwork && partial) -+ FatalError ("Failed to establish all listening sockets"); -+ } -+ else /* -displayfd */ -+ { -+ Bool found = 0; -+ for (i = 0; i < 65535 - 1024; i++) - { -- ListenTransFds = xalloc (ListenTransCount * sizeof (int)); -- -- for (i = 0; i < ListenTransCount; i++) -+ if (!TryCreateSocket(i, &partial) && !partial) - { -- int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]); -- -- ListenTransFds[i] = fd; -- FD_SET (fd, &WellKnownConnections); -- -- if (!_XSERVTransIsLocal (ListenTransConns[i])) -- { -- DefineSelf (fd); -- } -+ found = 1; -+ break; - } -+ else -+ CloseWellKnownConnections(); -+ } -+ if (!found) -+ FatalError("Failed to find a socket to listen on"); -+ sprintf(dynamic_display, "%d\n", i); -+ display = dynamic_display; -+ } -+ -+ ListenTransFds = xalloc (ListenTransCount * sizeof (int)); -+ -+ for (i = 0; i < ListenTransCount; i++) -+ { -+ int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]); -+ -+ ListenTransFds[i] = fd; -+ FD_SET (fd, &WellKnownConnections); -+ -+ if (!_XSERVTransIsLocal (ListenTransConns[i])) -+ { -+ DefineSelf (fd); - } - } - -diff --git a/os/utils.c b/os/utils.c -index 7bfdf8b..37a93b1 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -678,6 +678,17 @@ ProcessCommandLine(int argc, char *argv[]) - else - UseMsg(); - } -+ else if (strcmp(argv[i], "-displayfd") == 0) -+ { -+ if (++i < argc) -+ { -+ displayfd = atoi(argv[i]); -+ display = NULL; -+ nolock = TRUE; -+ } -+ else -+ UseMsg(); -+ } - #ifdef DPMSExtension - else if ( strcmp( argv[i], "dpms") == 0) - /* ignored for compatibility */ ; --- -1.6.3.rc1.2.g0164.dirty - diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch deleted file mode 100644 index cc80e6c..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Wed, 11 Mar 2009 14:02:11 -0400 -Subject: [PATCH] Don't build the ACPI code. - -No good can come of this. ---- - configure.ac | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 72ae67e..04716f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then - case $host_cpu in - ia64*) - linux_ia64=yes -- linux_acpi="yes" - ;; - alpha*) - linux_alpha=yes - ;; - i*86|amd64*|x86_64*) -- linux_acpi="yes" - ;; - *) - ;; --- -1.6.1.3 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch b/pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch deleted file mode 100644 index 35a1ff9..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch +++ /dev/null @@ -1,109 +0,0 @@ -From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <x(a)fedoraproject.org> -Date: Tue, 16 Feb 2010 11:38:17 +1000 -Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs - -Also, don't treat DRI setup failure as an error for nouveau. ---- - glx/glxdri.c | 7 +++++-- - glx/glxdri2.c | 7 +++++-- - hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++- - 3 files changed, 28 insertions(+), 5 deletions(-) - -diff --git a/glx/glxdri.c b/glx/glxdri.c -index 21e44d1..30b820c 100644 ---- a/glx/glxdri.c -+++ b/glx/glxdri.c -@@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - const __DRIconfig **driConfigs; - const __DRIextension **extensions; - int i; -+ int from = X_ERROR; - - if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || - !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || -@@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { -- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", -+ if (!strcmp(driverName, "nouveau")) -+ from = X_INFO; -+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", - filename, dlerror()); - goto handle_error; - } -@@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - xfree(screen); - -- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); -+ LogMessage(from, "AIGLX: reverting to software rendering\n"); - - return NULL; - } -diff --git a/glx/glxdri2.c b/glx/glxdri2.c -index 0f998de..a244809 100644 ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - const __DRIextension **extensions; - const __DRIconfig **driConfigs; - int i; -+ int from = X_ERROR; - - screen = xcalloc(1, sizeof *screen); - if (screen == NULL) -@@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { -- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", -+ if (!strcmp(driverName, "nouveau")) -+ from = X_INFO; -+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", - filename, dlerror()); - goto handle_error; - } -@@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - xfree(screen); - -- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); -+ LogMessage(from, "AIGLX: reverting to software rendering\n"); - - return NULL; - } -diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c -index 7f4ada8..d964c6c 100644 ---- a/hw/xfree86/common/xf86AutoConfig.c -+++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev, - break; - case 0x102b: driverList[0] = "mga"; break; - case 0x10c8: driverList[0] = "neomagic"; break; -- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; -+ case 0x10de: case 0x12d2: -+ switch (dev->device_id) { -+ /* NV1 */ -+ case 0x0008: -+ case 0x0009: -+ driverList[0] = "vesa"; -+ break; -+ /* NV3 */ -+ case 0x0018: -+ case 0x0019: -+ driverList[0] = "nv"; -+ break; -+ default: -+ driverList[0] = "nouveau"; -+ driverList[1] = "nv"; -+ break; -+ } -+ break; - case 0x1106: driverList[0] = "openchrome"; break; - case 0x1b36: driverList[0] = "qxl"; break; - case 0x1163: driverList[0] = "rendition"; break; --- -1.6.5.2 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch b/pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch deleted file mode 100644 index 0f0ba27..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Thu, 4 Mar 2010 15:18:38 +1000 -Subject: [PATCH] tweak default mode list yet again - ---- - hw/xfree86/modes/xf86Crtc.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 03277be..571ffd0 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) - int min_clock = 0; - int max_clock = 0; - double clock; -- Bool add_default_modes = TRUE; -+ Bool add_default_modes; - Bool debug_modes = config->debug_modes || - xf86Initialising; - enum det_monrec_source sync_source = sync_default; -@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) - } - - output_modes = (*output->funcs->get_modes) (output); -+ -+ /* if the driver found modes, don't second-guess it */ -+ add_default_modes = (output_modes == NULL); - - edid_monitor = output->MonInfo; - --- -1.6.6.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch b/pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch deleted file mode 100644 index 0e7a6ba..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 16be69ef1e2ea9f19cd596b99b5ede7567d374b8 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Mon, 27 Jul 2009 16:52:42 -0400 -Subject: [PATCH 11/16] additional randr debugging - ---- - randr/randr.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - -diff --git a/randr/randr.c b/randr/randr.c -index 1c1d0c4..accf614 100644 ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode) - static int - ProcRRDispatch (ClientPtr client) - { -+ int ret; - REQUEST(xReq); - if (stuff->data >= RRNumberRequests || !ProcRandrVector[stuff->data]) - return BadRequest; -- return (*ProcRandrVector[stuff->data]) (client); -+ ret = ProcRandrVector[stuff->data](client); -+ -+ if (ret) { -+ int i; -+ ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase); -+ for (i = 0; i < stuff->length; i++) { -+ ErrorF("%08x ", ((unsigned int *)stuff) + i); -+ if ((i+1) % 4 == 0) -+ ErrorF("\n"); -+ } -+ ErrorF("\n"); -+ } -+ -+ return ret; - } - - static int --- -1.6.4.2 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch b/pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch deleted file mode 100644 index 06c1183..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch +++ /dev/null @@ -1,172 +0,0 @@ -From 1766ae8a69daa06730e41d094fdddf53db3a1a9e Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Tue, 28 Jul 2009 11:07:13 -0400 -Subject: [PATCH] RANDR: right-of placement by default - -[Enhanced to add a new prefer clone option for drivers. This -allows for servers like RN50 where two heads are disjoint. - airlied] - -[Enhanced to ignore rightof on single crtc cards - airlied] ---- - hw/xfree86/common/xf86str.h | 9 ++++- - hw/xfree86/modes/xf86Crtc.c | 77 +++++++++++++++++++++++++++++++++++++++---- - 2 files changed, 77 insertions(+), 9 deletions(-) - -diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index 5c3aa00..8224668 100644 ---- a/hw/xfree86/common/xf86str.h -+++ b/hw/xfree86/common/xf86str.h -@@ -503,10 +503,13 @@ typedef struct _confdrirec { - } confDRIRec, *confDRIPtr; - - /* These values should be adjusted when new fields are added to ScrnInfoRec */ --#define NUM_RESERVED_INTS 15 -+#define NUM_RESERVED_INTS 14 - #define NUM_RESERVED_POINTERS 14 - #define NUM_RESERVED_FUNCS 11 - -+/* let clients know they can use this */ -+#define XF86_SCRN_HAS_PREFER_CLONE 1 -+ - typedef pointer (*funcPointer)(void); - - /* flags for depth 24 pixmap options */ -@@ -672,7 +675,6 @@ typedef void xf86SetOverscanProc (ScrnInfoPtr, int); - * are to be dependent on compile-time defines. - */ - -- - typedef struct _ScrnInfoRec { - int driverVersion; - char * driverName; /* canonical name used in */ -@@ -778,6 +780,9 @@ typedef struct _ScrnInfoRec { - /* -nr support */ - int canDoBGNoneRoot; - -+ /* initial rightof support disable */ -+ int preferClone; -+ - /* - * These can be used when the minor ABI version is incremented. - * The NUM_* parameters must be reduced appropriately to keep the -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index a66c979..4d14f57 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1146,6 +1146,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) - int o; - int min_x, min_y; - -+ /* check for initial right-of heuristic */ -+ for (o = 0; o < config->num_output; o++) -+ { -+ xf86OutputPtr output = config->output[o]; -+ -+ if (output->initial_x || output->initial_y) -+ return TRUE; -+ } -+ - for (o = 0; o < config->num_output; o++) - { - xf86OutputPtr output = config->output[o]; -@@ -2028,6 +2037,60 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) - return match; - } - -+static int -+numEnabledOutputs(xf86CrtcConfigPtr config, Bool *enabled) -+{ -+ int i = 0, p; -+ -+ for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ; -+ -+ return i; -+} -+ -+static Bool -+xf86TargetRightOf(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, -+ DisplayModePtr *modes, Bool *enabled, -+ int width, int height) -+{ -+ int o; -+ int w = 0; -+ -+ if (config->num_crtc == 1) -+ return FALSE; -+ -+ if (scrn->preferClone) -+ return FALSE; -+ -+ if (numEnabledOutputs(config, enabled) < 2) -+ return FALSE; -+ -+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { -+ DisplayModePtr mode = -+ xf86OutputHasPreferredMode(config->output[o], width, height); -+ -+ if (!mode) -+ return FALSE; -+ -+ w += mode->HDisplay; -+ } -+ -+ if (w > width) -+ return FALSE; -+ -+ w = 0; -+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { -+ DisplayModePtr mode = -+ xf86OutputHasPreferredMode(config->output[o], width, height); -+ -+ config->output[o]->initial_x = w; -+ w += mode->HDisplay; -+ -+ modes[o] = mode; -+ } -+ -+ return TRUE; -+} -+ - static Bool - xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, - DisplayModePtr *modes, Bool *enabled, -@@ -2085,13 +2148,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, - * biggest mode for its aspect ratio, assuming one exists. - */ - if (!ret) do { -- int i = 0; - float aspect = 0.0; - -- /* count the number of enabled outputs */ -- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ; -- -- if (i != 1) -+ if (numEnabledOutputs(config, enabled) != 1) - break; - - p = -1; -@@ -2378,6 +2437,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - - if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) - xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); -+ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); - else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) - xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); - else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) -@@ -2394,8 +2455,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - config->output[o]->name); - else - xf86DrvMsg (scrn->scrnIndex, X_INFO, -- "Output %s using initial mode %s\n", -- config->output[o]->name, modes[o]->name); -+ "Output %s using initial mode %s +%d+%d\n", -+ config->output[o]->name, modes[o]->name, -+ config->output[o]->initial_x, -+ config->output[o]->initial_y); - } - - /* --- -1.7.0.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch b/pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch deleted file mode 100644 index 5206141..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 18d2bd8cb513a0436739916620532247f13dbf03 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <x(a)fedoraproject.org> -Date: Thu, 8 Oct 2009 15:25:24 -0400 -Subject: [PATCH] randr gamma reload hack - ---- - hw/xfree86/loader/sdksyms.c | 4 ++++ - hw/xfree86/modes/xf86RandR12.c | 6 ++++++ - 2 files changed, 10 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index 6ea9d26..41bac11 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1746,12 +1746,18 @@ xf86RandR12EnterVT (int screen_index, int flags) - { - ScreenPtr pScreen = screenInfo.screens[screen_index]; - XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); -+ rrScrPrivPtr rp = rrGetScrPriv(pScreen); - - if (randrp->orig_EnterVT) { - if (!randrp->orig_EnterVT (screen_index, flags)) - return FALSE; - } - -+ /* reload gamma */ -+ int i; -+ for (i = 0; i < rp->numCrtcs; i++) -+ xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]); -+ - return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */ - } - --- -1.6.5.rc2 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch b/pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch deleted file mode 100644 index c62837e..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From acc64ce5be7383c09e88a23aab06ebc2403f2ca3 Mon Sep 17 00:00:00 2001 -From: Bill Nottingham <notting(a)redhat.com> -Date: Fri, 6 Nov 2009 10:32:27 +1000 -Subject: [PATCH] fix KDM gamma issue on vt switch - ---- - hw/xfree86/modes/xf86RandR12.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c -index 6ea9d26..ece12b9 100644 ---- a/hw/xfree86/modes/xf86RandR12.c -+++ b/hw/xfree86/modes/xf86RandR12.c -@@ -1761,6 +1761,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; - rrScrPrivPtr rp = rrGetScrPriv(pScreen); - XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); -+ int i; - - rp->rrGetInfo = xf86RandR12GetInfo12; - rp->rrScreenSetSize = xf86RandR12ScreenSetSize; -@@ -1790,6 +1791,9 @@ xf86RandR12Init12 (ScreenPtr pScreen) - */ - if (!xf86RandR12SetInfo12 (pScreen)) - return FALSE; -+ for (i = 0; i < rp->numCrtcs; i++) { -+ xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]); -+ } - return TRUE; - } - --- -1.6.5.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch b/pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch deleted file mode 100644 index 6435999..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6d9585ba6a5784328de479c6b648d7b7d6cec64c Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax(a)redhat.com> -Date: Thu, 29 Oct 2009 19:04:10 -0400 -Subject: [PATCH] multilib fix for -devel subpackage - ---- - include/colormapst.h | 4 ++-- - include/xorg-server.h.in | 7 ++++--- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/include/colormapst.h b/include/colormapst.h -index f1fc8eb..274cd65 100644 ---- a/include/colormapst.h -+++ b/include/colormapst.h -@@ -103,12 +103,12 @@ typedef struct _ColormapRec - { - VisualPtr pVisual; - short class; /* PseudoColor or DirectColor */ --#if defined(_XSERVER64) -+#ifdef __LP64__ - short pad0; - XID pad1; - #endif - XID mid; /* client's name for colormap */ --#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) -+#if defined(__LP64__) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) - XID pad2; - #endif - ScreenPtr pScreen; /* screen map is associated with */ -diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in -index 76cab16..081b8f3 100644 ---- a/include/xorg-server.h.in -+++ b/include/xorg-server.h.in -@@ -157,9 +157,6 @@ - /* Name of X server */ - #undef __XSERVERNAME__ - --/* Define to 1 if unsigned long is 64 bits. */ --#undef _XSERVER64 -- - /* Building vgahw module */ - #undef WITH_VGAHW - -@@ -187,4 +184,8 @@ - /* X Access Control Extension */ - #undef XACE - -+#ifdef __LP64__ -+#define _XSERVER64 1 -+#endif -+ - #endif /* _XORG_SERVER_H_ */ --- -1.6.5.2 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch b/pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch deleted file mode 100644 index 60c0dce..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 1f315578bf759c85261b1f2295efbf0dba852f73 Mon Sep 17 00:00:00 2001 -From: Adam Williamson <adamwill(a)shaw.ca> -Date: Thu, 25 Feb 2010 10:34:49 -0800 -Subject: [PATCH] disable vboxvideo driver in autodetect code - ---- - hw/xfree86/common/xf86AutoConfig.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c -index 7f4ada8..4e944ea 100644 ---- a/hw/xfree86/common/xf86AutoConfig.c -+++ b/hw/xfree86/common/xf86AutoConfig.c -@@ -220,7 +220,7 @@ videoPtrToDriverList(struct pci_device *dev, - case 0x1011: driverList[0] = "tga"; break; - case 0x1023: driverList[0] = "trident"; break; - case 0x100c: driverList[0] = "tseng"; break; -- case 0x80ee: driverList[0] = "vboxvideo"; break; -+ case 0x80ee: driverList[0] = "vesa"; break; - case 0x15ad: driverList[0] = "vmware"; break; - case 0x18ca: - if (dev->device_id == 0x47) --- -1.7.0 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch b/pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch deleted file mode 100644 index 3ee8542..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch +++ /dev/null @@ -1,142 +0,0 @@ -From b27f93c6dbe0a6e416db2c65738e996c70a403c1 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <airlied(a)redhat.com> -Date: Thu, 6 May 2010 12:55:34 +1000 -Subject: [PATCH] xf86: allow for no outputs connected at startup operation. - -When nothing is connected at startup and we canGrow, allow the server to start with a 1024x768 framebuffer, and when the drivers send hotplug events this will expand to the correct size dynamically. - -Signed-off-by: Dave Airlie <airlied(a)redhat.com> ---- - hw/xfree86/modes/xf86Crtc.c | 66 ++++++++++++++++++++++++++++++------------ - 1 files changed, 47 insertions(+), 19 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 571ffd0..99082ec 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -48,6 +48,8 @@ - - #include "xf86xv.h" - -+#define NO_OUTPUT_DEFAULT_WIDTH 1024 -+#define NO_OUTPUT_DEFAULT_HEIGHT 768 - /* - * Initialize xf86CrtcConfig structure - */ -@@ -1946,7 +1948,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) - #endif - } - --static void -+static Bool - xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, - Bool *enabled) - { -@@ -1961,8 +1963,10 @@ xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, - "No outputs definitely connected, trying again...\n"); - - for (o = 0; o < config->num_output; o++) -- enabled[o] = xf86OutputEnabled(config->output[o], FALSE); -+ any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], FALSE); - } -+ -+ return any_enabled; - } - - static Bool -@@ -2409,6 +2413,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - Bool *enabled; - int width, height; - int i = scrn->scrnIndex; -+ Bool have_outputs = TRUE; -+ Bool ret; - - /* Set up the device options */ - config->options = xnfalloc (sizeof (xf86DeviceOptions)); -@@ -2433,20 +2439,26 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - modes = xnfcalloc (config->num_output, sizeof (DisplayModePtr)); - enabled = xnfcalloc (config->num_output, sizeof (Bool)); - -- xf86CollectEnabledOutputs(scrn, config, enabled); -- -- if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) -- xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); -- else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) -- xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); -- else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) -- xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); -- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) -- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); -- else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) -- xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); -- else -- xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); -+ ret = xf86CollectEnabledOutputs(scrn, config, enabled); -+ if (ret == FALSE && canGrow) { -+ xf86DrvMsg(i, X_WARNING, "Unable to find connected outputs - setting %dx%d initial framebuffer\n", -+ NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT); -+ have_outputs = FALSE; -+ } -+ else { -+ if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); -+ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); -+ else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); -+ else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); -+ else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); -+ else -+ xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); -+ } - - for (o = -1; nextEnabledOutput(config, enabled, &o); ) { - if (!modes[o]) -@@ -2479,7 +2491,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - /* - * Assign CRTCs to fit output configuration - */ -- if (!xf86PickCrtcs (scrn, crtcs, modes, 0, width, height)) -+ if (have_outputs && !xf86PickCrtcs (scrn, crtcs, modes, 0, width, height)) - { - xfree (crtcs); - xfree (modes); -@@ -2541,6 +2553,13 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - */ - xf86DefaultScreenLimits (scrn, &width, &height, canGrow); - -+ if (have_outputs == FALSE) { -+ if (width < NO_OUTPUT_DEFAULT_WIDTH && height < NO_OUTPUT_DEFAULT_HEIGHT) { -+ width = NO_OUTPUT_DEFAULT_WIDTH; -+ height = NO_OUTPUT_DEFAULT_HEIGHT; -+ } -+ } -+ - scrn->display->virtualX = width; - scrn->display->virtualY = height; - } -@@ -2566,8 +2585,17 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) - width, height); - } - -- /* Mirror output modes to scrn mode list */ -- xf86SetScrnInfoModes (scrn); -+ if (have_outputs) { -+ /* Mirror output modes to scrn mode list */ -+ xf86SetScrnInfoModes (scrn); -+ } else { -+ /* Clear any existing modes from scrn->modes */ -+ while (scrn->modes != NULL) -+ xf86DeleteMode(&scrn->modes, scrn->modes); -+ scrn->modes = xf86ModesAdd(scrn->modes, -+ xf86CVTMode(width, height, 60, 0, 0)); -+ } -+ - - xfree (crtcs); - xfree (modes); --- -1.7.0.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch b/pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch deleted file mode 100644 index 2db8a8c..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch +++ /dev/null @@ -1,35 +0,0 @@ -From f22b6f8a5899f125de63738e69aaddc2dd0a5d0a Mon Sep 17 00:00:00 2001 -From: Ben Skeggs <bskeggs(a)redhat.com> -Date: Mon, 7 Jun 2010 10:10:10 +1000 -Subject: [PATCH] randr: prevent an unnecessary screen resize with multiple displays - -crtc->{x,y} is always 0 when xf86DefaultScreenLimits() is called, so we -calculate too small an area for the initial framebuffer and force a resize -to happen. - -This commit fixes the code to use desired{X,Y} instead, which contains the -initial output positions. - -Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> ---- - hw/xfree86/modes/xf86Crtc.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 51e7b5a..c2ad7bc 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1041,8 +1041,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, - - if (crtc->enabled) - { -- crtc_width = crtc->x + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation); -- crtc_height = crtc->y + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation); -+ crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation); -+ crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation); - } - if (!canGrow) { - for (o = 0; o < config->num_output; o++) --- -1.6.6 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch b/pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch deleted file mode 100644 index 93071fd..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <x(a)fedoraproject.org> -Date: Wed, 17 Feb 2010 11:12:36 +1000 -Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes. - -Signed-off-by: Fedora X Ninjas <x(a)fedoraproject.org> ---- - hw/xfree86/common/xf86Config.c | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c -index 132e8bc..b1722cd 100644 ---- a/hw/xfree86/common/xf86Config.c -+++ b/hw/xfree86/common/xf86Config.c -@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) - "input devices.\n\tIf no devices become available, " - "reconfigure %s or disable AutoAddDevices.\n", - config_backend, config_backend); -+ -+ xf86Msg(X_INFO, "\n" -+ "***************************************************************\n" -+ "***************************************************************\n" -+ "** Fedora switched to udev-based device detection with **\n" -+ "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration **\n" -+ "** stored in /etc/hal/fdi/policy will not be seen by this **\n" -+ "** server version. If you have such configuration you will **\n" -+ "** need to update it to the new format. **\n" -+ "** For more information, see the Fedora wiki page **\n" -+ "** https://fedoraproject.org/wiki/Input_device_configuration **\n" -+ "***************************************************************\n" -+ "***************************************************************\n"); - #else - xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n" - "\tTry disabling AllowEmptyInput.\n"); --- -1.6.6.1 - diff --git a/pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch b/pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch deleted file mode 100644 index ece8a6c..0000000 --- a/pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch +++ /dev/null @@ -1,909 +0,0 @@ -From deab888bb3bb2a56963da50ff551bd66fbd858a1 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Tue, 29 Jun 2010 13:49:27 +1000 -Subject: [PATCH 1/5] xkb: Mark switch case fallthrough with comment. - -Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> ---- - xkb/xkbActions.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c -index 4c7bce2..6a7f36d 100644 ---- a/xkb/xkbActions.c -+++ b/xkb/xkbActions.c -@@ -625,6 +625,8 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, - break; - } - xkbi->lockedPtrButtons&= ~(1<<button); -+ -+ /* fallthrough */ - case XkbSA_PtrBtn: - XkbDDXFakeDeviceButton(xkbi->device, 0, button); - break; --- -1.7.1 - -From 50b6311dbd2594acc36d6856fdde8623459f1374 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Tue, 29 Jun 2010 12:12:53 +1000 -Subject: [PATCH 2/5] xkb: merge lockedPtrButtons state from all attached SDs. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Problem: -lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button -press. Unconditionally clearing the bits may cause stuck buttons in this -sequence of events: - -1. type Shift + NumLock to enable PointerKeys -2. type 0/Ins on keypad to emulate Button 1 press - → button1 press event to client -3. press and release button 1 on physical mouse - → button1 release event to client - -Button 1 on the MD is now stuck and cannot be released. - -Cause: -XKB PointerKeys button events are posted through the XTEST pointer device. -Once a press is generated, the XTEST device's button is down. The DIX merges -the button state of all attached SDs, hence the MD will have a button down -while the XTEST device has a button down. - -PointerKey button events are only generated on the master device to avoid -duplicate events (see XkbFakeDeviceButton()). If the MD has the -lockedPtrButtons bit cleared by a release event on a physical device, no -such event is generated when a keyboard device triggers the PointerKey -ButtonRelease trigger. Since the event - if generated - is posted through -the XTEST pointer device, lack of a generated ButtonRelease event on the -XTEST pointer device means the button is never released, resulting in the -stuck button observed above. - -Solution: -This patch merges the MD's lockedPtrButtons with the one of all attached -slave devices on release events. Thus, as long as one attached keyboard has -a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey -button is released on all keyboards, the matching release event is emulated -from the MD through the XTEST pointer device, thus also releasing the button -in the DIX. - -Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> ---- - include/xkbsrv.h | 3 +++ - xkb/xkbAccessX.c | 18 +++++++++++++++++- - xkb/xkbActions.c | 8 ++++++++ - xkb/xkbUtils.c | 26 ++++++++++++++++++++++++++ - 4 files changed, 54 insertions(+), 1 deletions(-) - -diff --git a/include/xkbsrv.h b/include/xkbsrv.h -index c0cd501..f0db0e4 100644 ---- a/include/xkbsrv.h -+++ b/include/xkbsrv.h -@@ -933,6 +933,9 @@ extern int XkbGetEffectiveGroup( - XkbStatePtr /* xkbstate */, - CARD8 /* keycode */); - -+extern void XkbMergeLockedPtrBtns( -+ DeviceIntPtr /* master */); -+ - #include "xkbfile.h" - #include "xkbrules.h" - -diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c -index be1dcee..e3fdc06 100644 ---- a/xkb/xkbAccessX.c -+++ b/xkb/xkbAccessX.c -@@ -707,8 +707,24 @@ DeviceEvent *event = &ev->device_event; - changed |= XkbPointerButtonMask; - } - else if (event->type == ET_ButtonRelease) { -- if (xkbi) -+ if (xkbi) { - xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7)); -+ -+ /* Merge this MD's lockedPtrButtons with the one of all -+ * attached slave devices. -+ * The DIX uses a merged button state for MDs, not -+ * releasing buttons until the last SD has released -+ * thenm. If we unconditionally clear the -+ * lockedPtrButtons bit on the MD, a PointerKeys button -+ * release on the SD keyboard won't generate the required fake button -+ * event on the XTEST pointer, thus never processing the -+ * button event in the DIX and the XTEST pointer's -+ * buttons stay down - result is a stuck button. -+ */ -+ if (IsMaster(dev)) -+ XkbMergeLockedPtrBtns(dev); -+ } -+ - changed |= XkbPointerButtonMask; - } - -diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c -index 6a7f36d..ab52b6a 100644 ---- a/xkb/xkbActions.c -+++ b/xkb/xkbActions.c -@@ -626,6 +626,14 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, - } - xkbi->lockedPtrButtons&= ~(1<<button); - -+ if (IsMaster(xkbi->device)) -+ { -+ XkbMergeLockedPtrBtns(xkbi->device); -+ /* One SD still has lock set, don't post event */ -+ if ((xkbi->lockedPtrButtons & (1 << button)) != 0) -+ break; -+ } -+ - /* fallthrough */ - case XkbSA_PtrBtn: - XkbDDXFakeDeviceButton(xkbi->device, 0, button); -diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c -index b1e0e55..d7d1935 100644 ---- a/xkb/xkbUtils.c -+++ b/xkb/xkbUtils.c -@@ -2190,3 +2190,29 @@ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode) - - return effectiveGroup; - } -+ -+/* Merge the lockedPtrButtons from all attached SDs for the given master -+ * device into the MD's state. -+ */ -+void -+XkbMergeLockedPtrBtns(DeviceIntPtr master) -+{ -+ DeviceIntPtr d = inputInfo.devices; -+ XkbSrvInfoPtr xkbi = NULL; -+ -+ if (!IsMaster(master)) -+ return; -+ -+ if (!master->key) -+ return; -+ -+ xkbi = master->key->xkbInfo; -+ xkbi->lockedPtrButtons = 0; -+ -+ for (; d; d = d->next) { -+ if (IsMaster(d) || GetMaster(d, MASTER_KEYBOARD) != master || !d->key) -+ continue; -+ -+ xkbi->lockedPtrButtons |= d->key->xkbInfo->lockedPtrButtons; -+ } -+} --- -1.7.1 - -From 4a4224f5d786035af88c251a9ee177217e8f77fd Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Wed, 14 Apr 2010 10:54:29 +1000 -Subject: [PATCH 3/5] xkb: rename XkbFakeDeviceButton and XkbFakeDeviceMotion, move into xkbActions.c - -The name XkbDDXFakeDeviceButton and XkbDDXFakeDeviceMotion is somewhat -misleading, there's no DDX involved in the game at all anymore. - -This removes XkbFakeDeviceMotion and XkbFakeDeviceButton from the API where -it arguably shouldn't have been in the first place. - -Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> -Reviewed-by: Daniel Stone <daniel(a)fooishbar.org> -Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> ---- - include/xkbsrv.h | 13 ------- - xkb/Makefile.am | 4 +-- - xkb/ddxDevBtn.c | 69 -------------------------------------- - xkb/ddxFakeMtn.c | 64 ----------------------------------- - xkb/xkbActions.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++------- - 5 files changed, 85 insertions(+), 162 deletions(-) - delete mode 100644 xkb/ddxDevBtn.c - delete mode 100644 xkb/ddxFakeMtn.c - -diff --git a/include/xkbsrv.h b/include/xkbsrv.h -index f0db0e4..d1cbd1a 100644 ---- a/include/xkbsrv.h -+++ b/include/xkbsrv.h -@@ -768,19 +768,6 @@ extern _X_EXPORT void XkbDDXUpdateDeviceIndicators( - CARD32 /* newState */ - ); - --extern _X_EXPORT void XkbDDXFakePointerMotion( -- DeviceIntPtr /* dev */, -- unsigned int /* flags */, -- int /* x */, -- int /* y */ --); -- --extern _X_EXPORT void XkbDDXFakeDeviceButton( -- DeviceIntPtr /* dev */, -- Bool /* press */, -- int /* button */ --); -- - extern _X_EXPORT int XkbDDXTerminateServer( - DeviceIntPtr /* dev */, - KeyCode /* key */, -diff --git a/xkb/Makefile.am b/xkb/Makefile.am -index e54ce59..fb3ccbf 100644 ---- a/xkb/Makefile.am -+++ b/xkb/Makefile.am -@@ -5,11 +5,9 @@ AM_CFLAGS = $(DIX_CFLAGS) - DDX_SRCS = \ - ddxBeep.c \ - ddxCtrls.c \ -- ddxFakeMtn.c \ - ddxLEDs.c \ - ddxLoad.c \ -- ddxList.c \ -- ddxDevBtn.c -+ ddxList.c - - DIX_SRCS = \ - xkb.c \ -diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c -deleted file mode 100644 -index b8a1255..0000000 ---- a/xkb/ddxDevBtn.c -+++ /dev/null -@@ -1,69 +0,0 @@ --/************************************************************ --Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. -- --Permission to use, copy, modify, and distribute this --software and its documentation for any purpose and without --fee is hereby granted, provided that the above copyright --notice appear in all copies and that both that copyright --notice and this permission notice appear in supporting --documentation, and that the name of Silicon Graphics not be --used in advertising or publicity pertaining to distribution --of the software without specific prior written permission. --Silicon Graphics makes no representation about the suitability --of this software for any purpose. It is provided "as is" --without any express or implied warranty. -- --SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS --SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY --AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON --GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL --DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, --DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE --OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH --THE USE OR PERFORMANCE OF THIS SOFTWARE. -- --********************************************************/ -- --#ifdef HAVE_DIX_CONFIG_H --#include <dix-config.h> --#endif -- --#include "inputstr.h" --#include <xkbsrv.h> --#include "mi.h" -- --void --XkbDDXFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) --{ -- EventListPtr events; -- int nevents, i; -- DeviceIntPtr ptr; -- -- /* If dev is a slave device, and the SD is attached, do nothing. If we'd -- * post through the attached master pointer we'd get duplicate events. -- * -- * if dev is a master keyboard, post through the XTEST device -- * -- * if dev is a floating slave, post through the device itself. -- */ -- -- if (IsMaster(dev)) -- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); -- else if (!dev->u.master) -- ptr = dev; -- else -- return; -- -- events = InitEventList(GetMaximumEventsNum()); -- OsBlockSignals(); -- nevents = GetPointerEvents(events, ptr, -- press ? ButtonPress : ButtonRelease, button, -- 0 /* flags */, 0 /* first */, -- 0 /* num_val */, NULL); -- OsReleaseSignals(); -- -- for (i = 0; i < nevents; i++) -- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); -- -- FreeEventList(events, GetMaximumEventsNum()); --} -diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c -deleted file mode 100644 -index b383716..0000000 ---- a/xkb/ddxFakeMtn.c -+++ /dev/null -@@ -1,64 +0,0 @@ --/************************************************************ --Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. -- --Permission to use, copy, modify, and distribute this --software and its documentation for any purpose and without --fee is hereby granted, provided that the above copyright --notice appear in all copies and that both that copyright --notice and this permission notice appear in supporting --documentation, and that the name of Silicon Graphics not be --used in advertising or publicity pertaining to distribution --of the software without specific prior written permission. --Silicon Graphics makes no representation about the suitability --of this software for any purpose. It is provided "as is" --without any express or implied warranty. -- --SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS --SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY --AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON --GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL --DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, --DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE --OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH --THE USE OR PERFORMANCE OF THIS SOFTWARE. -- --********************************************************/ -- --#ifdef HAVE_DIX_CONFIG_H --#include <dix-config.h> --#endif -- --#include "inputstr.h" --#include <xkbsrv.h> --#include "mi.h" -- --void --XkbDDXFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) --{ -- EventListPtr events; -- int nevents, i; -- DeviceIntPtr ptr; -- int gpe_flags = 0; -- -- if (!dev->u.master) -- ptr = dev; -- else -- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); -- -- if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) -- gpe_flags = POINTER_ABSOLUTE; -- else -- gpe_flags = POINTER_RELATIVE; -- -- events = InitEventList(GetMaximumEventsNum()); -- OsBlockSignals(); -- nevents = GetPointerEvents(events, ptr, -- MotionNotify, 0, -- gpe_flags, 0, 2, (int[]){x, y}); -- OsReleaseSignals(); -- -- for (i = 0; i < nevents; i++) -- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); -- -- FreeEventList(events, GetMaximumEventsNum()); --} -diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c -index ab52b6a..2817e39 100644 ---- a/xkb/xkbActions.c -+++ b/xkb/xkbActions.c -@@ -40,11 +40,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - #include <xkbsrv.h> - #include "xkb.h" - #include <ctype.h> -+#include "mi.h" - #define EXTENSION_EVENT_BASE 64 - - static int xkbDevicePrivateKeyIndex; - DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; - -+static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); -+static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y); -+ - void - xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, - pointer data) -@@ -479,7 +483,7 @@ int dx,dy; - dx= xkbi->mouseKeysDX; - dy= xkbi->mouseKeysDY; - } -- XkbDDXFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy); -+ XkbFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy); - return xkbi->desc->ctrls->mk_interval; - } - -@@ -507,7 +511,7 @@ Bool accel; - accel= ((pAction->ptr.flags&XkbSA_NoAcceleration)==0); - x= XkbPtrActionX(&pAction->ptr); - y= XkbPtrActionY(&pAction->ptr); -- XkbDDXFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y); -+ XkbFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y); - AccessXCancelRepeatKey(xkbi,keycode); - xkbi->mouseKeysAccel= accel&& - (xkbi->desc->ctrls->enabled_ctrls&XkbMouseKeysAccelMask); -@@ -554,7 +558,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, - ((pAction->btn.flags&XkbSA_LockNoLock)==0)) { - xkbi->lockedPtrButtons|= (1<<button); - AccessXCancelRepeatKey(xkbi,keycode); -- XkbDDXFakeDeviceButton(xkbi->device, 1, button); -+ XkbFakeDeviceButton(xkbi->device, 1, button); - filter->upAction.type= XkbSA_NoAction; - } - break; -@@ -565,12 +569,12 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, - if (pAction->btn.count>0) { - nClicks= pAction->btn.count; - for (i=0;i<nClicks;i++) { -- XkbDDXFakeDeviceButton(xkbi->device, 1, button); -- XkbDDXFakeDeviceButton(xkbi->device, 0, button); -+ XkbFakeDeviceButton(xkbi->device, 1, button); -+ XkbFakeDeviceButton(xkbi->device, 0, button); - } - filter->upAction.type= XkbSA_NoAction; - } -- else XkbDDXFakeDeviceButton(xkbi->device, 1, button); -+ else XkbFakeDeviceButton(xkbi->device, 1, button); - } - break; - case XkbSA_SetPtrDflt: -@@ -636,7 +640,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, - - /* fallthrough */ - case XkbSA_PtrBtn: -- XkbDDXFakeDeviceButton(xkbi->device, 0, button); -+ XkbFakeDeviceButton(xkbi->device, 0, button); - break; - } - filter->active = 0; -@@ -974,7 +978,7 @@ int button; - if ((pAction->devbtn.flags&XkbSA_LockNoLock)|| - BitIsOn(dev->button->down, button)) - return 0; -- XkbDDXFakeDeviceButton(dev,TRUE,button); -+ XkbFakeDeviceButton(dev,TRUE,button); - filter->upAction.type= XkbSA_NoAction; - break; - case XkbSA_DeviceBtn: -@@ -982,12 +986,12 @@ int button; - int nClicks,i; - nClicks= pAction->btn.count; - for (i=0;i<nClicks;i++) { -- XkbDDXFakeDeviceButton(dev,TRUE,button); -- XkbDDXFakeDeviceButton(dev,FALSE,button); -+ XkbFakeDeviceButton(dev,TRUE,button); -+ XkbFakeDeviceButton(dev,FALSE,button); - } - filter->upAction.type= XkbSA_NoAction; - } -- else XkbDDXFakeDeviceButton(dev,TRUE,button); -+ else XkbFakeDeviceButton(dev,TRUE,button); - break; - } - } -@@ -1006,10 +1010,10 @@ int button; - if ((filter->upAction.devbtn.flags&XkbSA_LockNoUnlock)|| - !BitIsOn(dev->button->down, button)) - return 0; -- XkbDDXFakeDeviceButton(dev,FALSE,button); -+ XkbFakeDeviceButton(dev,FALSE,button); - break; - case XkbSA_DeviceBtn: -- XkbDDXFakeDeviceButton(dev,FALSE,button); -+ XkbFakeDeviceButton(dev,FALSE,button); - break; - } - filter->active = 0; -@@ -1326,3 +1330,70 @@ xkbStateNotify sn; - return; - } - -+static void -+XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) -+{ -+ EventListPtr events; -+ int nevents, i; -+ DeviceIntPtr ptr; -+ int gpe_flags = 0; -+ -+ if (!dev->u.master) -+ ptr = dev; -+ else -+ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); -+ -+ if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) -+ gpe_flags = POINTER_ABSOLUTE; -+ else -+ gpe_flags = POINTER_RELATIVE; -+ -+ events = InitEventList(GetMaximumEventsNum()); -+ OsBlockSignals(); -+ nevents = GetPointerEvents(events, ptr, -+ MotionNotify, 0, -+ gpe_flags, 0, 2, (int[]){x, y}); -+ OsReleaseSignals(); -+ -+ for (i = 0; i < nevents; i++) -+ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); -+ -+ FreeEventList(events, GetMaximumEventsNum()); -+} -+ -+static void -+XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) -+{ -+ EventListPtr events; -+ int nevents, i; -+ DeviceIntPtr ptr; -+ -+ /* If dev is a slave device, and the SD is attached, do nothing. If we'd -+ * post through the attached master pointer we'd get duplicate events. -+ * -+ * if dev is a master keyboard, post through the XTEST device -+ * -+ * if dev is a floating slave, post through the device itself. -+ */ -+ -+ if (IsMaster(dev)) -+ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); -+ else if (!dev->u.master) -+ ptr = dev; -+ else -+ return; -+ -+ events = InitEventList(GetMaximumEventsNum()); -+ OsBlockSignals(); -+ nevents = GetPointerEvents(events, ptr, -+ press ? ButtonPress : ButtonRelease, button, -+ 0 /* flags */, 0 /* first */, -+ 0 /* num_val */, NULL); -+ OsReleaseSignals(); -+ -+ -+ for (i = 0; i < nevents; i++) -+ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); -+ -+ FreeEventList(events, GetMaximumEventsNum()); -+} --- -1.7.1 - -From dcb46252f959893f1934232698e2ae26390a8a5b Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Tue, 29 Jun 2010 15:24:51 +1000 -Subject: [PATCH 4/5] xkb: emulate PointerKeys events only on the master device. - -This patch replicates the behaviour for button events. Only generate a -PointerKeys motion event on the master device, not on the slave device. -Fixes the current issue of PointerKey motion events generating key events as -well. - -Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> ---- - xkb/xkbActions.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c -index 2817e39..391c375 100644 ---- a/xkb/xkbActions.c -+++ b/xkb/xkbActions.c -@@ -496,9 +496,6 @@ _XkbFilterPointerMove( XkbSrvInfoPtr xkbi, - int x,y; - Bool accel; - -- if (xkbi->device == inputInfo.keyboard) -- return 0; -- - if (filter->keycode==0) { /* initial press */ - filter->keycode = keycode; - filter->active = 1; -@@ -1338,10 +1335,12 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) - DeviceIntPtr ptr; - int gpe_flags = 0; - -- if (!dev->u.master) -+ if (IsMaster(dev)) -+ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); -+ else if (!dev->u.master) - ptr = dev; - else -- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); -+ return; - - if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) - gpe_flags = POINTER_ABSOLUTE; --- -1.7.1 - -From 40941fb2e9ae763add7b74850e8a0471ac754db6 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Thu, 1 Jul 2010 12:44:57 +1000 -Subject: [PATCH 5/5] xkb: release XTEST pointer buttons on physical releases. (#28808) - -If a button release event is posted for the MD pointer, post a release event -through the matching XTEST device. This way, a client who posts a button -press through the XTEST extension cannot inadvertedly lock the button. - -This behaviour is required for historical reasons, until server 1.7 the core -pointer would release a button press on physical events, regardless of the -XTEST state. Clients seem to rely on this behaviour, causing seemingly stuck -grabs. - -The merged behaviour is kept for multiple keyboard PointerKey events, if two -physical keyboards hold the button down as a result of PointerKey actions, -the button is not released until the last keyboard releases the button. - -X.Org Bug 28808 <http://bugs.freedesktop.org/show_bug.cgi?id=28808> - -Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> ---- - include/xkbsrv.h | 6 ++++++ - xkb/xkbAccessX.c | 23 ++++++++++------------- - xkb/xkbActions.c | 4 ++-- - 3 files changed, 18 insertions(+), 15 deletions(-) - -diff --git a/include/xkbsrv.h b/include/xkbsrv.h -index d1cbd1a..a96ca56 100644 ---- a/include/xkbsrv.h -+++ b/include/xkbsrv.h -@@ -923,6 +923,12 @@ extern int XkbGetEffectiveGroup( - extern void XkbMergeLockedPtrBtns( - DeviceIntPtr /* master */); - -+extern void XkbFakeDeviceButton( -+ DeviceIntPtr /* dev */, -+ int /* press */, -+ int /* button */); -+ -+ - #include "xkbfile.h" - #include "xkbrules.h" - -diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c -index e3fdc06..d3f9652 100644 ---- a/xkb/xkbAccessX.c -+++ b/xkb/xkbAccessX.c -@@ -710,19 +710,16 @@ DeviceEvent *event = &ev->device_event; - if (xkbi) { - xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7)); - -- /* Merge this MD's lockedPtrButtons with the one of all -- * attached slave devices. -- * The DIX uses a merged button state for MDs, not -- * releasing buttons until the last SD has released -- * thenm. If we unconditionally clear the -- * lockedPtrButtons bit on the MD, a PointerKeys button -- * release on the SD keyboard won't generate the required fake button -- * event on the XTEST pointer, thus never processing the -- * button event in the DIX and the XTEST pointer's -- * buttons stay down - result is a stuck button. -- */ -- if (IsMaster(dev)) -- XkbMergeLockedPtrBtns(dev); -+ if (IsMaster(dev)) -+ { -+ DeviceIntPtr source; -+ int rc; -+ rc = dixLookupDevice(&source, event->sourceid, serverClient, DixWriteAccess); -+ if (rc != Success) -+ ErrorF("[xkb] bad sourceid '%d' on button release event.\n", event->sourceid); -+ else if (!IsXTestDevice(source, GetMaster(dev, MASTER_POINTER))) -+ XkbFakeDeviceButton(dev, FALSE, event->detail.key); -+ } - } - - changed |= XkbPointerButtonMask; -diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c -index 391c375..5d40199 100644 ---- a/xkb/xkbActions.c -+++ b/xkb/xkbActions.c -@@ -46,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. - static int xkbDevicePrivateKeyIndex; - DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; - --static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); -+void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); - static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y); - - void -@@ -1360,7 +1360,7 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) - FreeEventList(events, GetMaximumEventsNum()); - } - --static void -+void - XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) - { - EventListPtr events; --- -1.7.1 - -From 7273832bcdc6f43e9a5a8fdbb56844466efb710a Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Fri, 23 Jul 2010 11:46:30 +1000 -Subject: [PATCH 1/3] xkb: post-fix PointerKeys button events with a DeviceChangedEvent. - -commit 14327858391ebe929b806efb53ad79e789361883 - xkb: release XTEST pointer buttons on physical releases. (#28808) -revealed a bug with the XTEST/PointerKeys interaction. - -Events resulting from PointerKeys are injected into the event processing -stream, not appended to the event queue. The events generated for the fake -button press include a DeviceChangedEvent (DCE), a raw button event and the -button event itself. The DCE causes the master to switch classes to the -attached XTEST pointer device. - -Once the fake button is processed, normal event processing continues with -events in the EQ. The master still contains the XTEST classes, causing some -events to be dropped if e.g. the number of valuators of the event in the -queue exceeds the XTEST device's number of valuators. - -Example: the EQ contains the following events, processed one-by-one, left to -right. - -[DCE (dev)][Btn down][Btn up][Motion][Motion][...] - ^ XkbFakeDeviceButton injects [DCE (XTEST)][Btn up] - -Thus the event sequence processed looks like this: - -[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][Motion][Motion][...] - -The first DCE causes the master to switch to the device. The button up event -injects a DCE to the XTEST device, causing the following Motion events to be -processed with the master still being on XTEST classes. - -This patch post-fixes the injected event sequence with a DCE to restore the -classes of the original slave device, resulting in an event sequence like -this: -[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][DCE (dev)][Motion][Motion] - -Note that this is a simplified description. The event sequence injected by -the PointerKeys code is injected for the master device only and the matching -slave device that caused the injection has already finished processing on -the slave. Furthermore, the injection happens as part of the the XKB layer, -before the unwrapping of the processInputProc takes us into the DIX where -the DCE is actually handled. - -Bug reproducible with a device that reports more than 2 valuators. Simply -cause button releases on the device and wait for a "too many valuators" -warning message. - -Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> ---- - xkb/xkbActions.c | 26 +++++++++++++++++++------- - 1 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c -index 5d40199..2afd46d 100644 ---- a/xkb/xkbActions.c -+++ b/xkb/xkbActions.c -@@ -1365,34 +1365,46 @@ XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) - { - EventListPtr events; - int nevents, i; -- DeviceIntPtr ptr; -+ DeviceIntPtr ptr, mpointer, lastSlave; - - /* If dev is a slave device, and the SD is attached, do nothing. If we'd - * post through the attached master pointer we'd get duplicate events. - * - * if dev is a master keyboard, post through the XTEST device -- * - * if dev is a floating slave, post through the device itself. -+ * -+ * The event is injected into the event processing, not the EQ. Thus, -+ * ensure that we restore the master after the event sequence to the -+ * original set of classes. Otherwise, the master remains on the XTEST -+ * classes and drops events that don't fit into the XTEST layout (e.g. -+ * events with more than 2 valuators). -+ * To do so, we remember the lastSlave that posted through the master -+ * and add a DeviceChangedEvent to the end of the list. - */ - -- if (IsMaster(dev)) -- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); -- else if (!dev->u.master) -+ if (IsMaster(dev)) { -+ mpointer = GetMaster(dev, MASTER_POINTER); -+ lastSlave = mpointer->u.lastSlave; -+ ptr = GetXTestDevice(mpointer); -+ } else if (!dev->u.master) - ptr = dev; - else - return; - -- events = InitEventList(GetMaximumEventsNum()); -+ events = InitEventList(GetMaximumEventsNum() + 1); - OsBlockSignals(); - nevents = GetPointerEvents(events, ptr, - press ? ButtonPress : ButtonRelease, button, - 0 /* flags */, 0 /* first */, - 0 /* num_val */, NULL); -+ if (IsMaster(dev) && (lastSlave && lastSlave != ptr)) -+ CreateClassesChangedEvent(&events[nevents++], mpointer, -+ lastSlave, DEVCHANGE_POINTER_EVENT); - OsReleaseSignals(); - - - for (i = 0; i < nevents; i++) - mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); - -- FreeEventList(events, GetMaximumEventsNum()); -+ FreeEventList(events, GetMaximumEventsNum() + 1); - } --- -1.7.2 - -From 817e031a996a5f5aa16fc789d7e570cc589d96cb Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer(a)who-t.net> -Date: Wed, 28 Jul 2010 14:24:59 +1000 -Subject: [PATCH 3/3] Xi: reset the unused classes pointer after copying - -After copying the unused_classes into the device, reset the original -pointer. Otherwise we have two pointers pointing to the same field and both -get freed on device removal. - -Some classes already have this behaviour since 51c8fd69. - -Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> ---- - Xi/exevents.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/Xi/exevents.c b/Xi/exevents.c -index 566b0ef..a6160dd 100644 ---- a/Xi/exevents.c -+++ b/Xi/exevents.c -@@ -227,6 +227,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) - classes = dixLookupPrivate(&to->devPrivates, - UnusedClassesPrivateKey); - to->intfeed = classes->intfeed; -+ classes->intfeed = NULL; - } - - i = &to->intfeed; -@@ -263,6 +264,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) - classes = dixLookupPrivate(&to->devPrivates, - UnusedClassesPrivateKey); - to->stringfeed = classes->stringfeed; -+ classes->stringfeed = NULL; - } - - s = &to->stringfeed; -@@ -299,6 +301,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) - classes = dixLookupPrivate(&to->devPrivates, - UnusedClassesPrivateKey); - to->bell = classes->bell; -+ classes->bell = NULL; - } - - b = &to->bell; -@@ -336,6 +339,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) - classes = dixLookupPrivate(&to->devPrivates, - UnusedClassesPrivateKey); - to->leds = classes->leds; -+ classes->leds = NULL; - } - - l = &to->leds; -@@ -387,6 +391,7 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to) - to->kbdfeed = classes->kbdfeed; - if (!to->kbdfeed) - InitKeyboardDeviceStruct(to, NULL, NULL, NULL); -+ classes->kbdfeed = NULL; - } - - k = &to->kbdfeed; -@@ -517,6 +522,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to) - classes = dixLookupPrivate(&to->devPrivates, - UnusedClassesPrivateKey); - to->ptrfeed = classes->ptrfeed; -+ classes->ptrfeed = NULL; - } - - p = &to->ptrfeed; --- -1.7.2 - diff --git a/pkgs/core/xorg-server/xorg-server.nm b/pkgs/core/xorg-server/xorg-server.nm deleted file mode 100644 index 93cde25..0000000 --- a/pkgs/core/xorg-server/xorg-server.nm +++ /dev/null @@ -1,104 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = xorg-server -PKG_VER = 1.8.2 -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUP = X/Server -PKG_URL = http://www.x.org -PKG_LICENSE = MIT -PKG_SUMMARY = X.Org X11 X server. - -PKG_BUILD_DEPS+= autoconf automake pkg-config \ - xorg-x11-font-utils \ - xorg-x11-util-macros xorg-x11-proto-devel xorg-x11-xtrans-devel -PKG_DEPS += libX11 libXau libXfont libpciaccess libxcb libxkbfile pixman udev - -define PKG_DESCRIPTION - X.org X11 is an open source implementation of the X Window System. \ - It provides the basic low level functionality which full fledged \ - graphical user interfaces (GUIs) such as GNOME and KDE are designed \ - upon. -endef - -PKG_TARBALL = $(THISAPP).tar.bz2 - -CFLAGS += -Wstrict-overflow -rdynamic - -CONFIGURE_OPTIONS += \ - --enable-xvfb \ - --disable-xnest \ - --enable-kdrive \ - --disable-xephyr \ - --disable-xsdl \ - --disable-xfake \ - --disable-xfbdev \ - --enable-xorg \ - --disable-static \ - --with-pic \ - --with-int10=x86emu \ - --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ - --with-module-dir=/usr/lib/xorg/modules \ - --with-builderstring="Build ID: $(PKG_NAME) $(PKG_VER)-$(PKG_REL)" \ - --with-os-name="$(hostname -s) $(uname -r)" \ - --with-xkb-output=/var/lib/xkb \ - --enable-install-libxf86config \ - --localstatedir=/var \ - --disable-aiglx \ - --disable-composite \ - --disable-xdmcp \ - --disable-xdm-auth-1 \ - --disable-glx \ - --disable-screensaver \ - --disable-dri \ - --disable-dri2 \ - --disable-xinerama \ - --disable-dbe \ - --disable-config-dbus \ - --disable-config-hal \ - --disable-xquartz \ - --enable-config-udev \ - --with-vendor-name="$(DISTRO_NAME) Project" - -define STAGE_PREPARE_CMDS - cd $(DIR_APP) && autoreconf -vfi -endef - -define STAGE_INSTALL - cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \ - moduledir=/usr/lib/xorg/modules - - rm -vf $(BUILDROOT)/usr/lib/xorg/modules/libxf8_16bpp.so - rm -vrf $(BUILDROOT)/var/log - - -mkdir -pv $(BUILDROOT)/etc/X11/xorg.conf.d $(BUILDROOT)/usr/share/xorg - cd $(DIR_APP) && install -m 0444 hw/xfree86/common/{vesa,extra}modes \ - $(BUILDROOT)/usr/share/xorg/ - cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/10-quirks.conf \ - $(BUILDROOT)/usr/share/X11/xorg.conf.d -endef diff --git a/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm index c524786..4939399 100644 --- a/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm +++ b/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-drv-evdev PKG_VER = 2.4.99.901 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Driver PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm index fcab804..51353b1 100644 --- a/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm +++ b/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-drv-keyboard PKG_VER = 1.4.0 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Driver PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm index 86cf79b..0d83825 100644 --- a/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm +++ b/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-drv-mouse PKG_VER = 1.5.0 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Driver PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm index e25781f..ece63c2 100644 --- a/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm +++ b/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-drv-vesa PKG_VER = 2.3.0 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Driver PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm b/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm index b79376c..28e8dcf 100644 --- a/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm +++ b/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-font-utils PKG_VER = 7.4 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Fonts PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm index ac0c7fa..d8ec50d 100644 --- a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm +++ b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-fonts PKG_VER = 7.2 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Fonts PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm index 7275b12..66b22dd 100644 --- a/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm +++ b/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-proto-devel PKG_VER = 7.4 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = Development/System PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-server/10-quirks.conf b/pkgs/core/xorg-x11-server/10-quirks.conf new file mode 100644 index 0000000..82d3ec2 --- /dev/null +++ b/pkgs/core/xorg-x11-server/10-quirks.conf @@ -0,0 +1,20 @@ +# Collection of quirks and blacklist/whitelists for specific devices. + + +# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable +# http://bugs.freedesktop.org/show_bug.cgi?id=22442 +Section "InputClass" + Identifier "ThinkPad HDAPS accelerometer blacklist" + MatchProduct "ThinkPad HDAPS accelerometer data" + Option "Ignore" "on" +EndSection + +# https://bugzilla.redhat.com/show_bug.cgi?id=523914 +# Mouse does not move in PV Xen guest +# Explicitly tell evdev to not ignore the absolute axes. +Section "InputClass" + Identifier "Xen Virtual Pointer axis blacklist" + MatchProduct "Xen Virtual Pointer" + Option "IgnoreAbsoluteAxes" "off" + Option "IgnoreRelativeAxes" "off" +EndSection diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch new file mode 100644 index 0000000..d040900 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch @@ -0,0 +1,25 @@ +From 04bd8e2fa6be557f58a0e417b0f3befc56f5ef59 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Thu, 1 Jul 2010 15:45:03 +1000 +Subject: [PATCH] Build libxf86config with -fPIC. + +--- + hw/xfree86/parser/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am +index caf7079..655e73f 100644 +--- a/hw/xfree86/parser/Makefile.am ++++ b/hw/xfree86/parser/Makefile.am +@@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \ + + libxf86config_a_SOURCES = \ + $(INTERNAL_SOURCES) +-libxf86config_a_CFLAGS = $(AM_CFLAGS) ++libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC -fvisibility=hidden + + AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ +-- +1.7.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch new file mode 100644 index 0000000..d532fe1 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch @@ -0,0 +1,48 @@ +From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Mon, 10 Dec 2007 11:26:57 -0500 +Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients. + +--- + Xext/shm.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/Xext/shm.c b/Xext/shm.c +index 5937a03..5376c19 100644 +--- a/Xext/shm.c ++++ b/Xext/shm.c +@@ -381,8 +381,21 @@ + mode_t mask; + int uidset = 0, gidset = 0; + LocalClientCredRec *lcc; ++ Bool is_ssh = FALSE; + + if (GetLocalClientCreds(client, &lcc) != -1) { ++#ifdef linux ++ if (lcc->fieldsSet & LCC_PID_SET) { ++ /* ssh isn't actually a local client */ ++ char exe[64], buf[64]; ++ ++ memset(buf, 0, 64); ++ snprintf(exe, 64, "/proc/%d/exe", lcc->pid); ++ readlink(exe, buf, 63); ++ if (strstr(buf, "/ssh")) ++ is_ssh = TRUE; ++ } ++#endif + + if (lcc->fieldsSet & LCC_UID_SET) { + uid = lcc->euid; +@@ -401,6 +414,9 @@ + } + #endif + FreeLocalClientCreds(lcc); ++ ++ if (is_ssh) ++ return -1; + + if (uidset) { + /* User id 0 always gets access */ +-- +1.5.3.4 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch new file mode 100644 index 0000000..ae65d0b --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch @@ -0,0 +1,155 @@ +From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Wed, 20 Jan 2010 14:46:12 +1300 +Subject: [PATCH] Add nr for background=none root + +--- + dix/globals.c | 1 + + dix/window.c | 12 +++++++----- + hw/xfree86/common/xf86Init.c | 11 +++++++++++ + hw/xfree86/common/xf86str.h | 5 ++++- + include/opaque.h | 1 + + os/utils.c | 3 +++ + 6 files changed, 27 insertions(+), 6 deletions(-) + +diff --git a/dix/globals.c b/dix/globals.c +index c24a94f..907a5e8 100644 +--- a/dix/globals.c ++++ b/dix/globals.c +@@ -124,6 +124,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in + CursorPtr rootCursor; + Bool party_like_its_1989 = FALSE; + Bool whiteRoot = FALSE; ++Bool bgNoneRoot = FALSE; + + int cursorScreenDevPriv[MAXSCREENS]; + +diff --git a/dix/window.c b/dix/window.c +index caff1cb..be1d1c4 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin) + pWin->optional->cursor = rootCursor; + rootCursor->refcnt++; + ++ pWin->backingStore = defaultBackingStore; ++ pWin->forcedBS = (defaultBackingStore != NotUseful); + + if (party_like_its_1989) { + MakeRootTile(pWin); + backFlag |= CWBackPixmap; ++ pScreen->ChangeWindowAttributes(pWin, backFlag); ++ } else if (bgNoneRoot) { ++ /* nothing, handled in xf86CreateRootWindow */ + } else { + if (whiteRoot) + pWin->background.pixel = pScreen->whitePixel; + else + pWin->background.pixel = pScreen->blackPixel; + backFlag |= CWBackPixel; +- } + +- pWin->backingStore = defaultBackingStore; +- pWin->forcedBS = (defaultBackingStore != NotUseful); +- /* We SHOULD check for an error value here XXX */ +- (*pScreen->ChangeWindowAttributes)(pWin, backFlag); ++ pScreen->ChangeWindowAttributes(pWin, backFlag); ++ } + + MapWindow(pWin, serverClient); + } +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index 6707448..776b898 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -77,6 +77,7 @@ + #ifdef RENDER + #include "picturestr.h" + #endif ++#include "xace.h" + + #include "xf86VGAarbiter.h" + #include "globals.h" +@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin) + int ret = TRUE; + int err = Success; + ScreenPtr pScreen = pWin->drawable.pScreen; ++ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + RootWinPropPtr pProp; + CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) + dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); +@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin) + } + } + ++ if (bgNoneRoot && pScrn->canDoBGNoneRoot) { ++ pWin->backgroundState = XaceBackgroundNoneState(pWin); ++ pWin->background.pixel = pScreen->whitePixel; ++ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore); ++ } else { ++ pWin->background.pixel = pScreen->blackPixel; ++ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore); ++ } ++ + DebugF("xf86CreateRootWindow() returns %d\n", ret); + return (ret); + } +diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h +index de1f1b6..5c3aa00 100644 +--- a/hw/xfree86/common/xf86str.h ++++ b/hw/xfree86/common/xf86str.h +@@ -503,7 +503,7 @@ typedef struct _confdrirec { + } confDRIRec, *confDRIPtr; + + /* These values should be adjusted when new fields are added to ScrnInfoRec */ +-#define NUM_RESERVED_INTS 16 ++#define NUM_RESERVED_INTS 15 + #define NUM_RESERVED_POINTERS 14 + #define NUM_RESERVED_FUNCS 11 + +@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec { + ClockRangePtr clockRanges; + int adjustFlags; + ++ /* -nr support */ ++ int canDoBGNoneRoot; ++ + /* + * These can be used when the minor ABI version is incremented. + * The NUM_* parameters must be reduced appropriately to keep the +diff --git a/include/opaque.h b/include/opaque.h +index b3c7c70..fcc8c95 100644 +--- a/include/opaque.h ++++ b/include/opaque.h +@@ -71,6 +71,7 @@ extern _X_EXPORT Bool defeatAccessControl; + extern _X_EXPORT long maxBigRequestSize; + extern _X_EXPORT Bool party_like_its_1989; + extern _X_EXPORT Bool whiteRoot; ++extern _X_EXPORT Bool bgNoneRoot; + + extern _X_EXPORT Bool CoreDump; + +diff --git a/os/utils.c b/os/utils.c +index d7c8388..40583d0 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -513,6 +513,7 @@ void UseMsg(void) + #endif + ErrorF("-nolisten string don't listen on protocol\n"); + ErrorF("-noreset don't reset after last client exists\n"); ++ ErrorF("-nr create root window with no background\n"); + ErrorF("-reset reset after last client exists\n"); + ErrorF("-p # screen-saver pattern duration (minutes)\n"); + ErrorF("-pn accept failure to listen on all ports\n"); +@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[]) + defaultBackingStore = WhenMapped; + else if ( strcmp( argv[i], "-wr") == 0) + whiteRoot = TRUE; ++ else if ( strcmp( argv[i], "-nr") == 0) ++ bgNoneRoot = TRUE; + else if ( strcmp( argv[i], "-maxbigreqsize") == 0) { + if(++i < argc) { + long reqSizeArg = atol(argv[i]); +-- +1.6.6 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch new file mode 100644 index 0000000..c6178b8 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch @@ -0,0 +1,32 @@ +From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann(a)redhat.com> +Date: Thu, 11 Sep 2008 12:51:31 -0400 +Subject: [PATCH] Make room for an external monitor if we have enough video RAM + +--- + hw/xfree86/modes/xf86Crtc.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 4de7e05..9bcf81b 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, + if (crtc_height > height) + height = crtc_height; + } ++ ++ /* Make room for an external monitor if we have enough video ram */ ++ if (scrn->videoRam >= 65536) ++ width += 1920; ++ else if (scrn->videoRam >= 32768) ++ width += 1280; ++ else if (scrn->videoRam >= 16384) ++ width += 1024; ++ + if (config->maxWidth && width > config->maxWidth) width = config->maxWidth; + if (config->maxHeight && height > config->maxHeight) height = config->maxHeight; + if (config->minWidth && width < config->minWidth) width = config->minWidth; +-- +1.6.0.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch new file mode 100644 index 0000000..11fe5ad --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch @@ -0,0 +1,26 @@ +From 079910986a1b8f5042e16ee2ba3ad9ed843b67ca Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Tue, 7 Oct 2008 11:09:14 -0400 +Subject: [PATCH] Force ModeDebug on. + +--- + hw/xfree86/modes/xf86Crtc.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 9bcf81b..a953c8a 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -2084,8 +2084,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + xf86ProcessOptions (scrn->scrnIndex, + scrn->options, + config->options); +- config->debug_modes = xf86ReturnOptValBool (config->options, +- OPTION_MODEDEBUG, FALSE); ++ config->debug_modes = TRUE; + + if (scrn->display->virtualX) + width = scrn->display->virtualX; +-- +1.6.0.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-displayfd.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-displayfd.patch new file mode 100644 index 0000000..09e7b49 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-displayfd.patch @@ -0,0 +1,172 @@ +From 1766352059d0db67bff3f7dd0820563a30f54858 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Thu, 18 Jun 2009 16:56:41 +1000 +Subject: [PATCH] displayfd hack + +--- + dix/globals.c | 1 + + include/opaque.h | 1 + + os/connection.c | 72 ++++++++++++++++++++++++++++++++++++----------------- + os/utils.c | 11 ++++++++ + 4 files changed, 62 insertions(+), 23 deletions(-) + +diff --git a/dix/globals.c b/dix/globals.c +index 907a5e8..c1e64d3 100644 +--- a/dix/globals.c ++++ b/dix/globals.c +@@ -135,6 +135,7 @@ int defaultColorVisualClass = -1; + int monitorResolution = 0; + + char *display; ++int displayfd; + char *ConnectionInfo; + + CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; +diff --git a/include/opaque.h b/include/opaque.h +index fcc8c95..2a08e2d 100644 +--- a/include/opaque.h ++++ b/include/opaque.h +@@ -50,6 +50,7 @@ extern _X_EXPORT int ScreenSaverAllowExposures; + extern _X_EXPORT int defaultScreenSaverBlanking; + extern _X_EXPORT int defaultScreenSaverAllowExposures; + extern _X_EXPORT char *display; ++extern _X_EXPORT int displayfd; + + extern _X_EXPORT int defaultBackingStore; + extern _X_EXPORT Bool disableBackingStore; +diff --git a/os/connection.c b/os/connection.c +index 0c72b67..05d95c4 100644 +--- a/os/connection.c ++++ b/os/connection.c +@@ -146,6 +146,7 @@ Bool NewOutputPending; /* not yet attempted to write some new output */ + Bool AnyClientsWriteBlocked; /* true if some client blocked on write */ + + static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */ ++static char dynamic_display[7]; + Bool PartialNetwork; /* continue even if unable to bind all addrs */ + static Pid_t ParentProcess; + +@@ -357,9 +358,23 @@ NotifyParentProcess(void) + kill (ParentProcess, SIGUSR1); + } + } ++ if (dynamic_display[0]) ++ write(displayfd, dynamic_display, strlen(dynamic_display)); + #endif + } + ++static Bool ++TryCreateSocket(int num, int *partial) ++{ ++ char port[20]; ++ ++ sprintf(port, "%d", num); ++ ++ return _XSERVTransMakeAllCOTSServerListeners(port, partial, ++ &ListenTransCount, ++ &ListenTransConns); ++} ++ + /***************** + * CreateWellKnownSockets + * At initialization, create the sockets to listen on for new clients. +@@ -370,7 +385,6 @@ CreateWellKnownSockets(void) + { + int i; + int partial; +- char port[20]; + + FD_ZERO(&AllSockets); + FD_ZERO(&AllClients); +@@ -385,32 +399,44 @@ CreateWellKnownSockets(void) + + FD_ZERO (&WellKnownConnections); + +- sprintf (port, "%d", atoi (display)); +- +- if ((_XSERVTransMakeAllCOTSServerListeners (port, &partial, +- &ListenTransCount, &ListenTransConns) >= 0) && +- (ListenTransCount >= 1)) ++ if (display) + { +- if (!PartialNetwork && partial) +- { +- FatalError ("Failed to establish all listening sockets"); +- } +- else ++ if (TryCreateSocket(atoi(display), &partial) && ++ (ListenTransCount >= 1)) ++ if (!PartialNetwork && partial) ++ FatalError ("Failed to establish all listening sockets"); ++ } ++ else /* -displayfd */ ++ { ++ Bool found = 0; ++ for (i = 0; i < 65535 - 1024; i++) + { +- ListenTransFds = xalloc (ListenTransCount * sizeof (int)); +- +- for (i = 0; i < ListenTransCount; i++) ++ if (!TryCreateSocket(i, &partial) && !partial) + { +- int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]); +- +- ListenTransFds[i] = fd; +- FD_SET (fd, &WellKnownConnections); +- +- if (!_XSERVTransIsLocal (ListenTransConns[i])) +- { +- DefineSelf (fd); +- } ++ found = 1; ++ break; + } ++ else ++ CloseWellKnownConnections(); ++ } ++ if (!found) ++ FatalError("Failed to find a socket to listen on"); ++ sprintf(dynamic_display, "%d\n", i); ++ display = dynamic_display; ++ } ++ ++ ListenTransFds = xalloc (ListenTransCount * sizeof (int)); ++ ++ for (i = 0; i < ListenTransCount; i++) ++ { ++ int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]); ++ ++ ListenTransFds[i] = fd; ++ FD_SET (fd, &WellKnownConnections); ++ ++ if (!_XSERVTransIsLocal (ListenTransConns[i])) ++ { ++ DefineSelf (fd); + } + } + +diff --git a/os/utils.c b/os/utils.c +index 7bfdf8b..37a93b1 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -678,6 +678,17 @@ ProcessCommandLine(int argc, char *argv[]) + else + UseMsg(); + } ++ else if (strcmp(argv[i], "-displayfd") == 0) ++ { ++ if (++i < argc) ++ { ++ displayfd = atoi(argv[i]); ++ display = NULL; ++ nolock = TRUE; ++ } ++ else ++ UseMsg(); ++ } + #ifdef DPMSExtension + else if ( strcmp( argv[i], "dpms") == 0) + /* ignored for compatibility */ ; +-- +1.6.3.rc1.2.g0164.dirty + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch new file mode 100644 index 0000000..cc80e6c --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch @@ -0,0 +1,31 @@ +From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Wed, 11 Mar 2009 14:02:11 -0400 +Subject: [PATCH] Don't build the ACPI code. + +No good can come of this. +--- + configure.ac | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 72ae67e..04716f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then + case $host_cpu in + ia64*) + linux_ia64=yes +- linux_acpi="yes" + ;; + alpha*) + linux_alpha=yes + ;; + i*86|amd64*|x86_64*) +- linux_acpi="yes" + ;; + *) + ;; +-- +1.6.1.3 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.1-nouveau.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.1-nouveau.patch new file mode 100644 index 0000000..35a1ff9 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.6.1-nouveau.patch @@ -0,0 +1,109 @@ +From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Tue, 16 Feb 2010 11:38:17 +1000 +Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs + +Also, don't treat DRI setup failure as an error for nouveau. +--- + glx/glxdri.c | 7 +++++-- + glx/glxdri2.c | 7 +++++-- + hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++- + 3 files changed, 28 insertions(+), 5 deletions(-) + +diff --git a/glx/glxdri.c b/glx/glxdri.c +index 21e44d1..30b820c 100644 +--- a/glx/glxdri.c ++++ b/glx/glxdri.c +@@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + const __DRIconfig **driConfigs; + const __DRIextension **extensions; + int i; ++ int from = X_ERROR; + + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || + !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || +@@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + if (screen->driver == NULL) { +- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", ++ if (!strcmp(driverName, "nouveau")) ++ from = X_INFO; ++ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", + filename, dlerror()); + goto handle_error; + } +@@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + xfree(screen); + +- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); ++ LogMessage(from, "AIGLX: reverting to software rendering\n"); + + return NULL; + } +diff --git a/glx/glxdri2.c b/glx/glxdri2.c +index 0f998de..a244809 100644 +--- a/glx/glxdri2.c ++++ b/glx/glxdri2.c +@@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + const __DRIextension **extensions; + const __DRIconfig **driConfigs; + int i; ++ int from = X_ERROR; + + screen = xcalloc(1, sizeof *screen); + if (screen == NULL) +@@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + if (screen->driver == NULL) { +- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", ++ if (!strcmp(driverName, "nouveau")) ++ from = X_INFO; ++ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", + filename, dlerror()); + goto handle_error; + } +@@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + xfree(screen); + +- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); ++ LogMessage(from, "AIGLX: reverting to software rendering\n"); + + return NULL; + } +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index 7f4ada8..d964c6c 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev, + break; + case 0x102b: driverList[0] = "mga"; break; + case 0x10c8: driverList[0] = "neomagic"; break; +- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; ++ case 0x10de: case 0x12d2: ++ switch (dev->device_id) { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[0] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[0] = "nv"; ++ break; ++ default: ++ driverList[0] = "nouveau"; ++ driverList[1] = "nv"; ++ break; ++ } ++ break; + case 0x1106: driverList[0] = "openchrome"; break; + case 0x1b36: driverList[0] = "qxl"; break; + case 0x1163: driverList[0] = "rendition"; break; +-- +1.6.5.2 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch new file mode 100644 index 0000000..0f0ba27 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch @@ -0,0 +1,35 @@ +From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Thu, 4 Mar 2010 15:18:38 +1000 +Subject: [PATCH] tweak default mode list yet again + +--- + hw/xfree86/modes/xf86Crtc.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 03277be..571ffd0 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) + int min_clock = 0; + int max_clock = 0; + double clock; +- Bool add_default_modes = TRUE; ++ Bool add_default_modes; + Bool debug_modes = config->debug_modes || + xf86Initialising; + enum det_monrec_source sync_source = sync_default; +@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) + } + + output_modes = (*output->funcs->get_modes) (output); ++ ++ /* if the driver found modes, don't second-guess it */ ++ add_default_modes = (output_modes == NULL); + + edid_monitor = output->MonInfo; + +-- +1.6.6.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch new file mode 100644 index 0000000..0e7a6ba --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch @@ -0,0 +1,42 @@ +From 16be69ef1e2ea9f19cd596b99b5ede7567d374b8 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Mon, 27 Jul 2009 16:52:42 -0400 +Subject: [PATCH 11/16] additional randr debugging + +--- + randr/randr.c | 16 +++++++++++++++- + 1 files changed, 15 insertions(+), 1 deletions(-) + +diff --git a/randr/randr.c b/randr/randr.c +index 1c1d0c4..accf614 100644 +--- a/randr/randr.c ++++ b/randr/randr.c +@@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode) + static int + ProcRRDispatch (ClientPtr client) + { ++ int ret; + REQUEST(xReq); + if (stuff->data >= RRNumberRequests || !ProcRandrVector[stuff->data]) + return BadRequest; +- return (*ProcRandrVector[stuff->data]) (client); ++ ret = ProcRandrVector[stuff->data](client); ++ ++ if (ret) { ++ int i; ++ ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase); ++ for (i = 0; i < stuff->length; i++) { ++ ErrorF("%08x ", ((unsigned int *)stuff) + i); ++ if ((i+1) % 4 == 0) ++ ErrorF("\n"); ++ } ++ ErrorF("\n"); ++ } ++ ++ return ret; + } + + static int +-- +1.6.4.2 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-right-of.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-right-of.patch new file mode 100644 index 0000000..06c1183 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-right-of.patch @@ -0,0 +1,172 @@ +From 1766ae8a69daa06730e41d094fdddf53db3a1a9e Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Tue, 28 Jul 2009 11:07:13 -0400 +Subject: [PATCH] RANDR: right-of placement by default + +[Enhanced to add a new prefer clone option for drivers. This +allows for servers like RN50 where two heads are disjoint. - airlied] + +[Enhanced to ignore rightof on single crtc cards - airlied] +--- + hw/xfree86/common/xf86str.h | 9 ++++- + hw/xfree86/modes/xf86Crtc.c | 77 +++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 77 insertions(+), 9 deletions(-) + +diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h +index 5c3aa00..8224668 100644 +--- a/hw/xfree86/common/xf86str.h ++++ b/hw/xfree86/common/xf86str.h +@@ -503,10 +503,13 @@ typedef struct _confdrirec { + } confDRIRec, *confDRIPtr; + + /* These values should be adjusted when new fields are added to ScrnInfoRec */ +-#define NUM_RESERVED_INTS 15 ++#define NUM_RESERVED_INTS 14 + #define NUM_RESERVED_POINTERS 14 + #define NUM_RESERVED_FUNCS 11 + ++/* let clients know they can use this */ ++#define XF86_SCRN_HAS_PREFER_CLONE 1 ++ + typedef pointer (*funcPointer)(void); + + /* flags for depth 24 pixmap options */ +@@ -672,7 +675,6 @@ typedef void xf86SetOverscanProc (ScrnInfoPtr, int); + * are to be dependent on compile-time defines. + */ + +- + typedef struct _ScrnInfoRec { + int driverVersion; + char * driverName; /* canonical name used in */ +@@ -778,6 +780,9 @@ typedef struct _ScrnInfoRec { + /* -nr support */ + int canDoBGNoneRoot; + ++ /* initial rightof support disable */ ++ int preferClone; ++ + /* + * These can be used when the minor ABI version is incremented. + * The NUM_* parameters must be reduced appropriately to keep the +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index a66c979..4d14f57 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1146,6 +1146,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) + int o; + int min_x, min_y; + ++ /* check for initial right-of heuristic */ ++ for (o = 0; o < config->num_output; o++) ++ { ++ xf86OutputPtr output = config->output[o]; ++ ++ if (output->initial_x || output->initial_y) ++ return TRUE; ++ } ++ + for (o = 0; o < config->num_output; o++) + { + xf86OutputPtr output = config->output[o]; +@@ -2028,6 +2037,60 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) + return match; + } + ++static int ++numEnabledOutputs(xf86CrtcConfigPtr config, Bool *enabled) ++{ ++ int i = 0, p; ++ ++ for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ; ++ ++ return i; ++} ++ ++static Bool ++xf86TargetRightOf(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, ++ DisplayModePtr *modes, Bool *enabled, ++ int width, int height) ++{ ++ int o; ++ int w = 0; ++ ++ if (config->num_crtc == 1) ++ return FALSE; ++ ++ if (scrn->preferClone) ++ return FALSE; ++ ++ if (numEnabledOutputs(config, enabled) < 2) ++ return FALSE; ++ ++ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { ++ DisplayModePtr mode = ++ xf86OutputHasPreferredMode(config->output[o], width, height); ++ ++ if (!mode) ++ return FALSE; ++ ++ w += mode->HDisplay; ++ } ++ ++ if (w > width) ++ return FALSE; ++ ++ w = 0; ++ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { ++ DisplayModePtr mode = ++ xf86OutputHasPreferredMode(config->output[o], width, height); ++ ++ config->output[o]->initial_x = w; ++ w += mode->HDisplay; ++ ++ modes[o] = mode; ++ } ++ ++ return TRUE; ++} ++ + static Bool + xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + DisplayModePtr *modes, Bool *enabled, +@@ -2085,13 +2148,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + * biggest mode for its aspect ratio, assuming one exists. + */ + if (!ret) do { +- int i = 0; + float aspect = 0.0; + +- /* count the number of enabled outputs */ +- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ; +- +- if (i != 1) ++ if (numEnabledOutputs(config, enabled) != 1) + break; + + p = -1; +@@ -2378,6 +2437,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + + if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); ++ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); + else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); + else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) +@@ -2394,8 +2455,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + config->output[o]->name); + else + xf86DrvMsg (scrn->scrnIndex, X_INFO, +- "Output %s using initial mode %s\n", +- config->output[o]->name, modes[o]->name); ++ "Output %s using initial mode %s +%d+%d\n", ++ config->output[o]->name, modes[o]->name, ++ config->output[o]->initial_x, ++ config->output[o]->initial_y); + } + + /* +-- +1.7.0.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch new file mode 100644 index 0000000..5206141 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch @@ -0,0 +1,36 @@ +From 18d2bd8cb513a0436739916620532247f13dbf03 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Thu, 8 Oct 2009 15:25:24 -0400 +Subject: [PATCH] randr gamma reload hack + +--- + hw/xfree86/loader/sdksyms.c | 4 ++++ + hw/xfree86/modes/xf86RandR12.c | 6 ++++++ + 2 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c +index 6ea9d26..41bac11 100644 +--- a/hw/xfree86/modes/xf86RandR12.c ++++ b/hw/xfree86/modes/xf86RandR12.c +@@ -1746,12 +1746,18 @@ xf86RandR12EnterVT (int screen_index, int flags) + { + ScreenPtr pScreen = screenInfo.screens[screen_index]; + XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); ++ rrScrPrivPtr rp = rrGetScrPriv(pScreen); + + if (randrp->orig_EnterVT) { + if (!randrp->orig_EnterVT (screen_index, flags)) + return FALSE; + } + ++ /* reload gamma */ ++ int i; ++ for (i = 0; i < rp->numCrtcs; i++) ++ xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]); ++ + return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */ + } + +-- +1.6.5.rc2 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch new file mode 100644 index 0000000..c62837e --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch @@ -0,0 +1,34 @@ +From acc64ce5be7383c09e88a23aab06ebc2403f2ca3 Mon Sep 17 00:00:00 2001 +From: Bill Nottingham <notting(a)redhat.com> +Date: Fri, 6 Nov 2009 10:32:27 +1000 +Subject: [PATCH] fix KDM gamma issue on vt switch + +--- + hw/xfree86/modes/xf86RandR12.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c +index 6ea9d26..ece12b9 100644 +--- a/hw/xfree86/modes/xf86RandR12.c ++++ b/hw/xfree86/modes/xf86RandR12.c +@@ -1761,6 +1761,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + rrScrPrivPtr rp = rrGetScrPriv(pScreen); + XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); ++ int i; + + rp->rrGetInfo = xf86RandR12GetInfo12; + rp->rrScreenSetSize = xf86RandR12ScreenSetSize; +@@ -1790,6 +1791,9 @@ xf86RandR12Init12 (ScreenPtr pScreen) + */ + if (!xf86RandR12SetInfo12 (pScreen)) + return FALSE; ++ for (i = 0; i < rp->numCrtcs; i++) { ++ xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]); ++ } + return TRUE; + } + +-- +1.6.5.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-multilib.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-multilib.patch new file mode 100644 index 0000000..6435999 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-multilib.patch @@ -0,0 +1,55 @@ +From 6d9585ba6a5784328de479c6b648d7b7d6cec64c Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Thu, 29 Oct 2009 19:04:10 -0400 +Subject: [PATCH] multilib fix for -devel subpackage + +--- + include/colormapst.h | 4 ++-- + include/xorg-server.h.in | 7 ++++--- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/include/colormapst.h b/include/colormapst.h +index f1fc8eb..274cd65 100644 +--- a/include/colormapst.h ++++ b/include/colormapst.h +@@ -103,12 +103,12 @@ typedef struct _ColormapRec + { + VisualPtr pVisual; + short class; /* PseudoColor or DirectColor */ +-#if defined(_XSERVER64) ++#ifdef __LP64__ + short pad0; + XID pad1; + #endif + XID mid; /* client's name for colormap */ +-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) ++#if defined(__LP64__) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) + XID pad2; + #endif + ScreenPtr pScreen; /* screen map is associated with */ +diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in +index 76cab16..081b8f3 100644 +--- a/include/xorg-server.h.in ++++ b/include/xorg-server.h.in +@@ -157,9 +157,6 @@ + /* Name of X server */ + #undef __XSERVERNAME__ + +-/* Define to 1 if unsigned long is 64 bits. */ +-#undef _XSERVER64 +- + /* Building vgahw module */ + #undef WITH_VGAHW + +@@ -187,4 +184,8 @@ + /* X Access Control Extension */ + #undef XACE + ++#ifdef __LP64__ ++#define _XSERVER64 1 ++#endif ++ + #endif /* _XORG_SERVER_H_ */ +-- +1.6.5.2 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch new file mode 100644 index 0000000..60c0dce --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch @@ -0,0 +1,25 @@ +From 1f315578bf759c85261b1f2295efbf0dba852f73 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <adamwill(a)shaw.ca> +Date: Thu, 25 Feb 2010 10:34:49 -0800 +Subject: [PATCH] disable vboxvideo driver in autodetect code + +--- + hw/xfree86/common/xf86AutoConfig.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index 7f4ada8..4e944ea 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -220,7 +220,7 @@ videoPtrToDriverList(struct pci_device *dev, + case 0x1011: driverList[0] = "tga"; break; + case 0x1023: driverList[0] = "trident"; break; + case 0x100c: driverList[0] = "tseng"; break; +- case 0x80ee: driverList[0] = "vboxvideo"; break; ++ case 0x80ee: driverList[0] = "vesa"; break; + case 0x15ad: driverList[0] = "vmware"; break; + case 0x18ca: + if (dev->device_id == 0x47) +-- +1.7.0 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch new file mode 100644 index 0000000..3ee8542 --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch @@ -0,0 +1,142 @@ +From b27f93c6dbe0a6e416db2c65738e996c70a403c1 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <airlied(a)redhat.com> +Date: Thu, 6 May 2010 12:55:34 +1000 +Subject: [PATCH] xf86: allow for no outputs connected at startup operation. + +When nothing is connected at startup and we canGrow, allow the server to start with a 1024x768 framebuffer, and when the drivers send hotplug events this will expand to the correct size dynamically. + +Signed-off-by: Dave Airlie <airlied(a)redhat.com> +--- + hw/xfree86/modes/xf86Crtc.c | 66 ++++++++++++++++++++++++++++++------------ + 1 files changed, 47 insertions(+), 19 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 571ffd0..99082ec 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -48,6 +48,8 @@ + + #include "xf86xv.h" + ++#define NO_OUTPUT_DEFAULT_WIDTH 1024 ++#define NO_OUTPUT_DEFAULT_HEIGHT 768 + /* + * Initialize xf86CrtcConfig structure + */ +@@ -1946,7 +1948,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) + #endif + } + +-static void ++static Bool + xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + Bool *enabled) + { +@@ -1961,8 +1963,10 @@ xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + "No outputs definitely connected, trying again...\n"); + + for (o = 0; o < config->num_output; o++) +- enabled[o] = xf86OutputEnabled(config->output[o], FALSE); ++ any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], FALSE); + } ++ ++ return any_enabled; + } + + static Bool +@@ -2409,6 +2413,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + Bool *enabled; + int width, height; + int i = scrn->scrnIndex; ++ Bool have_outputs = TRUE; ++ Bool ret; + + /* Set up the device options */ + config->options = xnfalloc (sizeof (xf86DeviceOptions)); +@@ -2433,20 +2439,26 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + modes = xnfcalloc (config->num_output, sizeof (DisplayModePtr)); + enabled = xnfcalloc (config->num_output, sizeof (Bool)); + +- xf86CollectEnabledOutputs(scrn, config, enabled); +- +- if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); +- else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); +- else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); +- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); +- else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); +- else +- xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); ++ ret = xf86CollectEnabledOutputs(scrn, config, enabled); ++ if (ret == FALSE && canGrow) { ++ xf86DrvMsg(i, X_WARNING, "Unable to find connected outputs - setting %dx%d initial framebuffer\n", ++ NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT); ++ have_outputs = FALSE; ++ } ++ else { ++ if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); ++ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); ++ else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); ++ else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); ++ else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); ++ else ++ xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); ++ } + + for (o = -1; nextEnabledOutput(config, enabled, &o); ) { + if (!modes[o]) +@@ -2479,7 +2491,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + /* + * Assign CRTCs to fit output configuration + */ +- if (!xf86PickCrtcs (scrn, crtcs, modes, 0, width, height)) ++ if (have_outputs && !xf86PickCrtcs (scrn, crtcs, modes, 0, width, height)) + { + xfree (crtcs); + xfree (modes); +@@ -2541,6 +2553,13 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + */ + xf86DefaultScreenLimits (scrn, &width, &height, canGrow); + ++ if (have_outputs == FALSE) { ++ if (width < NO_OUTPUT_DEFAULT_WIDTH && height < NO_OUTPUT_DEFAULT_HEIGHT) { ++ width = NO_OUTPUT_DEFAULT_WIDTH; ++ height = NO_OUTPUT_DEFAULT_HEIGHT; ++ } ++ } ++ + scrn->display->virtualX = width; + scrn->display->virtualY = height; + } +@@ -2566,8 +2585,17 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + width, height); + } + +- /* Mirror output modes to scrn mode list */ +- xf86SetScrnInfoModes (scrn); ++ if (have_outputs) { ++ /* Mirror output modes to scrn mode list */ ++ xf86SetScrnInfoModes (scrn); ++ } else { ++ /* Clear any existing modes from scrn->modes */ ++ while (scrn->modes != NULL) ++ xf86DeleteMode(&scrn->modes, scrn->modes); ++ scrn->modes = xf86ModesAdd(scrn->modes, ++ xf86CVTMode(width, height, 60, 0, 0)); ++ } ++ + + xfree (crtcs); + xfree (modes); +-- +1.7.0.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-randr-initial.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-randr-initial.patch new file mode 100644 index 0000000..2db8a8c --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.8-randr-initial.patch @@ -0,0 +1,35 @@ +From f22b6f8a5899f125de63738e69aaddc2dd0a5d0a Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <bskeggs(a)redhat.com> +Date: Mon, 7 Jun 2010 10:10:10 +1000 +Subject: [PATCH] randr: prevent an unnecessary screen resize with multiple displays + +crtc->{x,y} is always 0 when xf86DefaultScreenLimits() is called, so we +calculate too small an area for the initial framebuffer and force a resize +to happen. + +This commit fixes the code to use desired{X,Y} instead, which contains the +initial output positions. + +Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> +--- + hw/xfree86/modes/xf86Crtc.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 51e7b5a..c2ad7bc 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1041,8 +1041,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, + + if (crtc->enabled) + { +- crtc_width = crtc->x + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation); +- crtc_height = crtc->y + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation); ++ crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation); ++ crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation); + } + if (!canGrow) { + for (o = 0; o < config->num_output; o++) +-- +1.6.6 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8-udev-warning.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-udev-warning.patch new file mode 100644 index 0000000..93071fd --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.8-udev-warning.patch @@ -0,0 +1,37 @@ +From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Wed, 17 Feb 2010 11:12:36 +1000 +Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes. + +Signed-off-by: Fedora X Ninjas <x(a)fedoraproject.org> +--- + hw/xfree86/common/xf86Config.c | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c +index 132e8bc..b1722cd 100644 +--- a/hw/xfree86/common/xf86Config.c ++++ b/hw/xfree86/common/xf86Config.c +@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) + "input devices.\n\tIf no devices become available, " + "reconfigure %s or disable AutoAddDevices.\n", + config_backend, config_backend); ++ ++ xf86Msg(X_INFO, "\n" ++ "***************************************************************\n" ++ "***************************************************************\n" ++ "** Fedora switched to udev-based device detection with **\n" ++ "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration **\n" ++ "** stored in /etc/hal/fdi/policy will not be seen by this **\n" ++ "** server version. If you have such configuration you will **\n" ++ "** need to update it to the new format. **\n" ++ "** For more information, see the Fedora wiki page **\n" ++ "** https://fedoraproject.org/wiki/Input_device_configuration **\n" ++ "***************************************************************\n" ++ "***************************************************************\n"); + #else + xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n" + "\tTry disabling AllowEmptyInput.\n"); +-- +1.6.6.1 + diff --git a/pkgs/core/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch new file mode 100644 index 0000000..ece8a6c --- /dev/null +++ b/pkgs/core/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch @@ -0,0 +1,909 @@ +From deab888bb3bb2a56963da50ff551bd66fbd858a1 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue, 29 Jun 2010 13:49:27 +1000 +Subject: [PATCH 1/5] xkb: Mark switch case fallthrough with comment. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + xkb/xkbActions.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 4c7bce2..6a7f36d 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -625,6 +625,8 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + break; + } + xkbi->lockedPtrButtons&= ~(1<<button); ++ ++ /* fallthrough */ + case XkbSA_PtrBtn: + XkbDDXFakeDeviceButton(xkbi->device, 0, button); + break; +-- +1.7.1 + +From 50b6311dbd2594acc36d6856fdde8623459f1374 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue, 29 Jun 2010 12:12:53 +1000 +Subject: [PATCH 2/5] xkb: merge lockedPtrButtons state from all attached SDs. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem: +lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button +press. Unconditionally clearing the bits may cause stuck buttons in this +sequence of events: + +1. type Shift + NumLock to enable PointerKeys +2. type 0/Ins on keypad to emulate Button 1 press + → button1 press event to client +3. press and release button 1 on physical mouse + → button1 release event to client + +Button 1 on the MD is now stuck and cannot be released. + +Cause: +XKB PointerKeys button events are posted through the XTEST pointer device. +Once a press is generated, the XTEST device's button is down. The DIX merges +the button state of all attached SDs, hence the MD will have a button down +while the XTEST device has a button down. + +PointerKey button events are only generated on the master device to avoid +duplicate events (see XkbFakeDeviceButton()). If the MD has the +lockedPtrButtons bit cleared by a release event on a physical device, no +such event is generated when a keyboard device triggers the PointerKey +ButtonRelease trigger. Since the event - if generated - is posted through +the XTEST pointer device, lack of a generated ButtonRelease event on the +XTEST pointer device means the button is never released, resulting in the +stuck button observed above. + +Solution: +This patch merges the MD's lockedPtrButtons with the one of all attached +slave devices on release events. Thus, as long as one attached keyboard has +a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey +button is released on all keyboards, the matching release event is emulated +from the MD through the XTEST pointer device, thus also releasing the button +in the DIX. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + include/xkbsrv.h | 3 +++ + xkb/xkbAccessX.c | 18 +++++++++++++++++- + xkb/xkbActions.c | 8 ++++++++ + xkb/xkbUtils.c | 26 ++++++++++++++++++++++++++ + 4 files changed, 54 insertions(+), 1 deletions(-) + +diff --git a/include/xkbsrv.h b/include/xkbsrv.h +index c0cd501..f0db0e4 100644 +--- a/include/xkbsrv.h ++++ b/include/xkbsrv.h +@@ -933,6 +933,9 @@ extern int XkbGetEffectiveGroup( + XkbStatePtr /* xkbstate */, + CARD8 /* keycode */); + ++extern void XkbMergeLockedPtrBtns( ++ DeviceIntPtr /* master */); ++ + #include "xkbfile.h" + #include "xkbrules.h" + +diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c +index be1dcee..e3fdc06 100644 +--- a/xkb/xkbAccessX.c ++++ b/xkb/xkbAccessX.c +@@ -707,8 +707,24 @@ DeviceEvent *event = &ev->device_event; + changed |= XkbPointerButtonMask; + } + else if (event->type == ET_ButtonRelease) { +- if (xkbi) ++ if (xkbi) { + xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7)); ++ ++ /* Merge this MD's lockedPtrButtons with the one of all ++ * attached slave devices. ++ * The DIX uses a merged button state for MDs, not ++ * releasing buttons until the last SD has released ++ * thenm. If we unconditionally clear the ++ * lockedPtrButtons bit on the MD, a PointerKeys button ++ * release on the SD keyboard won't generate the required fake button ++ * event on the XTEST pointer, thus never processing the ++ * button event in the DIX and the XTEST pointer's ++ * buttons stay down - result is a stuck button. ++ */ ++ if (IsMaster(dev)) ++ XkbMergeLockedPtrBtns(dev); ++ } ++ + changed |= XkbPointerButtonMask; + } + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 6a7f36d..ab52b6a 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -626,6 +626,14 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + } + xkbi->lockedPtrButtons&= ~(1<<button); + ++ if (IsMaster(xkbi->device)) ++ { ++ XkbMergeLockedPtrBtns(xkbi->device); ++ /* One SD still has lock set, don't post event */ ++ if ((xkbi->lockedPtrButtons & (1 << button)) != 0) ++ break; ++ } ++ + /* fallthrough */ + case XkbSA_PtrBtn: + XkbDDXFakeDeviceButton(xkbi->device, 0, button); +diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c +index b1e0e55..d7d1935 100644 +--- a/xkb/xkbUtils.c ++++ b/xkb/xkbUtils.c +@@ -2190,3 +2190,29 @@ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode) + + return effectiveGroup; + } ++ ++/* Merge the lockedPtrButtons from all attached SDs for the given master ++ * device into the MD's state. ++ */ ++void ++XkbMergeLockedPtrBtns(DeviceIntPtr master) ++{ ++ DeviceIntPtr d = inputInfo.devices; ++ XkbSrvInfoPtr xkbi = NULL; ++ ++ if (!IsMaster(master)) ++ return; ++ ++ if (!master->key) ++ return; ++ ++ xkbi = master->key->xkbInfo; ++ xkbi->lockedPtrButtons = 0; ++ ++ for (; d; d = d->next) { ++ if (IsMaster(d) || GetMaster(d, MASTER_KEYBOARD) != master || !d->key) ++ continue; ++ ++ xkbi->lockedPtrButtons |= d->key->xkbInfo->lockedPtrButtons; ++ } ++} +-- +1.7.1 + +From 4a4224f5d786035af88c251a9ee177217e8f77fd Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed, 14 Apr 2010 10:54:29 +1000 +Subject: [PATCH 3/5] xkb: rename XkbFakeDeviceButton and XkbFakeDeviceMotion, move into xkbActions.c + +The name XkbDDXFakeDeviceButton and XkbDDXFakeDeviceMotion is somewhat +misleading, there's no DDX involved in the game at all anymore. + +This removes XkbFakeDeviceMotion and XkbFakeDeviceButton from the API where +it arguably shouldn't have been in the first place. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +Reviewed-by: Daniel Stone <daniel(a)fooishbar.org> +Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> +--- + include/xkbsrv.h | 13 ------- + xkb/Makefile.am | 4 +-- + xkb/ddxDevBtn.c | 69 -------------------------------------- + xkb/ddxFakeMtn.c | 64 ----------------------------------- + xkb/xkbActions.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 85 insertions(+), 162 deletions(-) + delete mode 100644 xkb/ddxDevBtn.c + delete mode 100644 xkb/ddxFakeMtn.c + +diff --git a/include/xkbsrv.h b/include/xkbsrv.h +index f0db0e4..d1cbd1a 100644 +--- a/include/xkbsrv.h ++++ b/include/xkbsrv.h +@@ -768,19 +768,6 @@ extern _X_EXPORT void XkbDDXUpdateDeviceIndicators( + CARD32 /* newState */ + ); + +-extern _X_EXPORT void XkbDDXFakePointerMotion( +- DeviceIntPtr /* dev */, +- unsigned int /* flags */, +- int /* x */, +- int /* y */ +-); +- +-extern _X_EXPORT void XkbDDXFakeDeviceButton( +- DeviceIntPtr /* dev */, +- Bool /* press */, +- int /* button */ +-); +- + extern _X_EXPORT int XkbDDXTerminateServer( + DeviceIntPtr /* dev */, + KeyCode /* key */, +diff --git a/xkb/Makefile.am b/xkb/Makefile.am +index e54ce59..fb3ccbf 100644 +--- a/xkb/Makefile.am ++++ b/xkb/Makefile.am +@@ -5,11 +5,9 @@ AM_CFLAGS = $(DIX_CFLAGS) + DDX_SRCS = \ + ddxBeep.c \ + ddxCtrls.c \ +- ddxFakeMtn.c \ + ddxLEDs.c \ + ddxLoad.c \ +- ddxList.c \ +- ddxDevBtn.c ++ ddxList.c + + DIX_SRCS = \ + xkb.c \ +diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c +deleted file mode 100644 +index b8a1255..0000000 +--- a/xkb/ddxDevBtn.c ++++ /dev/null +@@ -1,69 +0,0 @@ +-/************************************************************ +-Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. +- +-Permission to use, copy, modify, and distribute this +-software and its documentation for any purpose and without +-fee is hereby granted, provided that the above copyright +-notice appear in all copies and that both that copyright +-notice and this permission notice appear in supporting +-documentation, and that the name of Silicon Graphics not be +-used in advertising or publicity pertaining to distribution +-of the software without specific prior written permission. +-Silicon Graphics makes no representation about the suitability +-of this software for any purpose. It is provided "as is" +-without any express or implied warranty. +- +-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON +-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +-THE USE OR PERFORMANCE OF THIS SOFTWARE. +- +-********************************************************/ +- +-#ifdef HAVE_DIX_CONFIG_H +-#include <dix-config.h> +-#endif +- +-#include "inputstr.h" +-#include <xkbsrv.h> +-#include "mi.h" +- +-void +-XkbDDXFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) +-{ +- EventListPtr events; +- int nevents, i; +- DeviceIntPtr ptr; +- +- /* If dev is a slave device, and the SD is attached, do nothing. If we'd +- * post through the attached master pointer we'd get duplicate events. +- * +- * if dev is a master keyboard, post through the XTEST device +- * +- * if dev is a floating slave, post through the device itself. +- */ +- +- if (IsMaster(dev)) +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); +- else if (!dev->u.master) +- ptr = dev; +- else +- return; +- +- events = InitEventList(GetMaximumEventsNum()); +- OsBlockSignals(); +- nevents = GetPointerEvents(events, ptr, +- press ? ButtonPress : ButtonRelease, button, +- 0 /* flags */, 0 /* first */, +- 0 /* num_val */, NULL); +- OsReleaseSignals(); +- +- for (i = 0; i < nevents; i++) +- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); +- +- FreeEventList(events, GetMaximumEventsNum()); +-} +diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c +deleted file mode 100644 +index b383716..0000000 +--- a/xkb/ddxFakeMtn.c ++++ /dev/null +@@ -1,64 +0,0 @@ +-/************************************************************ +-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. +- +-Permission to use, copy, modify, and distribute this +-software and its documentation for any purpose and without +-fee is hereby granted, provided that the above copyright +-notice appear in all copies and that both that copyright +-notice and this permission notice appear in supporting +-documentation, and that the name of Silicon Graphics not be +-used in advertising or publicity pertaining to distribution +-of the software without specific prior written permission. +-Silicon Graphics makes no representation about the suitability +-of this software for any purpose. It is provided "as is" +-without any express or implied warranty. +- +-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON +-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +-THE USE OR PERFORMANCE OF THIS SOFTWARE. +- +-********************************************************/ +- +-#ifdef HAVE_DIX_CONFIG_H +-#include <dix-config.h> +-#endif +- +-#include "inputstr.h" +-#include <xkbsrv.h> +-#include "mi.h" +- +-void +-XkbDDXFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) +-{ +- EventListPtr events; +- int nevents, i; +- DeviceIntPtr ptr; +- int gpe_flags = 0; +- +- if (!dev->u.master) +- ptr = dev; +- else +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); +- +- if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) +- gpe_flags = POINTER_ABSOLUTE; +- else +- gpe_flags = POINTER_RELATIVE; +- +- events = InitEventList(GetMaximumEventsNum()); +- OsBlockSignals(); +- nevents = GetPointerEvents(events, ptr, +- MotionNotify, 0, +- gpe_flags, 0, 2, (int[]){x, y}); +- OsReleaseSignals(); +- +- for (i = 0; i < nevents; i++) +- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); +- +- FreeEventList(events, GetMaximumEventsNum()); +-} +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index ab52b6a..2817e39 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -40,11 +40,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. + #include <xkbsrv.h> + #include "xkb.h" + #include <ctype.h> ++#include "mi.h" + #define EXTENSION_EVENT_BASE 64 + + static int xkbDevicePrivateKeyIndex; + DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; + ++static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); ++static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y); ++ + void + xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, + pointer data) +@@ -479,7 +483,7 @@ int dx,dy; + dx= xkbi->mouseKeysDX; + dy= xkbi->mouseKeysDY; + } +- XkbDDXFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy); ++ XkbFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy); + return xkbi->desc->ctrls->mk_interval; + } + +@@ -507,7 +511,7 @@ Bool accel; + accel= ((pAction->ptr.flags&XkbSA_NoAcceleration)==0); + x= XkbPtrActionX(&pAction->ptr); + y= XkbPtrActionY(&pAction->ptr); +- XkbDDXFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y); ++ XkbFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y); + AccessXCancelRepeatKey(xkbi,keycode); + xkbi->mouseKeysAccel= accel&& + (xkbi->desc->ctrls->enabled_ctrls&XkbMouseKeysAccelMask); +@@ -554,7 +558,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + ((pAction->btn.flags&XkbSA_LockNoLock)==0)) { + xkbi->lockedPtrButtons|= (1<<button); + AccessXCancelRepeatKey(xkbi,keycode); +- XkbDDXFakeDeviceButton(xkbi->device, 1, button); ++ XkbFakeDeviceButton(xkbi->device, 1, button); + filter->upAction.type= XkbSA_NoAction; + } + break; +@@ -565,12 +569,12 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + if (pAction->btn.count>0) { + nClicks= pAction->btn.count; + for (i=0;i<nClicks;i++) { +- XkbDDXFakeDeviceButton(xkbi->device, 1, button); +- XkbDDXFakeDeviceButton(xkbi->device, 0, button); ++ XkbFakeDeviceButton(xkbi->device, 1, button); ++ XkbFakeDeviceButton(xkbi->device, 0, button); + } + filter->upAction.type= XkbSA_NoAction; + } +- else XkbDDXFakeDeviceButton(xkbi->device, 1, button); ++ else XkbFakeDeviceButton(xkbi->device, 1, button); + } + break; + case XkbSA_SetPtrDflt: +@@ -636,7 +640,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + + /* fallthrough */ + case XkbSA_PtrBtn: +- XkbDDXFakeDeviceButton(xkbi->device, 0, button); ++ XkbFakeDeviceButton(xkbi->device, 0, button); + break; + } + filter->active = 0; +@@ -974,7 +978,7 @@ int button; + if ((pAction->devbtn.flags&XkbSA_LockNoLock)|| + BitIsOn(dev->button->down, button)) + return 0; +- XkbDDXFakeDeviceButton(dev,TRUE,button); ++ XkbFakeDeviceButton(dev,TRUE,button); + filter->upAction.type= XkbSA_NoAction; + break; + case XkbSA_DeviceBtn: +@@ -982,12 +986,12 @@ int button; + int nClicks,i; + nClicks= pAction->btn.count; + for (i=0;i<nClicks;i++) { +- XkbDDXFakeDeviceButton(dev,TRUE,button); +- XkbDDXFakeDeviceButton(dev,FALSE,button); ++ XkbFakeDeviceButton(dev,TRUE,button); ++ XkbFakeDeviceButton(dev,FALSE,button); + } + filter->upAction.type= XkbSA_NoAction; + } +- else XkbDDXFakeDeviceButton(dev,TRUE,button); ++ else XkbFakeDeviceButton(dev,TRUE,button); + break; + } + } +@@ -1006,10 +1010,10 @@ int button; + if ((filter->upAction.devbtn.flags&XkbSA_LockNoUnlock)|| + !BitIsOn(dev->button->down, button)) + return 0; +- XkbDDXFakeDeviceButton(dev,FALSE,button); ++ XkbFakeDeviceButton(dev,FALSE,button); + break; + case XkbSA_DeviceBtn: +- XkbDDXFakeDeviceButton(dev,FALSE,button); ++ XkbFakeDeviceButton(dev,FALSE,button); + break; + } + filter->active = 0; +@@ -1326,3 +1330,70 @@ xkbStateNotify sn; + return; + } + ++static void ++XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) ++{ ++ EventListPtr events; ++ int nevents, i; ++ DeviceIntPtr ptr; ++ int gpe_flags = 0; ++ ++ if (!dev->u.master) ++ ptr = dev; ++ else ++ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ ++ if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) ++ gpe_flags = POINTER_ABSOLUTE; ++ else ++ gpe_flags = POINTER_RELATIVE; ++ ++ events = InitEventList(GetMaximumEventsNum()); ++ OsBlockSignals(); ++ nevents = GetPointerEvents(events, ptr, ++ MotionNotify, 0, ++ gpe_flags, 0, 2, (int[]){x, y}); ++ OsReleaseSignals(); ++ ++ for (i = 0; i < nevents; i++) ++ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); ++ ++ FreeEventList(events, GetMaximumEventsNum()); ++} ++ ++static void ++XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) ++{ ++ EventListPtr events; ++ int nevents, i; ++ DeviceIntPtr ptr; ++ ++ /* If dev is a slave device, and the SD is attached, do nothing. If we'd ++ * post through the attached master pointer we'd get duplicate events. ++ * ++ * if dev is a master keyboard, post through the XTEST device ++ * ++ * if dev is a floating slave, post through the device itself. ++ */ ++ ++ if (IsMaster(dev)) ++ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ else if (!dev->u.master) ++ ptr = dev; ++ else ++ return; ++ ++ events = InitEventList(GetMaximumEventsNum()); ++ OsBlockSignals(); ++ nevents = GetPointerEvents(events, ptr, ++ press ? ButtonPress : ButtonRelease, button, ++ 0 /* flags */, 0 /* first */, ++ 0 /* num_val */, NULL); ++ OsReleaseSignals(); ++ ++ ++ for (i = 0; i < nevents; i++) ++ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); ++ ++ FreeEventList(events, GetMaximumEventsNum()); ++} +-- +1.7.1 + +From dcb46252f959893f1934232698e2ae26390a8a5b Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue, 29 Jun 2010 15:24:51 +1000 +Subject: [PATCH 4/5] xkb: emulate PointerKeys events only on the master device. + +This patch replicates the behaviour for button events. Only generate a +PointerKeys motion event on the master device, not on the slave device. +Fixes the current issue of PointerKey motion events generating key events as +well. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + xkb/xkbActions.c | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 2817e39..391c375 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -496,9 +496,6 @@ _XkbFilterPointerMove( XkbSrvInfoPtr xkbi, + int x,y; + Bool accel; + +- if (xkbi->device == inputInfo.keyboard) +- return 0; +- + if (filter->keycode==0) { /* initial press */ + filter->keycode = keycode; + filter->active = 1; +@@ -1338,10 +1335,12 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) + DeviceIntPtr ptr; + int gpe_flags = 0; + +- if (!dev->u.master) ++ if (IsMaster(dev)) ++ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ else if (!dev->u.master) + ptr = dev; + else +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ return; + + if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) + gpe_flags = POINTER_ABSOLUTE; +-- +1.7.1 + +From 40941fb2e9ae763add7b74850e8a0471ac754db6 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu, 1 Jul 2010 12:44:57 +1000 +Subject: [PATCH 5/5] xkb: release XTEST pointer buttons on physical releases. (#28808) + +If a button release event is posted for the MD pointer, post a release event +through the matching XTEST device. This way, a client who posts a button +press through the XTEST extension cannot inadvertedly lock the button. + +This behaviour is required for historical reasons, until server 1.7 the core +pointer would release a button press on physical events, regardless of the +XTEST state. Clients seem to rely on this behaviour, causing seemingly stuck +grabs. + +The merged behaviour is kept for multiple keyboard PointerKey events, if two +physical keyboards hold the button down as a result of PointerKey actions, +the button is not released until the last keyboard releases the button. + +X.Org Bug 28808 <http://bugs.freedesktop.org/show_bug.cgi?id=28808> + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + include/xkbsrv.h | 6 ++++++ + xkb/xkbAccessX.c | 23 ++++++++++------------- + xkb/xkbActions.c | 4 ++-- + 3 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/include/xkbsrv.h b/include/xkbsrv.h +index d1cbd1a..a96ca56 100644 +--- a/include/xkbsrv.h ++++ b/include/xkbsrv.h +@@ -923,6 +923,12 @@ extern int XkbGetEffectiveGroup( + extern void XkbMergeLockedPtrBtns( + DeviceIntPtr /* master */); + ++extern void XkbFakeDeviceButton( ++ DeviceIntPtr /* dev */, ++ int /* press */, ++ int /* button */); ++ ++ + #include "xkbfile.h" + #include "xkbrules.h" + +diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c +index e3fdc06..d3f9652 100644 +--- a/xkb/xkbAccessX.c ++++ b/xkb/xkbAccessX.c +@@ -710,19 +710,16 @@ DeviceEvent *event = &ev->device_event; + if (xkbi) { + xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7)); + +- /* Merge this MD's lockedPtrButtons with the one of all +- * attached slave devices. +- * The DIX uses a merged button state for MDs, not +- * releasing buttons until the last SD has released +- * thenm. If we unconditionally clear the +- * lockedPtrButtons bit on the MD, a PointerKeys button +- * release on the SD keyboard won't generate the required fake button +- * event on the XTEST pointer, thus never processing the +- * button event in the DIX and the XTEST pointer's +- * buttons stay down - result is a stuck button. +- */ +- if (IsMaster(dev)) +- XkbMergeLockedPtrBtns(dev); ++ if (IsMaster(dev)) ++ { ++ DeviceIntPtr source; ++ int rc; ++ rc = dixLookupDevice(&source, event->sourceid, serverClient, DixWriteAccess); ++ if (rc != Success) ++ ErrorF("[xkb] bad sourceid '%d' on button release event.\n", event->sourceid); ++ else if (!IsXTestDevice(source, GetMaster(dev, MASTER_POINTER))) ++ XkbFakeDeviceButton(dev, FALSE, event->detail.key); ++ } + } + + changed |= XkbPointerButtonMask; +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 391c375..5d40199 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -46,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. + static int xkbDevicePrivateKeyIndex; + DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; + +-static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); ++void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); + static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y); + + void +@@ -1360,7 +1360,7 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) + FreeEventList(events, GetMaximumEventsNum()); + } + +-static void ++void + XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) + { + EventListPtr events; +-- +1.7.1 + +From 7273832bcdc6f43e9a5a8fdbb56844466efb710a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri, 23 Jul 2010 11:46:30 +1000 +Subject: [PATCH 1/3] xkb: post-fix PointerKeys button events with a DeviceChangedEvent. + +commit 14327858391ebe929b806efb53ad79e789361883 + xkb: release XTEST pointer buttons on physical releases. (#28808) +revealed a bug with the XTEST/PointerKeys interaction. + +Events resulting from PointerKeys are injected into the event processing +stream, not appended to the event queue. The events generated for the fake +button press include a DeviceChangedEvent (DCE), a raw button event and the +button event itself. The DCE causes the master to switch classes to the +attached XTEST pointer device. + +Once the fake button is processed, normal event processing continues with +events in the EQ. The master still contains the XTEST classes, causing some +events to be dropped if e.g. the number of valuators of the event in the +queue exceeds the XTEST device's number of valuators. + +Example: the EQ contains the following events, processed one-by-one, left to +right. + +[DCE (dev)][Btn down][Btn up][Motion][Motion][...] + ^ XkbFakeDeviceButton injects [DCE (XTEST)][Btn up] + +Thus the event sequence processed looks like this: + +[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][Motion][Motion][...] + +The first DCE causes the master to switch to the device. The button up event +injects a DCE to the XTEST device, causing the following Motion events to be +processed with the master still being on XTEST classes. + +This patch post-fixes the injected event sequence with a DCE to restore the +classes of the original slave device, resulting in an event sequence like +this: +[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][DCE (dev)][Motion][Motion] + +Note that this is a simplified description. The event sequence injected by +the PointerKeys code is injected for the master device only and the matching +slave device that caused the injection has already finished processing on +the slave. Furthermore, the injection happens as part of the the XKB layer, +before the unwrapping of the processInputProc takes us into the DIX where +the DCE is actually handled. + +Bug reproducible with a device that reports more than 2 valuators. Simply +cause button releases on the device and wait for a "too many valuators" +warning message. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + xkb/xkbActions.c | 26 +++++++++++++++++++------- + 1 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 5d40199..2afd46d 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -1365,34 +1365,46 @@ XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) + { + EventListPtr events; + int nevents, i; +- DeviceIntPtr ptr; ++ DeviceIntPtr ptr, mpointer, lastSlave; + + /* If dev is a slave device, and the SD is attached, do nothing. If we'd + * post through the attached master pointer we'd get duplicate events. + * + * if dev is a master keyboard, post through the XTEST device +- * + * if dev is a floating slave, post through the device itself. ++ * ++ * The event is injected into the event processing, not the EQ. Thus, ++ * ensure that we restore the master after the event sequence to the ++ * original set of classes. Otherwise, the master remains on the XTEST ++ * classes and drops events that don't fit into the XTEST layout (e.g. ++ * events with more than 2 valuators). ++ * To do so, we remember the lastSlave that posted through the master ++ * and add a DeviceChangedEvent to the end of the list. + */ + +- if (IsMaster(dev)) +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); +- else if (!dev->u.master) ++ if (IsMaster(dev)) { ++ mpointer = GetMaster(dev, MASTER_POINTER); ++ lastSlave = mpointer->u.lastSlave; ++ ptr = GetXTestDevice(mpointer); ++ } else if (!dev->u.master) + ptr = dev; + else + return; + +- events = InitEventList(GetMaximumEventsNum()); ++ events = InitEventList(GetMaximumEventsNum() + 1); + OsBlockSignals(); + nevents = GetPointerEvents(events, ptr, + press ? ButtonPress : ButtonRelease, button, + 0 /* flags */, 0 /* first */, + 0 /* num_val */, NULL); ++ if (IsMaster(dev) && (lastSlave && lastSlave != ptr)) ++ CreateClassesChangedEvent(&events[nevents++], mpointer, ++ lastSlave, DEVCHANGE_POINTER_EVENT); + OsReleaseSignals(); + + + for (i = 0; i < nevents; i++) + mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); + +- FreeEventList(events, GetMaximumEventsNum()); ++ FreeEventList(events, GetMaximumEventsNum() + 1); + } +-- +1.7.2 + +From 817e031a996a5f5aa16fc789d7e570cc589d96cb Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed, 28 Jul 2010 14:24:59 +1000 +Subject: [PATCH 3/3] Xi: reset the unused classes pointer after copying + +After copying the unused_classes into the device, reset the original +pointer. Otherwise we have two pointers pointing to the same field and both +get freed on device removal. + +Some classes already have this behaviour since 51c8fd69. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + Xi/exevents.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index 566b0ef..a6160dd 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -227,6 +227,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->intfeed = classes->intfeed; ++ classes->intfeed = NULL; + } + + i = &to->intfeed; +@@ -263,6 +264,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->stringfeed = classes->stringfeed; ++ classes->stringfeed = NULL; + } + + s = &to->stringfeed; +@@ -299,6 +301,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->bell = classes->bell; ++ classes->bell = NULL; + } + + b = &to->bell; +@@ -336,6 +339,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->leds = classes->leds; ++ classes->leds = NULL; + } + + l = &to->leds; +@@ -387,6 +391,7 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to) + to->kbdfeed = classes->kbdfeed; + if (!to->kbdfeed) + InitKeyboardDeviceStruct(to, NULL, NULL, NULL); ++ classes->kbdfeed = NULL; + } + + k = &to->kbdfeed; +@@ -517,6 +522,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->ptrfeed = classes->ptrfeed; ++ classes->ptrfeed = NULL; + } + + p = &to->ptrfeed; +-- +1.7.2 + diff --git a/pkgs/core/xorg-x11-server/xorg-x11-server.nm b/pkgs/core/xorg-x11-server/xorg-x11-server.nm new file mode 100644 index 0000000..7b1236a --- /dev/null +++ b/pkgs/core/xorg-x11-server/xorg-x11-server.nm @@ -0,0 +1,110 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-server +PKG_VER = 1.8.2 +PKG_REL = 0 + +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> +PKG_GROUP = X/Server +PKG_URL = http://www.x.org +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 X server. + +PKG_PACKAGES += $(PKG_NAME_REAL)-devel + +PKG_BUILD_DEPS+= autoconf automake pkg-config xorg-x11-font-utils \ + xorg-x11-util-macros xorg-x11-proto-devel \ + xorg-x11-xtrans-devel +PKG_DEPS += libX11 libXau libXfont libpciaccess libxcb libxkbfile pixman udev + +define PKG_DESCRIPTION + X.org X11 is an open source implementation of the X Window System. \ + It provides the basic low level functionality which full fledged \ + graphical user interfaces (GUIs) such as GNOME and KDE are designed \ + upon. +endef + +PKG_TARBALL = xorg-server-$(PKG_VER).tar.bz2 + +CFLAGS += -Wstrict-overflow -rdynamic + +DIR_APP = $(DIR_SRC)/xorg-server-$(PKG_VER) + +CONFIGURE_OPTIONS += \ + --enable-xvfb \ + --disable-xnest \ + --enable-kdrive \ + --disable-xephyr \ + --disable-xsdl \ + --disable-xfake \ + --disable-xfbdev \ + --enable-xorg \ + --disable-static \ + --with-pic \ + --with-int10=x86emu \ + --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ + --with-module-dir=/usr/lib/xorg/modules \ + --with-builderstring="Build ID: $(PKG_NAME) $(PKG_VER)-$(PKG_REL)" \ + --with-os-name="$(hostname -s) $(uname -r)" \ + -with-vendor-name="$(DISTRO_NAME) Project" \ + --with-xkb-output=/var/lib/xkb \ + --enable-install-libxf86config \ + --localstatedir=/var \ + --disable-aiglx \ + --disable-composite \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --disable-glx \ + --disable-screensaver \ + --disable-dri \ + --disable-dri2 \ + --disable-xinerama \ + --disable-dbe \ + --disable-config-dbus \ + --disable-config-hal \ + --disable-xquartz \ + --enable-config-udev \ + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && autoreconf -vfi +endef + +define STAGE_INSTALL + cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \ + moduledir=/usr/lib/xorg/modules + + rm -vf $(BUILDROOT)/usr/lib/xorg/modules/libxf8_16bpp.so + rm -vrf $(BUILDROOT)/var/log + + -mkdir -pv $(BUILDROOT)/etc/X11/xorg.conf.d $(BUILDROOT)/usr/share/xorg + cd $(DIR_APP) && install -m 0444 hw/xfree86/common/{vesa,extra}modes \ + $(BUILDROOT)/usr/share/xorg/ + cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/10-quirks.conf \ + $(BUILDROOT)/usr/share/X11/xorg.conf.d + cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/xorg.conf \ + $(BUILDROOT)/etc/X11/ +endef diff --git a/pkgs/core/xorg-x11-server/xorg.conf b/pkgs/core/xorg-x11-server/xorg.conf new file mode 100644 index 0000000..684cf4a --- /dev/null +++ b/pkgs/core/xorg-x11-server/xorg.conf @@ -0,0 +1,26 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +Section "Module" + Load "int10" + Load "vbe" + Load "fb" + Load "shadow" +EndSection diff --git a/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm b/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm index b966d5d..92cfbe8 100644 --- a/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm +++ b/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-util-macros PKG_VER = 1.10.0 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm index ac3e279..f61ab22 100644 --- a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm +++ b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-x11-xkb-utils PKG_VER = 7.4 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Fonts PKG_URL = http://www.x.org/ PKG_LICENSE = MIT diff --git a/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm index ad6df5e..c549b10 100644 --- a/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm +++ b/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm @@ -28,7 +28,7 @@ PKG_NAME = xorg-xtrans PKG_VER = 1.2.5 PKG_REL = 0 -PKG_MAINTAINER = +PKG_MAINTAINER = Stefan Schantl <stefan.schantl(a)ipfire.org> PKG_GROUP = X/Libraries PKG_URL = http://www.x.org/ PKG_LICENSE = MIT hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 9eec6c0b5945014b2eb047b255efa443c83ec4ac
by git＠ipfire.org 27 Aug '10

27 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 9eec6c0b5945014b2eb047b255efa443c83ec4ac (commit) via 2570b68b68e1c283d729278fdcc8ea6c62a2d233 (commit) via b299932265ac0fb559042946a8ecd7641990cbc9 (commit) via 8052ad2d56d08151edd052aaf5b63e3e926cb30b (commit) via f8b5b19fdf2b452117830da95ae5296262935da2 (commit) via 391deb320c1452edd166262ee16017920a9229c1 (commit) via c790c2393c4b8f3f6029fde19806e4d7429efe2e (commit) via 9dac8e4cfbb59f58069be7dd138ffbefc585c04a (commit) via e86c7a1b0c337f9a41e729b2d8b797cbb708c12f (commit) via aebdc8eef93f8b25d4f60e55e7c73d124a587b5d (commit) via 86dabf4c5eb067d1077f2655b9af05064e51a971 (commit) via 59486d276eefc71ebf8296c48659f1e092ea23ba (commit) via 54ec5af9c823aefa0b3a51cad8df0a242a3bd761 (commit) via 754c4b46cb59c6a9ff6c1a0f9e3f91bc00d057db (commit) via fe1cf40d59d760144014e89fb8471adbb2bcf4e2 (commit) via af3b31038717dc06600bec676a2e2d56c2aafed9 (commit) via 13924a8c9776061704e54ea0045afc4f6112e245 (commit) via afbcc4510faaaee923661ef75d6605bc95bbb5c9 (commit) via bcf07c570eeb9a699e6ed8cebf4315e9c2eca7a1 (commit) via bfa29a546c56dd8244d15d8509fde1d4e6c638eb (commit) via bd6a900972d15aef261845f774e76743de75ed59 (commit) via f520c16fac05797ec62f1028f5cf1a4182372dda (commit) via 4d14a81572a323495707daa9effdf67a723f4a2a (commit) via 313ed234cf970a25a8100907ea005124a500de90 (commit) via 8aa453e5aa85893aef534674b687e24b0de53820 (commit) via f920b4a46f552dd8977b587e4d9e2e28dd595a27 (commit) via c4d0cbf5e073d3eb2a091e8558c08baa3212847e (commit) via 1c304fe7582f2695f9a25e03399a3622928e99f1 (commit) via a4295f5f2962b92e7c05ab860f8e627c354391c8 (commit) via 83931ab17e224664683c0461067d79d128f936d8 (commit) via 6bd477eb1eec5dca3f614b0eade89523578a9aff (commit) via 0fc54015d965aec382a81754aebd7727e4717efc (commit) via 078dbf1538ae24c579b881abe49bc9a3a4e63123 (commit) via d908a7f4cfbc78c153b793cd00a9ddc363729467 (commit) via 5c1a6923647f1ad69458a1388b9fcb0f9c476a5c (commit) via 53ea7db4c1d52d57f8e4177b9b5e128c223eba40 (commit) via c9791ec8a270e6d27f6c07c143511f8ad58bb413 (commit) via 0badf05e9c340837f3bb9e74bb202d2092e13575 (commit) via 6d52de1dae3e8969158883dadd9fad9b5e52edda (commit) via 49038d37a192375f7b0598d3254145d8f026c227 (commit) via cfcd4861e0a6f00efb3596b6fb9ad764f154afb3 (commit) via 4766c629422d451681454d65575784ff9304b3f0 (commit) via ac4c88bcf8438dba7f0414ab73251a915fbfa9a5 (commit) via b9d743be165cf44bd0db198119f79fadc5221f08 (commit) via e67c459f67c6de7882edf7a0ef20898a889e003d (commit) via f74310269475c262c088e0bee4260c3069bedc96 (commit) via 07271d699c132b41364042befa2088ce63430c99 (commit) via 18fc9c8355d185210211e367788cd8b777f073c6 (commit) via f76f0aad1c18f1709612febf5a6be9be950f8fc2 (commit) via 0d83286c4a9cdc9bd0d219418130d3c8acb51a5e (commit) via aeefad9a9afd9b24af72f0d00f06157d0b789e1d (commit) via cc8e235c47dc6b3031537277dac1fbac6ecc27c4 (commit) via 5ab9429af59598d73e1d42c16032390d1d70d9c5 (commit) via 037ed48165cda18474b8b6ccdf7b6a9caf02b2dc (commit) via 215545b28a49ec694af1cc99f7d1fc11de9c5967 (commit) via 22ddaa87a1ebee150de2483c1d06740496ac8a38 (commit) via c2c6eb30068ac7c0532680d4b72433cdc63d712c (commit) via 4f3b700cae05c55df4be3738ddeb84e17e6e1885 (commit) via a953e76285a7bd6bab443eee6e5990677c7edbe7 (commit) via 22172558c03ed3c9bdf12d272517094d5d66ab6d (commit) via fcf9267dfd94f142a139166ff7e39935f556f64d (commit) via c82e34f795b4e782cecc961a3a6f05b5e414fa49 (commit) via 1fdf08573a8b16d8bdcbcb9e57467bd59d0c8487 (commit) via 11d98ea796a7c01e7c642dc9e16aec3679dd1582 (commit) via ab3a2b53f103f345dfa8ce57a6a9a8a2b307058f (commit) via 650e5849ce1d9db2122ae04a7e483e8ffe680a42 (commit) via c061aa4f1abfe15601ad124f6a0d73918c801b84 (commit) via 4624e8815e1ea9cd72c662bb59803a63363f6db1 (commit) via b4ff4a2d6d6398b8181c07986bbdb7e3adb3e83d (commit) from 191e8b049e33fc529ca87ddd7dd118a4a06a867a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9eec6c0b5945014b2eb047b255efa443c83ec4ac Merge: 2570b68 e86c7a1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 27 15:54:19 2010 +0200 Merge commit 'stevee/x-fixes' commit 2570b68b68e1c283d729278fdcc8ea6c62a2d233 Merge: b299932 aebdc8e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 27 15:54:13 2010 +0200 Merge commit 'stevee/x-server' commit b299932265ac0fb559042946a8ecd7641990cbc9 Merge: 86dabf4 8052ad2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Aug 27 14:33:27 2010 +0200 Merge commit 'stevee/updates' into next commit 8052ad2d56d08151edd052aaf5b63e3e926cb30b Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 11:11:04 2010 +0200 gnupg2: Update to 2.0.16. commit f8b5b19fdf2b452117830da95ae5296262935da2 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 11:10:18 2010 +0200 libksba: Update to 1.0.8. commit 391deb320c1452edd166262ee16017920a9229c1 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 11:09:35 2010 +0200 libgcrypt: Update to 1.4.6. commit c790c2393c4b8f3f6029fde19806e4d7429efe2e Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 11:02:19 2010 +0200 libassuan: Update to 2.0.1. Now it provides its own shared library, so we don't need the patch for it anymore. commit 9dac8e4cfbb59f58069be7dd138ffbefc585c04a Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 27 11:00:49 2010 +0200 libgpg-error: Update to 1.9. commit e86c7a1b0c337f9a41e729b2d8b797cbb708c12f Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 25 21:21:03 2010 +0200 fontconfig: Fix font directories. commit aebdc8eef93f8b25d4f60e55e7c73d124a587b5d Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 25 17:03:27 2010 +0200 kernel: Activate mouse drivers. commit 86dabf4c5eb067d1077f2655b9af05064e51a971 Merge: 59486d2 078dbf1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 24 15:45:54 2010 +0200 Merge remote branch 'ms/X' into next commit 59486d276eefc71ebf8296c48659f1e092ea23ba Merge: 54ec5af 754c4b4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 22 19:13:20 2010 +0200 Merge commit 'stevee/qt-framework' into next commit 54ec5af9c823aefa0b3a51cad8df0a242a3bd761 Merge: 0fc5401 afbcc45 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 22 19:13:11 2010 +0200 Merge commit 'stevee/x-server' into next commit 754c4b46cb59c6a9ff6c1a0f9e3f91bc00d057db Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:56:52 2010 +0200 qt: Remove unused dependency less. commit fe1cf40d59d760144014e89fb8471adbb2bcf4e2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 22 17:56:36 2010 +0200 pyQt: New package. commit af3b31038717dc06600bec676a2e2d56c2aafed9 Merge: 13924a8 afbcc45 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:45:22 2010 +0200 Merge branch 'x-server' into qt-framework commit 13924a8c9776061704e54ea0045afc4f6112e245 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 22 17:22:53 2010 +0200 sip: New package. commit afbcc4510faaaee923661ef75d6605bc95bbb5c9 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:08:52 2010 +0200 xorg-x11-drv-vesa: Add more dependencies. commit bcf07c570eeb9a699e6ed8cebf4315e9c2eca7a1 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:07:41 2010 +0200 libXext: New package. commit bfa29a546c56dd8244d15d8509fde1d4e6c638eb Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:06:10 2010 +0200 xkeyboard-config: New package. commit bd6a900972d15aef261845f774e76743de75ed59 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:05:33 2010 +0200 xorg-x11-drv-keyboard: New package. commit f520c16fac05797ec62f1028f5cf1a4182372dda Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:05:02 2010 +0200 xorg-x11-drv-evdev: New package. commit 4d14a81572a323495707daa9effdf67a723f4a2a Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:04:33 2010 +0200 xorg-x11-drv-mouse: New package. commit 313ed234cf970a25a8100907ea005124a500de90 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 17:02:19 2010 +0200 xorg-server: Improve functions, add patches. commit 8aa453e5aa85893aef534674b687e24b0de53820 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Aug 22 16:59:27 2010 +0200 kernel: Remove CONFIG_GRSECURITY_IO to run the X server. commit f920b4a46f552dd8977b587e4d9e2e28dd595a27 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 16:59:12 2010 +0200 xorg-x11-font-utils: New package. commit c4d0cbf5e073d3eb2a091e8558c08baa3212847e Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 16:58:41 2010 +0200 xorg-x11-fonts: New package. commit 1c304fe7582f2695f9a25e03399a3622928e99f1 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 16:58:08 2010 +0200 xorg-x11-util-macros: New package. commit a4295f5f2962b92e7c05ab860f8e627c354391c8 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sun Aug 22 16:57:23 2010 +0200 xorg-x11-xkb-utils: New package. commit 83931ab17e224664683c0461067d79d128f936d8 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 20 21:07:31 2010 +0200 xorg-x11-drv-vesa: New package. commit 6bd477eb1eec5dca3f614b0eade89523578a9aff Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Fri Aug 20 17:44:29 2010 +0200 qt: New package. commit 0fc54015d965aec382a81754aebd7727e4717efc Merge: 5ab9429 07271d6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 18 23:14:14 2010 +0200 Merge commit 'stevee/updates' into next commit 078dbf1538ae24c579b881abe49bc9a3a4e63123 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 18 23:08:19 2010 +0200 xorg-x11-xinit: New package. commit d908a7f4cfbc78c153b793cd00a9ddc363729467 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 22:01:05 2010 +0200 xorg-server: New package. commit 5c1a6923647f1ad69458a1388b9fcb0f9c476a5c Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 21:47:41 2010 +0200 pixman: Update to 0.18.4. commit 53ea7db4c1d52d57f8e4177b9b5e128c223eba40 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 21:42:18 2010 +0200 libXfont: New package. commit c9791ec8a270e6d27f6c07c143511f8ad58bb413 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 21:29:55 2010 +0200 libfontenc: New package. commit 0badf05e9c340837f3bb9e74bb202d2092e13575 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 18 21:21:45 2010 +0200 libxkbfile: New package. commit 6d52de1dae3e8969158883dadd9fad9b5e52edda Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 20:48:00 2010 +0200 libX11: New package. commit 49038d37a192375f7b0598d3254145d8f026c227 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 18 20:42:21 2010 +0200 libxcb: New package. commit cfcd4861e0a6f00efb3596b6fb9ad764f154afb3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 18 20:27:09 2010 +0200 xcb-proto: New package. commit 4766c629422d451681454d65575784ff9304b3f0 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 20:23:31 2010 +0200 libXau: New package. commit ac4c88bcf8438dba7f0414ab73251a915fbfa9a5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 18 20:21:37 2010 +0200 libxslt: New package. commit b9d743be165cf44bd0db198119f79fadc5221f08 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 20:13:17 2010 +0200 xorg-xtrans: Rename to xorg-x11-xtrans-devel. commit e67c459f67c6de7882edf7a0ef20898a889e003d Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Wed Aug 18 20:07:34 2010 +0200 xorg-xtrans: New package. commit f74310269475c262c088e0bee4260c3069bedc96 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 18 19:58:28 2010 +0200 xorg-x11-proto-devel: New package. commit 07271d699c132b41364042befa2088ce63430c99 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Tue Aug 17 18:30:58 2010 +0200 syslinux: Update to 4.02. commit 18fc9c8355d185210211e367788cd8b777f073c6 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Tue Aug 17 18:25:13 2010 +0200 iptables: Update to 1.4.9.1. commit f76f0aad1c18f1709612febf5a6be9be950f8fc2 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Tue Aug 17 18:01:34 2010 +0200 bison: Remove unneeded gcc patch. We don't need this patch after update to 2.4.3 anymore. commit 0d83286c4a9cdc9bd0d219418130d3c8acb51a5e Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Tue Aug 17 18:01:11 2010 +0200 bison: Update to 2.4.3. commit aeefad9a9afd9b24af72f0d00f06157d0b789e1d Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Mon Aug 16 20:56:56 2010 +0200 curl: Update to 7.21.1. commit cc8e235c47dc6b3031537277dac1fbac6ecc27c4 Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Mon Aug 16 19:33:17 2010 +0200 lighttpd: Update to 1.4.17. Have a look here for the changes: http://freshmeat.net/projects/lighttpd/releases/320595 commit 5ab9429af59598d73e1d42c16032390d1d70d9c5 Merge: 037ed48 22ddaa8 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 4 15:47:46 2010 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next commit 037ed48165cda18474b8b6ccdf7b6a9caf02b2dc Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 4 15:47:10 2010 +0200 toolchain: Disable ppl and cloog so it won't get compiled in from the host system. commit 215545b28a49ec694af1cc99f7d1fc11de9c5967 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Aug 4 15:46:24 2010 +0200 glibc: Update to 2.12.1. Truncated the fedora patch because Changelog didn't apply. commit 22ddaa87a1ebee150de2483c1d06740496ac8a38 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 3 20:03:03 2010 +0200 pkg-config: Add patch to fix syntax errors in pkg.m4. commit c2c6eb30068ac7c0532680d4b72433cdc63d712c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Aug 3 10:25:51 2010 +0200 python: Remove autoconf version check from configure.in. Regression with autoconf 2.67. commit 4f3b700cae05c55df4be3738ddeb84e17e6e1885 Merge: 2217255 a953e76 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 22:20:01 2010 +0200 Merge branch 'autoconf-update' into next commit a953e76285a7bd6bab443eee6e5990677c7edbe7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 22:19:31 2010 +0200 autoconf: Update to 2.67. commit 22172558c03ed3c9bdf12d272517094d5d66ab6d Merge: fcf9267 de45a98 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 20:47:51 2010 +0200 Merge branch 'master' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-3.x into next commit fcf9267dfd94f142a139166ff7e39935f556f64d Merge: 11d98ea c82e34f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 20:47:35 2010 +0200 Merge branch 'gcc-update' into next commit c82e34f795b4e782cecc961a3a6f05b5e414fa49 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 20:14:52 2010 +0200 toolchain: Bump version to 6. commit 1fdf08573a8b16d8bdcbcb9e57467bd59d0c8487 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Aug 2 20:12:15 2010 +0200 gcc: Update to 4.5.1. Enabled lto. commit 11d98ea796a7c01e7c642dc9e16aec3679dd1582 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 31 20:52:29 2010 +0200 network: Fix duplicate check. commit ab3a2b53f103f345dfa8ce57a6a9a8a2b307058f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 31 12:57:00 2010 +0200 network: Some more general IP functions. commit 650e5849ce1d9db2122ae04a7e483e8ffe680a42 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 31 12:55:15 2010 +0200 network: Improve IPV4 support. Add support for duplicate IP addresses in network. Announce new address to neighbours. commit c061aa4f1abfe15601ad124f6a0d73918c801b84 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 31 12:53:20 2010 +0200 network: Initialize the IPv6 stack. commit 4624e8815e1ea9cd72c662bb59803a63363f6db1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Jul 31 12:52:29 2010 +0200 network: Add new check for ethernet devices. commit b4ff4a2d6d6398b8181c07986bbdb7e3adb3e83d Author: Schantl Stefan <Stevee(a)ipfire.org> Date: Sat Jul 31 11:29:49 2010 +0200 dbus: Update to current development version (1.3.2). ----------------------------------------------------------------------- Summary of changes: config/naoki.conf | 2 +- pkgs/core/autoconf/autoconf.nm | 2 +- pkgs/core/bison/bison.nm | 2 +- pkgs/core/bison/patches/bison-2.4.2-gcc-1.patch | 46 - pkgs/core/curl/curl.nm | 2 +- pkgs/core/dbus/dbus.nm | 4 +- pkgs/core/fontconfig/fontconfig.nm | 4 +- pkgs/core/gcc/gcc.nm | 7 +- pkgs/core/glibc/glibc.nm | 4 +- pkgs/core/glibc/patches/glibc-fedora.patch | 86 -- pkgs/core/gnupg2/gnupg2.nm | 5 +- pkgs/core/iptables/iptables.nm | 4 +- pkgs/core/kernel/config | 23 +- pkgs/core/libX11/libX11.nm | 44 + pkgs/core/libXau/libXau.nm | 54 ++ pkgs/core/libXau/patches/xau-1.0.4-local.patch | 22 + pkgs/core/libXext/libXext.nm | 47 + pkgs/core/libXfont/libXfont.nm | 47 + pkgs/core/libassuan/libassuan.nm | 9 +- .../libassuan/patches/libassuan-1.0.5-ac.patch | 26 - .../libassuan/patches/libassuan-1.0.5-shared.patch | 59 -- pkgs/core/libfontenc/libfontenc.nm | 47 + pkgs/core/libgcrypt/libgcrypt.nm | 2 +- pkgs/core/libgpg-error/libgpg-error.nm | 2 +- pkgs/core/libksba/libksba.nm | 2 +- pkgs/core/libxcb/libxcb.nm | 54 ++ pkgs/core/libxkbfile/libxkbfile.nm | 52 ++ pkgs/core/libxslt/libxslt.nm | 46 + pkgs/core/lighttpd/lighttpd.nm | 2 +- pkgs/core/network/src/functions.device | 3 + pkgs/core/network/src/functions.ip | 52 ++ pkgs/core/network/src/functions.ipv4 | 76 ++ pkgs/core/network/src/functions.ipv6 | 118 +++- .../src/hooks/zones/bridge.configs/ipv4-static | 11 +- pkgs/core/pixman/pixman.nm | 4 +- .../patches/pkg-config-0.25-autoconf-1.patch | 20 + .../pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch | 23 + .../patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch | 9 + .../patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch | 19 + .../PyQt-x11-gpl-4.6.2-timestamp-multilib.patch | 13 + .../PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch | 12 + pkgs/core/pyQt/pyQt.nm | 56 ++ pkgs/core/python/python.nm | 4 +- pkgs/core/qt/qt.nm | 106 +++ pkgs/core/sip/sip.nm | 53 ++ pkgs/core/syslinux/syslinux.nm | 2 +- pkgs/core/xcb-proto/xcb-proto.nm | 46 + pkgs/core/xkeyboard-config/xkeyboard-config.nm | 55 ++ pkgs/core/xorg-server/10-quirks.conf | 20 + .../patches/xserver-1.4.99-pic-libxf86config.patch | 25 + .../patches/xserver-1.4.99-ssh-isnt-local.patch | 48 + .../patches/xserver-1.5.0-bg-none-root.patch | 155 ++++ .../patches/xserver-1.5.0-projector-fb-size.patch | 32 + .../patches/xserver-1.5.1-mode-debug.patch | 26 + .../patches/xserver-1.6.0-displayfd.patch | 172 ++++ .../xserver-1.6.0-less-acpi-brokenness.patch | 31 + .../patches/xserver-1.6.1-nouveau.patch | 109 +++ .../patches/xserver-1.6.99-default-modes.patch | 35 + .../xserver-1.6.99-randr-error-debugging.patch | 42 + .../patches/xserver-1.6.99-right-of.patch | 172 ++++ .../xserver-1.7.0-randr-gamma-restore.patch | 36 + .../patches/xserver-1.7.1-gamma-kdm-fix.patch | 34 + .../patches/xserver-1.7.1-multilib.patch | 55 ++ .../patches/xserver-1.8-disable-vboxvideo.patch | 25 + .../patches/xserver-1.8-no-connected-outputs.patch | 142 +++ .../patches/xserver-1.8-randr-initial.patch | 35 + .../patches/xserver-1.8-udev-warning.patch | 37 + .../xserver-1.8.2-XTEST-PointerKeys-fixes.patch | 909 ++++++++++++++++++++ pkgs/core/xorg-server/xorg-server.nm | 104 +++ pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 48 + .../xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 49 ++ pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 49 ++ pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 49 ++ .../xorg-x11-font-utils/xorg-x11-font-utils.nm | 80 ++ pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm | 115 +++ .../xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 99 +++ .../xorg-x11-util-macros/xorg-x11-util-macros.nm | 51 ++ pkgs/core/xorg-x11-xinit/xorg-x11-xinit.nm | 44 + pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 76 ++ .../patches/xtrans-1.0.3-avoid-gethostname.patch | 11 + .../xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm | 46 + pkgs/toolchain/gcc-static/gcc-static.nm | 2 + pkgs/toolchain/gcc/gcc.nm | 3 +- 83 files changed, 4091 insertions(+), 263 deletions(-) delete mode 100644 pkgs/core/bison/patches/bison-2.4.2-gcc-1.patch create mode 100644 pkgs/core/libX11/libX11.nm create mode 100644 pkgs/core/libXau/libXau.nm create mode 100644 pkgs/core/libXau/patches/xau-1.0.4-local.patch create mode 100644 pkgs/core/libXext/libXext.nm create mode 100644 pkgs/core/libXfont/libXfont.nm delete mode 100644 pkgs/core/libassuan/patches/libassuan-1.0.5-ac.patch delete mode 100644 pkgs/core/libassuan/patches/libassuan-1.0.5-shared.patch create mode 100644 pkgs/core/libfontenc/libfontenc.nm create mode 100644 pkgs/core/libxcb/libxcb.nm create mode 100644 pkgs/core/libxkbfile/libxkbfile.nm create mode 100644 pkgs/core/libxslt/libxslt.nm create mode 100644 pkgs/core/network/src/functions.ip create mode 100644 pkgs/core/network/src/functions.ipv4 create mode 100644 pkgs/core/pkg-config/patches/pkg-config-0.25-autoconf-1.patch create mode 100644 pkgs/core/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch create mode 100644 pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch create mode 100644 pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch create mode 100644 pkgs/core/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch create mode 100644 pkgs/core/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch create mode 100644 pkgs/core/pyQt/pyQt.nm create mode 100644 pkgs/core/qt/qt.nm create mode 100644 pkgs/core/sip/sip.nm create mode 100644 pkgs/core/xcb-proto/xcb-proto.nm create mode 100644 pkgs/core/xkeyboard-config/xkeyboard-config.nm create mode 100644 pkgs/core/xorg-server/10-quirks.conf create mode 100644 pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch create mode 100644 pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch create mode 100644 pkgs/core/xorg-server/xorg-server.nm create mode 100644 pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm create mode 100644 pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm create mode 100644 pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm create mode 100644 pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm create mode 100644 pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm create mode 100644 pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm create mode 100644 pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm create mode 100644 pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm create mode 100644 pkgs/core/xorg-x11-xinit/xorg-x11-xinit.nm create mode 100644 pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm create mode 100644 pkgs/core/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch create mode 100644 pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm Difference in files: diff --git a/config/naoki.conf b/config/naoki.conf index d55e14b..274dc91 100644 --- a/config/naoki.conf +++ b/config/naoki.conf @@ -24,7 +24,7 @@ slogan = "Gluttony" [toolchain] ; Counter of toolchain version -version = 5 +version = 6 [sources] diff --git a/pkgs/core/autoconf/autoconf.nm b/pkgs/core/autoconf/autoconf.nm index b87c6cb..e8df9a2 100644 --- a/pkgs/core/autoconf/autoconf.nm +++ b/pkgs/core/autoconf/autoconf.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = autoconf -PKG_VER = 2.65 +PKG_VER = 2.67 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/bison/bison.nm b/pkgs/core/bison/bison.nm index ca31db9..101a4c6 100644 --- a/pkgs/core/bison/bison.nm +++ b/pkgs/core/bison/bison.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = bison -PKG_VER = 2.4.2 +PKG_VER = 2.4.3 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/bison/patches/bison-2.4.2-gcc-1.patch b/pkgs/core/bison/patches/bison-2.4.2-gcc-1.patch deleted file mode 100644 index f0197b1..0000000 --- a/pkgs/core/bison/patches/bison-2.4.2-gcc-1.patch +++ /dev/null @@ -1,46 +0,0 @@ -Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> -Date: 2010-04-18 -Initial Package Version: 2.4.2 -Upstream Status: From upstream -Origin: http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00033.html -Description: GCC-4.5.0 changed the format of its output for #error - messages. Fix the test suite to handle the new format. - -diff -Naur bison-2.4.2.orig/NEWS bison-2.4.2/NEWS ---- bison-2.4.2.orig/NEWS 2010-03-20 17:07:23.000000000 +0000 -+++ bison-2.4.2/NEWS 2010-04-18 13:32:59.765438333 +0000 -@@ -1,6 +1,8 @@ - Bison News - ---------- - -+** Failures in the test suite for GCC 4.5 have been fixed. -+ - * Changes in version 2.4.2 (2010-03-20): - - ** Some portability problems that resulted in failures and livelocks -diff -Naur bison-2.4.2.orig/tests/synclines.at bison-2.4.2/tests/synclines.at ---- bison-2.4.2.orig/tests/synclines.at 2010-02-25 04:56:43.000000000 +0000 -+++ bison-2.4.2/tests/synclines.at 2010-04-18 13:32:59.765438333 +0000 -@@ -71,7 +71,9 @@ - AT_DATA([[input.y]], [$2]) - AT_BISON_CHECK([-o input.c input.y]) - AT_SYNCLINES_COMPILE([input.c]) --AT_CHECK([cat stdout], 0, [$3]) -+# GCC 4.5 tells you the function within which #error appears, but -+# previous versions of gcc do not. -+AT_CHECK([grep -v ': In function ' stdout], 0, [$3]) - AT_CLEANUP - ]) - -diff -Naur bison-2.4.2.orig/tests/testsuite bison-2.4.2/tests/testsuite ---- bison-2.4.2.orig/tests/testsuite 2010-03-20 17:16:02.000000000 +0000 -+++ bison-2.4.2/tests/testsuite 2010-04-18 13:34:37.345569087 +0000 -@@ -16011,7 +16011,7 @@ - { set +x - $as_echo "$at_srcdir/synclines.at:144: cat stdout" - at_fn_check_prepare_trace "synclines.at:144" --( $at_check_trace; cat stdout -+( $at_check_trace; grep -v ': In function ' stdout - ) >>"$at_stdout" 2>>"$at_stderr" - at_status=$? at_failed=false - $at_check_filter diff --git a/pkgs/core/curl/curl.nm b/pkgs/core/curl/curl.nm index 5986f42..1cda1a7 100644 --- a/pkgs/core/curl/curl.nm +++ b/pkgs/core/curl/curl.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = curl -PKG_VER = 7.21.0 +PKG_VER = 7.21.1 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/dbus/dbus.nm b/pkgs/core/dbus/dbus.nm index 5233002..b0cf158 100644 --- a/pkgs/core/dbus/dbus.nm +++ b/pkgs/core/dbus/dbus.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = dbus -PKG_VER = 1.2.16 +PKG_VER = 1.3.2 PKG_REL = 0 PKG_MAINTAINER = @@ -42,7 +42,7 @@ define PKG_DESCRIPTION per-user-login-session messaging facility. endef -PKG_TARBALL = $(THISAPP).tar.gz +PKG_TARBALL = $(THISAPP).885483.tar.gz CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ diff --git a/pkgs/core/fontconfig/fontconfig.nm b/pkgs/core/fontconfig/fontconfig.nm index 4beacc0..e930cc1 100644 --- a/pkgs/core/fontconfig/fontconfig.nm +++ b/pkgs/core/fontconfig/fontconfig.nm @@ -48,4 +48,6 @@ PKG_TARBALL = $(THISAPP).tar.gz CONFIGURE_OPTIONS += \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-libxml2 + --enable-libxml2 \ + --with-add-fonts=/usr/share/X11/fonts/Type1,/usr/share/X11/fonts/TTF,/usr/local/share/fonts + diff --git a/pkgs/core/gcc/gcc.nm b/pkgs/core/gcc/gcc.nm index f4446b8..14fe53c 100644 --- a/pkgs/core/gcc/gcc.nm +++ b/pkgs/core/gcc/gcc.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = gcc -PKG_VER = 4.5.0 +PKG_VER = 4.5.1 PKG_REL = 0 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> @@ -40,7 +40,7 @@ define PKG_DESCRIPTION endef PKG_BUILD_DEPS = autogen dejagnu expect -PKG_DEPS += binutils cloog glibc gmp kernel-headers libffi mpc mpfr ppl +PKG_DEPS += binutils cloog elfutils glibc gmp kernel-headers libffi mpc mpfr ppl ifeq "$(MACHINE)" "i586" CONFIGURE_ARGS = --disable-decimal-float @@ -52,7 +52,7 @@ else CONFIG_CPU = --with-cpu=$(TARGET_MACHINE) --with-arch=$(TARGET_MACHINE) endif -PKG_TARBALL += $(THISAPP).tar.bz2 +PKG_TARBALL += $(THISAPP).tar.gz ############################################################################### # Installation Details @@ -102,6 +102,7 @@ define STAGE_BUILD --enable-__cxa_atexit \ --enable-clocale=gnu \ --enable-languages=c,c++ \ + --enable-lto \ --disable-bootstrap \ --disable-werror \ --disable-libssp \ diff --git a/pkgs/core/glibc/glibc.nm b/pkgs/core/glibc/glibc.nm index ad694b8..8e1b99a 100644 --- a/pkgs/core/glibc/glibc.nm +++ b/pkgs/core/glibc/glibc.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = glibc -PKG_VER = 2.12 +PKG_VER = 2.12.1 PKG_REL = 0 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> @@ -55,7 +55,7 @@ CXXFLAGS += $(GLIBC_FLAGS) OPTIMIZED_KERNEL = 2.6.18 -PKG_OBJECTS += $(THISAPP).tar.bz2 +PKG_OBJECTS += $(THISAPP).tar.gz # $(THISAPP)-pt_pax-1.patch - Support for PT_PaX markings. diff --git a/pkgs/core/glibc/patches/glibc-fedora.patch b/pkgs/core/glibc/patches/glibc-fedora.patch index 5a7fce9..e2f6bb3 100644 --- a/pkgs/core/glibc/patches/glibc-fedora.patch +++ b/pkgs/core/glibc/patches/glibc-fedora.patch @@ -1,89 +1,3 @@ ---- glibc-2.12-2-gc4ccff1/ChangeLog -+++ glibc-2.12-1/ChangeLog -@@ -241,6 +241,12 @@ - - * Makerules (libc-abis): Fix search for libc-abis in add-ons. - -+2010-04-06 Ulrich Drepper <drepper(a)redhat.com> -+ -+ * sysdeps/posix/getaddrinfo.c (default_scopes): Assign global -+ scope to RFC 1918 addresses. -+ * posix/gai.conf: Document difference from RFC 3484. -+ - 2010-04-05 Thomas Schwinge <thomas(a)schwinge.name> - - * sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/. -@@ -995,6 +1001,19 @@ - * sysdeps/x86_64/fpu/fegetenv.c: Likewise - * sysdeps/s390/fpu/fegetenv.c: Likewise. Remove unused headers. - -+2009-10-27 Aurelien Jarno <aurelien(a)aurel32.net> -+ -+ [BZ #10855] -+ * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory -+ used later with MMAP_FIXED | MMAP_SHARED to cope with different -+ alignment restrictions. -+ -+2010-02-08 Andreas Schwab <schwab(a)redhat.com> -+ -+ [BZ #11155] -+ * sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386 -+ version. -+ - 2010-02-05 H.J. Lu <hongjiu.lu(a)intel.com> - - [BZ #11230] -@@ -2938,6 +2957,11 @@ d2009-10-30 Ulrich Drepper <drepper@re - * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in - the unique symbol hash table should not be const. - -+2009-07-22 Jakub Jelinek <jakub(a)redhat.com> -+ -+ * Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS). -+ * sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686. -+ - 2009-07-21 Ulrich Drepper <drepper(a)redhat.com> - - * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -3203,6 +3227,11 @@ d2009-10-30 Ulrich Drepper <drepper@re - out common code into new function get_common_indeces. Determine - extended family and model for Intel processors. - -+2009-06-26 Andreas Schwab <aschwab(a)redhat.com> -+ -+ * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ -+ string when the timezone ends in DST. -+ - 2009-06-26 Ulrich Drepper <drepper(a)redhat.com> - - * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -11896,6 +11925,10 @@ d2009-10-30 Ulrich Drepper <drepper@re - [BZ #4368] - * stdlib/stdlib.h: Remove obsolete part of comment for realpath. - -+2007-04-16 Jakub Jelinek <jakub(a)redhat.com> -+ -+ * locale/programs/locarchive.c (add_alias, insert_name): Remove static. -+ - 2007-04-16 Ulrich Drepper <drepper(a)redhat.com> - - [BZ #4364] -@@ -13153,6 +13186,15 @@ d2009-10-30 Ulrich Drepper <drepper@re - separators also if no non-zero digits found. - * stdlib/Makefile (tests): Add tst-strtod3. - -+2006-12-10 Jakub Jelinek <jakub(a)redhat.com> -+ -+ * sysdeps/unix/sysv/linux/netlinkaccess.h: Include linux/if_addr.h -+ if IFA_MAX is not defined. -+ (IFA_RTA, IFA_PAYLOAD, IFLA_RTA, IFLA_PAYLOAD): Define if not -+ defined. -+ * sysdeps/unix/sysv/linux/check_pf.c: Include netlinkaccess.h -+ instead of asm/types.h, linux/netlink.h and linux/rtnetlink.h. -+ - 2006-12-09 Ulrich Drepper <drepper(a)redhat.com> - - [BZ #3632] --- glibc-2.12-2-gc4ccff1/ChangeLog.15 +++ glibc-2.12-1/ChangeLog.15 @@ -477,6 +477,14 @@ diff --git a/pkgs/core/gnupg2/gnupg2.nm b/pkgs/core/gnupg2/gnupg2.nm index ce290de..5fc449b 100644 --- a/pkgs/core/gnupg2/gnupg2.nm +++ b/pkgs/core/gnupg2/gnupg2.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = gnupg -PKG_VER = 2.0.12 +PKG_VER = 2.0.16 PKG_REL = 0 PKG_MAINTAINER = @@ -47,4 +47,5 @@ endef PKG_TARBALL = $(THISAPP).tar.bz2 CONFIGURE_OPTIONS += \ - --libexecdir=/usr/lib/gnupg2 + --libexecdir=/usr/lib/gnupg2 \ + --enable-standard-socket diff --git a/pkgs/core/iptables/iptables.nm b/pkgs/core/iptables/iptables.nm index e3f7cea..ec728fe 100644 --- a/pkgs/core/iptables/iptables.nm +++ b/pkgs/core/iptables/iptables.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = iptables -PKG_VER = 1.4.8 +PKG_VER = 1.4.9.1 PKG_REL = 0 PKG_MAINTAINER = @@ -79,7 +79,7 @@ define STAGE_INSTALL_CMDS ln -svf ../../lib/libip4tc.so.0 $(BUILDROOT)/usr/lib/libip4tc.so ln -svf ../../lib/libip6tc.so.0 $(BUILDROOT)/usr/lib/libip6tc.so ln -svf ../../lib/libipq.so.0 $(BUILDROOT)/usr/lib/libipq.so - ln -svf ../../lib/libxtables.so.4 $(BUILDROOT)/usr/lib/libxtables.so + ln -svf ../../lib/libxtables.so.5 $(BUILDROOT)/usr/lib/libxtables.so # Replace absolute symlink ln -svf ../sbin/iptables-multi $(BUILDROOT)/bin/iptables-xml diff --git a/pkgs/core/kernel/config b/pkgs/core/kernel/config index c6af30d..5a43916 100644 --- a/pkgs/core/kernel/config +++ b/pkgs/core/kernel/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.34.1 -# Fri Jul 9 12:42:37 2010 +# Wed Aug 25 14:38:31 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1800,7 +1800,23 @@ CONFIG_KEYBOARD_OPENCORES=m # CONFIG_KEYBOARD_STOWAWAY is not set # CONFIG_KEYBOARD_SUNKBD is not set # CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ALPS=y +CONFIG_MOUSE_PS2_LOGIPS2PP=y +CONFIG_MOUSE_PS2_SYNAPTICS=y +CONFIG_MOUSE_PS2_LIFEBOOK=y +CONFIG_MOUSE_PS2_TRACKPOINT=y +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_MOUSE_PS2_SENTELIC=y +CONFIG_MOUSE_PS2_TOUCHKIT=y +CONFIG_MOUSE_PS2_OLPC=y +CONFIG_MOUSE_SERIAL=m +# CONFIG_MOUSE_APPLETOUCH is not set +# CONFIG_MOUSE_BCM5974 is not set +# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_MOUSE_GPIO is not set +# CONFIG_MOUSE_SYNAPTICS_I2C is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TABLET is not set # CONFIG_INPUT_TOUCHSCREEN is not set @@ -3593,7 +3609,7 @@ CONFIG_GRKERNSEC_HIGH=y # CONFIG_GRKERNSEC_KMEM=y CONFIG_GRKERNSEC_VM86=y -CONFIG_GRKERNSEC_IO=y +# CONFIG_GRKERNSEC_IO is not set CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODHARDEN=y @@ -3668,7 +3684,6 @@ CONFIG_GRKERNSEC_BLACKHOLE=y # Sysctl support # CONFIG_GRKERNSEC_SYSCTL=y -# CONFIG_GRKERNSEC_SYSCTL_DISTRO is not set CONFIG_GRKERNSEC_SYSCTL_ON=y # diff --git a/pkgs/core/libX11/libX11.nm b/pkgs/core/libX11/libX11.nm new file mode 100644 index 0000000..760f5f9 --- /dev/null +++ b/pkgs/core/libX11/libX11.nm @@ -0,0 +1,44 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libX11 +PKG_VER = 1.3.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X11 protocol client library. + +PKG_BUILD_DEPS+= pkg-config xorg-x11-proto-devel xorg-x11-xtrans-devel +PKG_DEPS += libxcb + +define PKG_DESCRIPTION + Client library for X.org X11 protocol. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 diff --git a/pkgs/core/libXau/libXau.nm b/pkgs/core/libXau/libXau.nm new file mode 100644 index 0000000..9b5de66 --- /dev/null +++ b/pkgs/core/libXau/libXau.nm @@ -0,0 +1,54 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libXau +PKG_VER = 1.0.6 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://xcb.freedesktop.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = Sample Authorization Protocol for X. + +PKG_BUILD_DEPS+= pkg-config xorg-x11-proto-devel + +define PKG_DESCRIPTION + This is a very simple mechanism for providing individual access \ + to an X Window System display.It uses existing core protocol and \ + library hooks for specifying authorization data in the connection \ + setup block to restrict use of the display to only those clients \ + that show that they know a server-specific key called a \ + "magic cookie". +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --disable-static + +STAGE_INSTALL_TARGETS += \ + INSTALL="install -p" diff --git a/pkgs/core/libXau/patches/xau-1.0.4-local.patch b/pkgs/core/libXau/patches/xau-1.0.4-local.patch new file mode 100644 index 0000000..26b578b --- /dev/null +++ b/pkgs/core/libXau/patches/xau-1.0.4-local.patch @@ -0,0 +1,22 @@ +diff --git a/AuGetBest.c b/AuGetBest.c +index ae2b748..5d92dad 100644 +--- a/AuGetBest.c ++++ b/AuGetBest.c +@@ -120,7 +120,8 @@ XauGetBestAuthByAddr ( + * Match when: + * either family or entry->family are FamilyWild or + * family and entry->family are the same and +- * address and entry->address are the same ++ * address and entry->address are the same or ++ * family is FamilyLocal + * and + * either number or entry->number are empty or + * number and entry->number are the same +@@ -139,6 +140,7 @@ XauGetBestAuthByAddr ( + binaryEqual (entry->address, fully_qual_address, + (int) fully_qual_address_length)) + #endif ++ || (family == FamilyLocal) + ))) && + (number_length == 0 || entry->number_length == 0 || + (number_length == entry->number_length && diff --git a/pkgs/core/libXext/libXext.nm b/pkgs/core/libXext/libXext.nm new file mode 100644 index 0000000..d0bf204 --- /dev/null +++ b/pkgs/core/libXext/libXext.nm @@ -0,0 +1,47 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libXext +PKG_VER = 1.1.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 libXext runtime library. + +PKG_BUILD_DEPS+= pkg-config xorg-x11-proto-devel +PKG_DEPS += libX11 libXau + +define PKG_DESCRIPTION + X.Org X11 libXext development package. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/libXfont/libXfont.nm b/pkgs/core/libXfont/libXfont.nm new file mode 100644 index 0000000..ae9316f --- /dev/null +++ b/pkgs/core/libXfont/libXfont.nm @@ -0,0 +1,47 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libXfont +PKG_VER = 1.4.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 libXfont runtime library. + +PKG_BUILD_DEPS+= pkg-config xorg-x11-xtrans-devel +PKG_DEPS += freetype libfontenc + +define PKG_DESCRIPTION + X.Org X11 libXfont development package. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/libassuan/libassuan.nm b/pkgs/core/libassuan/libassuan.nm index ec90824..a8e5bb6 100644 --- a/pkgs/core/libassuan/libassuan.nm +++ b/pkgs/core/libassuan/libassuan.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libassuan -PKG_VER = 1.0.5 +PKG_VER = 2.0.1 PKG_REL = 0 PKG_MAINTAINER = @@ -34,8 +34,7 @@ PKG_URL = http://www.gnupg.org/ PKG_LICENSE = LGPLv2+ PKG_SUMMARY = GnuPG IPC library. -PKG_BUILD_DEPS+= autoconf automake libtool -PKG_DEPS += pth +PKG_DEPS += libgpg-error pth define PKG_DESCRIPTION The Libassuan package contains an IPC library used by some of the other \ @@ -47,7 +46,3 @@ define PKG_DESCRIPTION endef PKG_TARBALL = $(THISAPP).tar.bz2 - -define STAGE_PREPARE_CMDS - cd $(DIR_APP) && autoreconf --install -endef diff --git a/pkgs/core/libassuan/patches/libassuan-1.0.5-ac.patch b/pkgs/core/libassuan/patches/libassuan-1.0.5-ac.patch deleted file mode 100644 index 4385713..0000000 --- a/pkgs/core/libassuan/patches/libassuan-1.0.5-ac.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- libassuan-1.0.5/configure.ac.orig 2008-05-27 08:25:59.235870000 +0200 -+++ libassuan-1.0.5/configure.ac 2008-05-27 08:36:37.868258393 +0200 -@@ -44,7 +44,10 @@ - AB_INIT - - AC_GNU_SOURCE -- -+AH_TEMPLATE([_ALL_SOURCE], [All extensions]) -+AH_TEMPLATE([_GNU_SOURCE], [GNU extensions]) -+AH_TEMPLATE([_POSIX_PTHREAD_SEMANTICS], [POSIX pthread semantics]) -+AH_TEMPLATE([_TANDEM_SOURCE], [Tandem extensions]) - - AC_SUBST(PACKAGE) - AC_SUBST(VERSION) -@@ -106,11 +109,6 @@ - have_dosish_system=no - have_w32_system=no - case "${host}" in -- *-linux*) -- if test "$GCC" = yes; then -- CFLAGS="$CFLAGS -fPIC -DPIC" -- fi -- ;; - *-mingw32*) - have_dosish_system=yes - have_w32_system=yes diff --git a/pkgs/core/libassuan/patches/libassuan-1.0.5-shared.patch b/pkgs/core/libassuan/patches/libassuan-1.0.5-shared.patch deleted file mode 100644 index 5491c4e..0000000 --- a/pkgs/core/libassuan/patches/libassuan-1.0.5-shared.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- libassuan-1.0.1/src/Makefile.am.orig 2006-11-21 19:17:18.000000000 +0100 -+++ libassuan-1.0.1/src/Makefile.am 2006-11-23 19:30:28.776620250 +0100 -@@ -25,7 +25,7 @@ - MOSTLYCLEANFILES = assuan-errors.c - - if HAVE_PTH --libassuan_pth = libassuan-pth.a -+libassuan_pth = libassuan-pth.la - else - libassuan_pth = - endif -@@ -33,7 +33,7 @@ - bin_SCRIPTS = libassuan-config - m4datadir = $(datadir)/aclocal - m4data_DATA = libassuan.m4 --lib_LIBRARIES = libassuan.a $(libassuan_pth) -+lib_LTLIBRARIES = libassuan.la $(libassuan_pth) - include_HEADERS = assuan.h - - -@@ -55,13 +55,13 @@ - assuan-logging.c \ - assuan-socket.c - --libassuan_a_SOURCES = $(common_sources) assuan-io.c --libassuan_a_LIBADD = @LIBOBJS@ -+libassuan_la_SOURCES = $(common_sources) assuan-io.c -+libassuan_la_LIBADD = @LTLIBOBJS@ - - if HAVE_PTH --libassuan_pth_a_SOURCES = $(common_sources) assuan-io-pth.c --libassuan_pth_a_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS) --libassuan_pth_a_LIBADD = @LIBOBJS@ -+libassuan_pth_la_SOURCES = $(common_sources) assuan-io-pth.c -+libassuan_pth_la_CFLAGS = $(AM_CFLAGS) $(PTH_CFLAGS) -+libassuan_pth_la_LIBADD = @LTLIBOBJS@ $(PTH_LIBS) - endif - - assuan-errors.c : assuan.h mkerrors ---- libassuan-0.6.0/configure.ac.orig 2003-08-06 10:34:42.000000000 +0200 -+++ libassuan-0.6.0/configure.ac 2003-08-10 11:56:23.735375928 +0200 -@@ -57,7 +57,7 @@ - AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET --AC_PROG_RANLIB -+AC_PROG_LIBTOOL - #AC_ARG_PROGRAM - - if test "$GCC" = yes; then ---- libassuan-0.9.3/tests/Makefile.am.orig 2006-10-10 12:05:25.000000000 +0200 -+++ libassuan-0.9.3/tests/Makefile.am 2006-10-11 12:02:10.555971000 +0200 -@@ -37,5 +37,5 @@ - - noinst_HEADERS = common.h - noinst_PROGRAMS = $(TESTS) --LDADD = ../src/libassuan.a $(NETLIBS) # $(GPG_ERROR_LIBS) -+LDADD = ../src/libassuan.la $(NETLIBS) # $(GPG_ERROR_LIBS) - diff --git a/pkgs/core/libfontenc/libfontenc.nm b/pkgs/core/libfontenc/libfontenc.nm new file mode 100644 index 0000000..91a6516 --- /dev/null +++ b/pkgs/core/libfontenc/libfontenc.nm @@ -0,0 +1,47 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libfontenc +PKG_VER = 1.0.5 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 libfontenc runtime library. + +PKG_BUILD_DEPS+= pkg-config xorg-x11-proto-devel zlib +PKG_DEPS += + +define PKG_DESCRIPTION + X.Org X11 libfontenc runtime library. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/libgcrypt/libgcrypt.nm b/pkgs/core/libgcrypt/libgcrypt.nm index e6f0bdf..cbe5920 100644 --- a/pkgs/core/libgcrypt/libgcrypt.nm +++ b/pkgs/core/libgcrypt/libgcrypt.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libgcrypt -PKG_VER = 1.4.4 +PKG_VER = 1.4.6 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/libgpg-error/libgpg-error.nm b/pkgs/core/libgpg-error/libgpg-error.nm index b560398..3d88de1 100644 --- a/pkgs/core/libgpg-error/libgpg-error.nm +++ b/pkgs/core/libgpg-error/libgpg-error.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libgpg-error -PKG_VER = 1.7 +PKG_VER = 1.9 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/libksba/libksba.nm b/pkgs/core/libksba/libksba.nm index 211fec3..57c0865 100644 --- a/pkgs/core/libksba/libksba.nm +++ b/pkgs/core/libksba/libksba.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = libksba -PKG_VER = 1.0.2 +PKG_VER = 1.0.8 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/libxcb/libxcb.nm b/pkgs/core/libxcb/libxcb.nm new file mode 100644 index 0000000..d83a7f1 --- /dev/null +++ b/pkgs/core/libxcb/libxcb.nm @@ -0,0 +1,54 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libxcb +PKG_VER = 1.7 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://xcb.freedesktop.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = A C binding to the X11 protocol. + +PKG_BUILD_DEPS+= autoconf automake pkg-config xcb-proto xorg-x11-proto-devel +PKG_DEPS += libXau libxslt python + +define PKG_DESCRIPTION + The X protocol C-language Binding (XCB) is a replacement for Xlib \ + featuring a small footprint, latency hiding, direct access to the \ + protocol, improved threading support, and extensibility. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +CONFIGURE_OPTIONS += \ + --disable-static + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -e "s/pthread-stubs//g" -i configure.ac + cd $(DIR_APP) && autoreconf -f --install +endef diff --git a/pkgs/core/libxkbfile/libxkbfile.nm b/pkgs/core/libxkbfile/libxkbfile.nm new file mode 100644 index 0000000..ed2e38a --- /dev/null +++ b/pkgs/core/libxkbfile/libxkbfile.nm @@ -0,0 +1,52 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libxkbfile +PKG_VER = 1.0.6 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 libxkbfile runtime library. + +PKG_BUILD_DEPS+= pkg-config xorg-x11-proto-devel +PKG_DEPS += libX11 + +define PKG_DESCRIPTION + The flex program generates scanners. Scanners are programs which can \ + recognize lexical patterns in text. Flex takes pairs of regular \ + expressions and C code as input and generates a C source file as \ + output. The output file is compiled and linked with a library to \ + produce an executable. The executable searches through its input for \ + occurrences of the regular expressions. When a match is found, it \ + executes the corresponding C code. Flex was designed to work with \ + both Yacc and Bison, and is used by many programs as part of their \ + build process. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/libxslt/libxslt.nm b/pkgs/core/libxslt/libxslt.nm new file mode 100644 index 0000000..89d6d87 --- /dev/null +++ b/pkgs/core/libxslt/libxslt.nm @@ -0,0 +1,46 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = libxslt +PKG_VER = 1.1.26 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Libraries +PKG_URL = http://xmlsoft.org/XSLT/ +PKG_LICENSE = MIT +PKG_SUMMARY = Library providing the Gnome XSLT engine. + +PKG_BUILD_DEPS+= pkg-config +PKG_DEPS += libgcrypt libxml2 python + +define PKG_DESCRIPTION + This C library allows to transform XML files into other XML files \ + (or HTML, text, ...) using the standard XSLT stylesheet transformation \ + mechanism. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/lighttpd/lighttpd.nm b/pkgs/core/lighttpd/lighttpd.nm index 11329e0..9c2422f 100644 --- a/pkgs/core/lighttpd/lighttpd.nm +++ b/pkgs/core/lighttpd/lighttpd.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = lighttpd -PKG_VER = 1.4.26 +PKG_VER = 1.4.27 PKG_REL = 0 PKG_MAINTAINER = Michael Tremer <michael.tremer(a)ipfire.org> diff --git a/pkgs/core/network/src/functions.device b/pkgs/core/network/src/functions.device index 40e8eb4..3bf8df5 100644 --- a/pkgs/core/network/src/functions.device +++ b/pkgs/core/network/src/functions.device @@ -153,6 +153,9 @@ function device_is_real() { device_is_virtual ${device} && \ return ${EXIT_ERROR} + [ "$(__device_get_file ${device} type)" != "1" ] && \ + return ${EXIT_ERROR} + return ${EXIT_OK} } diff --git a/pkgs/core/network/src/functions.ip b/pkgs/core/network/src/functions.ip new file mode 100644 index 0000000..f95265e --- /dev/null +++ b/pkgs/core/network/src/functions.ip @@ -0,0 +1,52 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +function ip_split_prefix() { + local address=${1} + + assert isset address + + echo "${address%%/*}" +} + +function ip_get_prefix() { + local address=${1} + + assert isset address + + echo "${address##*/}" +} + +function ip_detect_protocol() { + local address=${1} + + assert isset address + + local protocol + for protocol in ipv4 ipv6; do + if ${protocol}_is_valid ${address}; then + echo "${protocol}" + return ${EXIT_OK} + fi + done + + return ${EXIT_ERROR} +} diff --git a/pkgs/core/network/src/functions.ipv4 b/pkgs/core/network/src/functions.ipv4 new file mode 100644 index 0000000..74c524a --- /dev/null +++ b/pkgs/core/network/src/functions.ipv4 @@ -0,0 +1,76 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2010 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +function ipv4_split_prefix() { + ip_split_prefix $@ +} + +function ipv4_is_valid() { + local address=${1} + + assert isset address + + # Cut the /24 if there is one given + address=$(ipv4_split_prefix ${address}) + + local IFS="." + local octet + local count + for octet in ${address}; do + if [ ${octet} -ge 0 ] && [ ${octet} -le 255 ]; then + count=$(( ${count} + 1 )) + continue + fi + + # If we get here the address was not valid + break + done + + if [ ${count} -eq 4 ]; then + return ${EXIT_OK} + fi + + return ${EXIT_ERROR} +} + +function ipv4_detect_duplicate() { + local device=${1} + local address=${2} + + assert isset address + assert isset device + assert device_exists ${device} + + if ! arping -q -c 2 -w 3 -D -I ${device} ${address}; then + log DEBUG "Detected duplicate address '${address}' on device '${device}'." + return ${EXIT_OK} + fi + + return ${EXIT_ERROR} +} + +function ipv4_update_neighbours() { + local device=${1} + local address=${2} + + arping -q -A -c 1 -I ${device} ${address} + ( sleep 2; arping -q -U -c 1 -I ${device} ${address} ) >/dev/null 2>&1 </dev/null & +} diff --git a/pkgs/core/network/src/functions.ipv6 b/pkgs/core/network/src/functions.ipv6 index 4932184..73a774b 100644 --- a/pkgs/core/network/src/functions.ipv6 +++ b/pkgs/core/network/src/functions.ipv6 @@ -19,31 +19,127 @@ # # ############################################################################### +function ipv6_init() { + log INFO "Initializing IPv6 networking." + + # Enable forwarding on all devices + ipv6_device_forwarding_disable all + ipv6_device_forwarding_disable default + + # Disable autoconfiguration on all devices per default + ipv6_device_autoconf_disable all + ipv6_device_autoconf_disable default + + # XXX do we need this? + #local device + #for device in $(devices_get_all); do + # ipv6_device_forwarding_disable ${device} + # ipv6_device_autoconf_disable ${device} + #done +} + +init_register ipv6_init + function ipv6_device_autoconf_enable() { local device=${1} - if ! device_exists ${device}; then - error "Device '${device}' does not exist." - return ${EXIT_ERROR} + assert isset device + + # Allow setting default and all settings + if ! isoneof device all default; then + assert device_exists ${device} fi - echo 1 > /proc/sys/net/ipv6/conf/${device}/autoconf + local val + for val in accept_ra accept_redirects; do + echo 1 > /proc/sys/net/ipv6/conf/${device}/${val} + done } function ipv6_device_autoconf_disable() { local device=${1} - if ! device_exists ${device}; then - error "Device '${device}' does not exist." - return ${EXIT_ERROR} + assert isset device + + # Allow setting default and all settings + if ! isoneof device all default; then + assert device_exists ${device} + fi + + local val + for val in accept_ra accept_redirects; do + echo 0 > /proc/sys/net/ipv6/conf/${device}/${val} + done +} + +function ipv6_device_forwarding_enable() { + local device=${1} + + assert isset device + + # Allow setting default and all settings + if ! isoneof device all default; then + assert device_exists ${device} + fi + + echo 1 > /proc/sys/net/ipv6/conf/${device}/forwarding +} + +function ipv6_device_forwarding_disable() { + local device=${1} + + assert isset device + + # Allow setting default and all settings + if ! isoneof device all default; then + assert device_exists ${device} fi - echo 0 > /proc/sys/net/ipv6/conf/${device}/autoconf + echo 0 > /proc/sys/net/ipv6/conf/${device}/forwarding +} + +# Enable IPv6 RFC3041 privacy extensions if desired +function ipv6_device_privacy_extensions_enable() { + local device=${1} + local type=${2} + + assert isset device + assert device_exists ${device} + + # Default value is rfc3041 + if [ -z "${type}" ]; then + type="rfc3041" + fi + + assert isset type + + case "${type}" in + rfc3041) + echo 2 > /proc/sys/net/ipv6/conf/${device}/use_tempaddr + ;; + *) + error_log "Given type '${type}' is not supported." + return ${EXIT_ERROR} + ;; + esac + + return ${EXIT_OK} +} + +function ipv6_device_privacy_extensions_disable() { + local device=${1} + + assert isset device + assert device_exists ${device} + + echo 0 > /proc/sys/net/ipv6/conf/${device}/use_tempaddr } function ipv6_is_valid() { local address=${1} + assert isset address + # Check length [ ${#address} -gt 39 ] && return ${EXIT_ERROR} @@ -63,6 +159,8 @@ function ipv6_is_valid() { function ipv6_implode() { local address=${1} + assert isset address + if ! ipv6_is_valid ${address}; then error "IPv6 address is invalid: ${address}" return ${EXIT_ERROR} @@ -161,6 +259,8 @@ function ipv6_implode() { function ipv6_explode() { local address=${1} + assert isset address + if [ ${#address} -eq 39 ]; then echo "${address}" return ${EXIT_OK} @@ -222,6 +322,8 @@ function ipv6_explode() { function ipv6_hash() { local address=${1} + assert isset address + # Explode address address=$(ipv6_explode ${address}) diff --git a/pkgs/core/network/src/hooks/zones/bridge.configs/ipv4-static b/pkgs/core/network/src/hooks/zones/bridge.configs/ipv4-static index f1fc2d6..c9462d5 100755 --- a/pkgs/core/network/src/hooks/zones/bridge.configs/ipv4-static +++ b/pkgs/core/network/src/hooks/zones/bridge.configs/ipv4-static @@ -78,9 +78,16 @@ function _up() { config_read $(zone_dir ${zone})/configs/${config} if ! zone_has_ipv4 ${zone} ${ADDRESS}/${PREFIX}; then + if ipv4_detect_duplicate ${zone} ${ADDRESS}; then + error_log "Duplicate address detected on zone '${zone}' (${ADDRESS})." + error_log "Cannot continue." + exit ${EXIT_ERROR} + fi + ip addr add ${ADDRESS}/${PREFIX} dev ${zone} - else - warning "Do not set IPv4 address '${ADDRESS}/${PREFIX}' because it was already configured on zone '${zone}'." + + # Announce our new address to the neighbours + ipv4_update_neighbours ${zone} ${ADDRESS} fi if zone_is_nonlocal ${zone} && [ -n "${GATEWAY}" ]; then diff --git a/pkgs/core/pixman/pixman.nm b/pkgs/core/pixman/pixman.nm index a54c30b..da92016 100644 --- a/pkgs/core/pixman/pixman.nm +++ b/pkgs/core/pixman/pixman.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = pixman -PKG_VER = 0.15.18 +PKG_VER = 0.18.4 PKG_REL = 0 PKG_MAINTAINER = @@ -40,7 +40,7 @@ define PKG_DESCRIPTION Pixman is a pixel manipulation library for X and cairo. endef -PKG_TARBALL = $(THISAPP).tar.bz2 +PKG_TARBALL = $(THISAPP).tar.gz # XXX double check this later on ifeq "$(TARGET)" "via-c7" diff --git a/pkgs/core/pkg-config/patches/pkg-config-0.25-autoconf-1.patch b/pkgs/core/pkg-config/patches/pkg-config-0.25-autoconf-1.patch new file mode 100644 index 0000000..8df41fc --- /dev/null +++ b/pkgs/core/pkg-config/patches/pkg-config-0.25-autoconf-1.patch @@ -0,0 +1,20 @@ +--- pkg-config-0.25/pkg.m4.~1~ 2009-12-06 21:39:02.000000000 +0100 ++++ pkg-config-0.25/pkg.m4 2010-07-07 10:07:12.000000000 +0200 +@@ -135,7 +135,7 @@ 258871_PKG_ERRORS + Consider adjusting the PKG_CONFIG_PATH environment variable if you + installed software in a non-standard prefix. + +-_PKG_TEXT])dnl ++_PKG_TEXT]) + ]) + elif test = untried; then + AC_MSG_RESULT([no]) +@@ -146,7 +146,7 @@ path to pkg-config. + + _PKG_TEXT + +-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl ++To get pkg-config, see <http://pkg-config.freedesktop.org/>.]) + ]) + else + []_CFLAGS=[][]_CFLAGS diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch new file mode 100644 index 0000000..0e52885 --- /dev/null +++ b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.4.4-64bit.patch @@ -0,0 +1,23 @@ +diff -up PyQt-x11-gpl-4.4.4/configure.py.64bit PyQt-x11-gpl-4.4.4/configure.py +--- PyQt-x11-gpl-4.4.4/configure.py.64bit 2008-11-08 05:55:49.000000000 -0600 ++++ PyQt-x11-gpl-4.4.4/configure.py 2008-11-10 14:01:14.000000000 -0600 +@@ -756,16 +756,15 @@ include(%s) + else: + # Use distutils to get the additional configuration. + from distutils.sysconfig import get_config_vars ++ from distutils.sysconfig import get_python_lib + ducfg = get_config_vars() + + if sys.platform == "darwin": + # We need to work out how to specify the right framework + # version. + link = "-framework Python" +- elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and +- glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))): +- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"]) +- link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor) ++ elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ): ++ link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor) + else: + sipconfig.inform("Qt Designer plugin disabled because Python library is static") + opts.designer_plugin = False diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch new file mode 100644 index 0000000..bafa4ec --- /dev/null +++ b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.1-pyuic_shebang.patch @@ -0,0 +1,9 @@ +diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py +--- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang 2009-06-16 03:37:46.000000000 -0500 ++++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py 2009-07-02 14:01:44.218147410 -0500 +@@ -1,3 +1,5 @@ ++#!/usr/bin/python -tt ++ + import sys + import optparse + diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch new file mode 100644 index 0000000..cfd86d6 --- /dev/null +++ b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.5.2-QT_SHARED.patch @@ -0,0 +1,19 @@ +diff -up PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED PyQt-x11-gpl-4.5.2/configure.py +--- PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED 2009-07-16 08:34:48.419358104 -0500 ++++ PyQt-x11-gpl-4.5.2/configure.py 2009-07-16 08:34:54.260358064 -0500 +@@ -1679,11 +1679,11 @@ int main(int, char **) + + out << QLibraryInfo::licensee() << '\\n'; + +-#if defined(QT_SHARED) || defined(QT_DLL) ++//#if defined(QT_SHARED) || defined(QT_DLL) + out << "shared\\n"; +-#else +- out << "\\n"; +-#endif ++//#else ++// out << "\\n"; ++//#endif + + // Determine which features should be disabled. + diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch new file mode 100644 index 0000000..91ddb7f --- /dev/null +++ b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.6.2-timestamp-multilib.patch @@ -0,0 +1,13 @@ +diff -up PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp +--- PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig 2010-02-23 12:33:44.000000000 +0100 ++++ PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp 2010-02-23 12:45:03.000000000 +0100 +@@ -399,8 +399,7 @@ RCCResourceLibrary::writeHeader(FILE *ou + fprintf(out, "# -*- coding: utf-8 -*-\n\n"); + fprintf(out, "# Resource object code\n"); + fprintf(out, "#\n"); +- fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toLatin1().constData()); +- fprintf(out, "# by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); ++ fprintf(out, "# Created by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR); + fprintf(out, "#\n"); + fprintf(out, "# WARNING! All changes made in this file will be lost!\n"); + fprintf(out, "\n"); diff --git a/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch new file mode 100644 index 0000000..2d73acd --- /dev/null +++ b/pkgs/core/pyQt/patches/PyQt-x11-gpl-4.7.2-fix-implicit-linking.patch @@ -0,0 +1,12 @@ +diff -up PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking PyQt-x11-gpl-4.7.2/configure.py +--- PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking 2010-03-18 07:08:13.000000000 -0500 ++++ PyQt-x11-gpl-4.7.2/configure.py 2010-03-18 07:09:46.157734414 -0500 +@@ -1173,7 +1173,7 @@ def compile_qt_program(name, mname, extr + opengl = (mname == "QtOpenGL") + + qt = [mname] +- if mname in ("QtOpenGL", "QtWebKit"): ++ if mname in ("QtOpenGL", "QtWebKit", "QtAssistant", "QtHelp"): + qt.append("QtCore") + + makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0, diff --git a/pkgs/core/pyQt/pyQt.nm b/pkgs/core/pyQt/pyQt.nm new file mode 100644 index 0000000..d92b00d --- /dev/null +++ b/pkgs/core/pyQt/pyQt.nm @@ -0,0 +1,56 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = pyQt +PKG_VER = 4.7.4 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Languages +PKG_URL = http://www.riverbankcomputing.com/software/pyqt/ +PKG_LICENSE = GPLv3 or GPLv2 with exceptions +PKG_SUMMARY = Python bindings for Qt4. + +PKG_BUILD_DEPS+= sip +PKG_DEPS += python qt + +define PKG_DESCRIPTION + Python bindings for Qt4 +endef + +PKG_TARBALL = PyQt-x11-gpl-$(PKG_VER).tar.gz + +DIR_APP = $(DIR_SRC)/PyQt-x11-gpl-$(PKG_VER) + +define STAGE_BUILD + cd $(DIR_APP) && python configure.py \ + --confirm-license \ + --verbose + + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef + +STAGE_INSTALLTARGET += INSTALL_ROOT=$(BUILDROOT) diff --git a/pkgs/core/python/python.nm b/pkgs/core/python/python.nm index b0e7739..2c0dc34 100644 --- a/pkgs/core/python/python.nm +++ b/pkgs/core/python/python.nm @@ -57,7 +57,9 @@ define STAGE_PREPARE_CMDS cd $(DIR_APP) && rm -rf Modules/{expat,zlib} cd $(DIR_APP) && rm -rf Modules/_ctypes/{darwin,libffi,libffi_arm_wince,libffi_msvc,libffi_osx} - cd $(DIR_APP) && autoreconf + # Remove autoconf version check and reconfigure + cd $(DIR_APP) && sed -e "s/^version_required.*//" -i configure.in + cd $(DIR_APP) && autoreconf --force endef define STAGE_BUILD diff --git a/pkgs/core/qt/qt.nm b/pkgs/core/qt/qt.nm new file mode 100644 index 0000000..1faee8e --- /dev/null +++ b/pkgs/core/qt/qt.nm @@ -0,0 +1,106 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = qt +PKG_VER = 4.7.0-beta2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = System/Libraries +PKG_URL = http://www.qtsoftware.com/ +PKG_LICENSE = LGPLv2 with exceptions or GPLv3 with exceptions +PKG_SUMMARY = Qt toolkit. + +PKG_BUILD_DEPS+= coreutils pkg-config xorg-x11-proto-devel +PKG_DEPS += fontconfig libjpeg libpng libtiff libX11 libXext pcre zlib + +define PKG_DESCRIPTION + Qt is a software toolkit for developing applications. +endef + +PKG_TARBALL = $(PKG_NAME)-everywhere-opensource-src-$(PKG_VER).tar.gz + +CONFIGURE_OPTIONS = -v \ + -prefix /usr \ + -confirm-license \ + -opensource \ + -optimized-qmake \ + -shared \ + -release \ + -largefile \ + -reduce-relocations \ + -openssl-linked \ + -fontconfig \ + -no-rpath \ + -no-pch \ + -no-qt3support \ + -no-multimedia \ + -no-audio-backend \ + -no-phonon \ + -no-phonon-backend \ + -no-svg \ + -no-javascript-jit \ + -no-cups \ + -no-gtkstyle \ + -no-nas-sound \ + -no-opengl \ + -no-openvg \ + -no-xinerama \ + -no-sql-mysql \ + -no-sql-odbc \ + -no-sql-sqlite \ + -no-sql-tds \ + -no-webkit \ + -no-script\ + -no-scripttools \ + -no-gif \ + -no-libmng \ + -no-separate-debug-info \ + -no-sm \ + -no-xshape \ + -no-xvideo \ + -no-xsync \ + -no-mmx \ + -no-sse \ + -no-sse2 \ + -no-3dnow \ + -system-libpng \ + -system-libjpeg \ + -system-libtiff \ + -system-zlib \ + -nomake demos \ + -nomake examples \ + -nomake docs + +DIR_APP = $(DIR_SRC)/$(PKG_NAME)-everywhere-opensource-src-$(PKG_VER) + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && sed -e "s/-O2/$(CFLAGS)/g" -i mkspecs/*/qmake.conf +endef + +define STAGE_INSTALL + cd $(DIR_APP) && make install INSTALL_ROOT=$(BUILDROOT) +endef diff --git a/pkgs/core/sip/sip.nm b/pkgs/core/sip/sip.nm new file mode 100644 index 0000000..df2d8c0 --- /dev/null +++ b/pkgs/core/sip/sip.nm @@ -0,0 +1,53 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = sip +PKG_VER = 4.10.5 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/Tools +PKG_URL = http://www.riverbankcomputing.com/software/sip/intro +PKG_LICENSE = GPLv2 or GPLv3 +PKG_SUMMARY = SIP - Python/C++ Bindings Generator. + +PKG_DEPS += python + +define PKG_DESCRIPTION + SIP is a tool for generating bindings for C++ classes so that they can be \ + accessed as normal Python classes. SIP takes many of its ideas from SWIG but, \ + because it is specifically designed for C++ and Python, is able to generate \ + tighter bindings. SIP is so called because it is a small SWIG. +endef + +PKG_TARBALL = $(THISAPP).tar.gz + +define STAGE_BUILD + cd $(DIR_APP) && python configure.py \ + CXXFLAGS="$(CXXFLAGS)" CFLAGS="$(CFLAGS)" + + cd $(DIR_APP) && make $(PARALLELISMFLAGS) +endef diff --git a/pkgs/core/syslinux/syslinux.nm b/pkgs/core/syslinux/syslinux.nm index 8ba2250..cebf70f 100644 --- a/pkgs/core/syslinux/syslinux.nm +++ b/pkgs/core/syslinux/syslinux.nm @@ -25,7 +25,7 @@ include $(PKGROOT)/Include PKG_NAME = syslinux -PKG_VER = 4.01 +PKG_VER = 4.02 PKG_REL = 0 PKG_MAINTAINER = diff --git a/pkgs/core/xcb-proto/xcb-proto.nm b/pkgs/core/xcb-proto/xcb-proto.nm new file mode 100644 index 0000000..94d84f3 --- /dev/null +++ b/pkgs/core/xcb-proto/xcb-proto.nm @@ -0,0 +1,46 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xcb-proto +PKG_VER = 1.6 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Headers +PKG_URL = http://xcb.freedesktop.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = XCB protocol descriptions. + +PKG_BUILD_DEPS+= pkg-config python + +define PKG_DESCRIPTION + XCB is a project to enable efficient language bindings to the X11 \ + protocol. This package contains the protocol descriptions themselves. \ + Language bindings use these protocol descriptions to generate code for \ + marshalling the protocol. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/xkeyboard-config/xkeyboard-config.nm b/pkgs/core/xkeyboard-config/xkeyboard-config.nm new file mode 100644 index 0000000..d15b1f4 --- /dev/null +++ b/pkgs/core/xkeyboard-config/xkeyboard-config.nm @@ -0,0 +1,55 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xkeyboard-config +PKG_VER = 1.9 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Utils +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X Keyboard Extension configuration data. + +PKG_BUILD_DEPS+= gettext intltool pkg-config xorg-x11-util-macros +PKG_DEPS += xorg-x11-xkb-utils + +define PKG_DESCRIPTION + This package contains configuration data used by the X Keyboard \ + Extension (XKB), which allows selection of keyboard layouts when \ + using a graphical interface. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CONFIGURE_OPTIONS += \ + --disable-static \ + --with-xkb-base=/usr/share/X11/xkb \ + --disable-xkbcomp-symlink \ + --with-xkb-rules-symlink=xorg + +STAGE_INSTALL_TARGETS += \ + INSTALL="install -p" diff --git a/pkgs/core/xorg-server/10-quirks.conf b/pkgs/core/xorg-server/10-quirks.conf new file mode 100644 index 0000000..82d3ec2 --- /dev/null +++ b/pkgs/core/xorg-server/10-quirks.conf @@ -0,0 +1,20 @@ +# Collection of quirks and blacklist/whitelists for specific devices. + + +# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable +# http://bugs.freedesktop.org/show_bug.cgi?id=22442 +Section "InputClass" + Identifier "ThinkPad HDAPS accelerometer blacklist" + MatchProduct "ThinkPad HDAPS accelerometer data" + Option "Ignore" "on" +EndSection + +# https://bugzilla.redhat.com/show_bug.cgi?id=523914 +# Mouse does not move in PV Xen guest +# Explicitly tell evdev to not ignore the absolute axes. +Section "InputClass" + Identifier "Xen Virtual Pointer axis blacklist" + MatchProduct "Xen Virtual Pointer" + Option "IgnoreAbsoluteAxes" "off" + Option "IgnoreRelativeAxes" "off" +EndSection diff --git a/pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch b/pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch new file mode 100644 index 0000000..d040900 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch @@ -0,0 +1,25 @@ +From 04bd8e2fa6be557f58a0e417b0f3befc56f5ef59 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Thu, 1 Jul 2010 15:45:03 +1000 +Subject: [PATCH] Build libxf86config with -fPIC. + +--- + hw/xfree86/parser/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am +index caf7079..655e73f 100644 +--- a/hw/xfree86/parser/Makefile.am ++++ b/hw/xfree86/parser/Makefile.am +@@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \ + + libxf86config_a_SOURCES = \ + $(INTERNAL_SOURCES) +-libxf86config_a_CFLAGS = $(AM_CFLAGS) ++libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC -fvisibility=hidden + + AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ + -DSYSCONFDIR=\"$(sysconfdir)\" \ +-- +1.7.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch new file mode 100644 index 0000000..d532fe1 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch @@ -0,0 +1,48 @@ +From 4306b434038de7e2b17d3c4a6cfd87db469d3bda Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Mon, 10 Dec 2007 11:26:57 -0500 +Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients. + +--- + Xext/shm.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +diff --git a/Xext/shm.c b/Xext/shm.c +index 5937a03..5376c19 100644 +--- a/Xext/shm.c ++++ b/Xext/shm.c +@@ -381,8 +381,21 @@ + mode_t mask; + int uidset = 0, gidset = 0; + LocalClientCredRec *lcc; ++ Bool is_ssh = FALSE; + + if (GetLocalClientCreds(client, &lcc) != -1) { ++#ifdef linux ++ if (lcc->fieldsSet & LCC_PID_SET) { ++ /* ssh isn't actually a local client */ ++ char exe[64], buf[64]; ++ ++ memset(buf, 0, 64); ++ snprintf(exe, 64, "/proc/%d/exe", lcc->pid); ++ readlink(exe, buf, 63); ++ if (strstr(buf, "/ssh")) ++ is_ssh = TRUE; ++ } ++#endif + + if (lcc->fieldsSet & LCC_UID_SET) { + uid = lcc->euid; +@@ -401,6 +414,9 @@ + } + #endif + FreeLocalClientCreds(lcc); ++ ++ if (is_ssh) ++ return -1; + + if (uidset) { + /* User id 0 always gets access */ +-- +1.5.3.4 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch b/pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch new file mode 100644 index 0000000..ae65d0b --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch @@ -0,0 +1,155 @@ +From eff3bb9c6f0b71a57705885a3fe6e6469d252d2b Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Wed, 20 Jan 2010 14:46:12 +1300 +Subject: [PATCH] Add nr for background=none root + +--- + dix/globals.c | 1 + + dix/window.c | 12 +++++++----- + hw/xfree86/common/xf86Init.c | 11 +++++++++++ + hw/xfree86/common/xf86str.h | 5 ++++- + include/opaque.h | 1 + + os/utils.c | 3 +++ + 6 files changed, 27 insertions(+), 6 deletions(-) + +diff --git a/dix/globals.c b/dix/globals.c +index c24a94f..907a5e8 100644 +--- a/dix/globals.c ++++ b/dix/globals.c +@@ -124,6 +124,7 @@ FontPtr defaultFont; /* not declared in dix.h to avoid including font.h in + CursorPtr rootCursor; + Bool party_like_its_1989 = FALSE; + Bool whiteRoot = FALSE; ++Bool bgNoneRoot = FALSE; + + int cursorScreenDevPriv[MAXSCREENS]; + +diff --git a/dix/window.c b/dix/window.c +index caff1cb..be1d1c4 100644 +--- a/dix/window.c ++++ b/dix/window.c +@@ -466,22 +466,24 @@ InitRootWindow(WindowPtr pWin) + pWin->optional->cursor = rootCursor; + rootCursor->refcnt++; + ++ pWin->backingStore = defaultBackingStore; ++ pWin->forcedBS = (defaultBackingStore != NotUseful); + + if (party_like_its_1989) { + MakeRootTile(pWin); + backFlag |= CWBackPixmap; ++ pScreen->ChangeWindowAttributes(pWin, backFlag); ++ } else if (bgNoneRoot) { ++ /* nothing, handled in xf86CreateRootWindow */ + } else { + if (whiteRoot) + pWin->background.pixel = pScreen->whitePixel; + else + pWin->background.pixel = pScreen->blackPixel; + backFlag |= CWBackPixel; +- } + +- pWin->backingStore = defaultBackingStore; +- pWin->forcedBS = (defaultBackingStore != NotUseful); +- /* We SHOULD check for an error value here XXX */ +- (*pScreen->ChangeWindowAttributes)(pWin, backFlag); ++ pScreen->ChangeWindowAttributes(pWin, backFlag); ++ } + + MapWindow(pWin, serverClient); + } +diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c +index 6707448..776b898 100644 +--- a/hw/xfree86/common/xf86Init.c ++++ b/hw/xfree86/common/xf86Init.c +@@ -77,6 +77,7 @@ + #ifdef RENDER + #include "picturestr.h" + #endif ++#include "xace.h" + + #include "xf86VGAarbiter.h" + #include "globals.h" +@@ -254,6 +255,7 @@ xf86CreateRootWindow(WindowPtr pWin) + int ret = TRUE; + int err = Success; + ScreenPtr pScreen = pWin->drawable.pScreen; ++ ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + RootWinPropPtr pProp; + CreateWindowProcPtr CreateWindow = (CreateWindowProcPtr) + dixLookupPrivate(&pScreen->devPrivates, xf86CreateRootWindowKey); +@@ -305,6 +307,15 @@ xf86CreateRootWindow(WindowPtr pWin) + } + } + ++ if (bgNoneRoot && pScrn->canDoBGNoneRoot) { ++ pWin->backgroundState = XaceBackgroundNoneState(pWin); ++ pWin->background.pixel = pScreen->whitePixel; ++ pScreen->ChangeWindowAttributes(pWin, CWBackPixmap | CWBorderPixel | CWCursor | CWBackingStore); ++ } else { ++ pWin->background.pixel = pScreen->blackPixel; ++ pScreen->ChangeWindowAttributes(pWin, CWBackPixel | CWBorderPixel | CWCursor | CWBackingStore); ++ } ++ + DebugF("xf86CreateRootWindow() returns %d\n", ret); + return (ret); + } +diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h +index de1f1b6..5c3aa00 100644 +--- a/hw/xfree86/common/xf86str.h ++++ b/hw/xfree86/common/xf86str.h +@@ -503,7 +503,7 @@ typedef struct _confdrirec { + } confDRIRec, *confDRIPtr; + + /* These values should be adjusted when new fields are added to ScrnInfoRec */ +-#define NUM_RESERVED_INTS 16 ++#define NUM_RESERVED_INTS 15 + #define NUM_RESERVED_POINTERS 14 + #define NUM_RESERVED_FUNCS 11 + +@@ -775,6 +775,9 @@ typedef struct _ScrnInfoRec { + ClockRangePtr clockRanges; + int adjustFlags; + ++ /* -nr support */ ++ int canDoBGNoneRoot; ++ + /* + * These can be used when the minor ABI version is incremented. + * The NUM_* parameters must be reduced appropriately to keep the +diff --git a/include/opaque.h b/include/opaque.h +index b3c7c70..fcc8c95 100644 +--- a/include/opaque.h ++++ b/include/opaque.h +@@ -71,6 +71,7 @@ extern _X_EXPORT Bool defeatAccessControl; + extern _X_EXPORT long maxBigRequestSize; + extern _X_EXPORT Bool party_like_its_1989; + extern _X_EXPORT Bool whiteRoot; ++extern _X_EXPORT Bool bgNoneRoot; + + extern _X_EXPORT Bool CoreDump; + +diff --git a/os/utils.c b/os/utils.c +index d7c8388..40583d0 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -513,6 +513,7 @@ void UseMsg(void) + #endif + ErrorF("-nolisten string don't listen on protocol\n"); + ErrorF("-noreset don't reset after last client exists\n"); ++ ErrorF("-nr create root window with no background\n"); + ErrorF("-reset reset after last client exists\n"); + ErrorF("-p # screen-saver pattern duration (minutes)\n"); + ErrorF("-pn accept failure to listen on all ports\n"); +@@ -856,6 +857,8 @@ ProcessCommandLine(int argc, char *argv[]) + defaultBackingStore = WhenMapped; + else if ( strcmp( argv[i], "-wr") == 0) + whiteRoot = TRUE; ++ else if ( strcmp( argv[i], "-nr") == 0) ++ bgNoneRoot = TRUE; + else if ( strcmp( argv[i], "-maxbigreqsize") == 0) { + if(++i < argc) { + long reqSizeArg = atol(argv[i]); +-- +1.6.6 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch b/pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch new file mode 100644 index 0000000..c6178b8 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch @@ -0,0 +1,32 @@ +From dc5cedd61e00afec33cbfaa7fdfbb6c357074dbd Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann(a)redhat.com> +Date: Thu, 11 Sep 2008 12:51:31 -0400 +Subject: [PATCH] Make room for an external monitor if we have enough video RAM + +--- + hw/xfree86/modes/xf86Crtc.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 4de7e05..9bcf81b 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -987,6 +987,15 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, + if (crtc_height > height) + height = crtc_height; + } ++ ++ /* Make room for an external monitor if we have enough video ram */ ++ if (scrn->videoRam >= 65536) ++ width += 1920; ++ else if (scrn->videoRam >= 32768) ++ width += 1280; ++ else if (scrn->videoRam >= 16384) ++ width += 1024; ++ + if (config->maxWidth && width > config->maxWidth) width = config->maxWidth; + if (config->maxHeight && height > config->maxHeight) height = config->maxHeight; + if (config->minWidth && width < config->minWidth) width = config->minWidth; +-- +1.6.0.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch b/pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch new file mode 100644 index 0000000..11fe5ad --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch @@ -0,0 +1,26 @@ +From 079910986a1b8f5042e16ee2ba3ad9ed843b67ca Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Tue, 7 Oct 2008 11:09:14 -0400 +Subject: [PATCH] Force ModeDebug on. + +--- + hw/xfree86/modes/xf86Crtc.c | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 9bcf81b..a953c8a 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -2084,8 +2084,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + xf86ProcessOptions (scrn->scrnIndex, + scrn->options, + config->options); +- config->debug_modes = xf86ReturnOptValBool (config->options, +- OPTION_MODEDEBUG, FALSE); ++ config->debug_modes = TRUE; + + if (scrn->display->virtualX) + width = scrn->display->virtualX; +-- +1.6.0.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch b/pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch new file mode 100644 index 0000000..09e7b49 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch @@ -0,0 +1,172 @@ +From 1766352059d0db67bff3f7dd0820563a30f54858 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Thu, 18 Jun 2009 16:56:41 +1000 +Subject: [PATCH] displayfd hack + +--- + dix/globals.c | 1 + + include/opaque.h | 1 + + os/connection.c | 72 ++++++++++++++++++++++++++++++++++++----------------- + os/utils.c | 11 ++++++++ + 4 files changed, 62 insertions(+), 23 deletions(-) + +diff --git a/dix/globals.c b/dix/globals.c +index 907a5e8..c1e64d3 100644 +--- a/dix/globals.c ++++ b/dix/globals.c +@@ -135,6 +135,7 @@ int defaultColorVisualClass = -1; + int monitorResolution = 0; + + char *display; ++int displayfd; + char *ConnectionInfo; + + CARD32 TimeOutValue = DEFAULT_TIMEOUT * MILLI_PER_SECOND; +diff --git a/include/opaque.h b/include/opaque.h +index fcc8c95..2a08e2d 100644 +--- a/include/opaque.h ++++ b/include/opaque.h +@@ -50,6 +50,7 @@ extern _X_EXPORT int ScreenSaverAllowExposures; + extern _X_EXPORT int defaultScreenSaverBlanking; + extern _X_EXPORT int defaultScreenSaverAllowExposures; + extern _X_EXPORT char *display; ++extern _X_EXPORT int displayfd; + + extern _X_EXPORT int defaultBackingStore; + extern _X_EXPORT Bool disableBackingStore; +diff --git a/os/connection.c b/os/connection.c +index 0c72b67..05d95c4 100644 +--- a/os/connection.c ++++ b/os/connection.c +@@ -146,6 +146,7 @@ Bool NewOutputPending; /* not yet attempted to write some new output */ + Bool AnyClientsWriteBlocked; /* true if some client blocked on write */ + + static Bool RunFromSmartParent; /* send SIGUSR1 to parent process */ ++static char dynamic_display[7]; + Bool PartialNetwork; /* continue even if unable to bind all addrs */ + static Pid_t ParentProcess; + +@@ -357,9 +358,23 @@ NotifyParentProcess(void) + kill (ParentProcess, SIGUSR1); + } + } ++ if (dynamic_display[0]) ++ write(displayfd, dynamic_display, strlen(dynamic_display)); + #endif + } + ++static Bool ++TryCreateSocket(int num, int *partial) ++{ ++ char port[20]; ++ ++ sprintf(port, "%d", num); ++ ++ return _XSERVTransMakeAllCOTSServerListeners(port, partial, ++ &ListenTransCount, ++ &ListenTransConns); ++} ++ + /***************** + * CreateWellKnownSockets + * At initialization, create the sockets to listen on for new clients. +@@ -370,7 +385,6 @@ CreateWellKnownSockets(void) + { + int i; + int partial; +- char port[20]; + + FD_ZERO(&AllSockets); + FD_ZERO(&AllClients); +@@ -385,32 +399,44 @@ CreateWellKnownSockets(void) + + FD_ZERO (&WellKnownConnections); + +- sprintf (port, "%d", atoi (display)); +- +- if ((_XSERVTransMakeAllCOTSServerListeners (port, &partial, +- &ListenTransCount, &ListenTransConns) >= 0) && +- (ListenTransCount >= 1)) ++ if (display) + { +- if (!PartialNetwork && partial) +- { +- FatalError ("Failed to establish all listening sockets"); +- } +- else ++ if (TryCreateSocket(atoi(display), &partial) && ++ (ListenTransCount >= 1)) ++ if (!PartialNetwork && partial) ++ FatalError ("Failed to establish all listening sockets"); ++ } ++ else /* -displayfd */ ++ { ++ Bool found = 0; ++ for (i = 0; i < 65535 - 1024; i++) + { +- ListenTransFds = xalloc (ListenTransCount * sizeof (int)); +- +- for (i = 0; i < ListenTransCount; i++) ++ if (!TryCreateSocket(i, &partial) && !partial) + { +- int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]); +- +- ListenTransFds[i] = fd; +- FD_SET (fd, &WellKnownConnections); +- +- if (!_XSERVTransIsLocal (ListenTransConns[i])) +- { +- DefineSelf (fd); +- } ++ found = 1; ++ break; + } ++ else ++ CloseWellKnownConnections(); ++ } ++ if (!found) ++ FatalError("Failed to find a socket to listen on"); ++ sprintf(dynamic_display, "%d\n", i); ++ display = dynamic_display; ++ } ++ ++ ListenTransFds = xalloc (ListenTransCount * sizeof (int)); ++ ++ for (i = 0; i < ListenTransCount; i++) ++ { ++ int fd = _XSERVTransGetConnectionNumber (ListenTransConns[i]); ++ ++ ListenTransFds[i] = fd; ++ FD_SET (fd, &WellKnownConnections); ++ ++ if (!_XSERVTransIsLocal (ListenTransConns[i])) ++ { ++ DefineSelf (fd); + } + } + +diff --git a/os/utils.c b/os/utils.c +index 7bfdf8b..37a93b1 100644 +--- a/os/utils.c ++++ b/os/utils.c +@@ -678,6 +678,17 @@ ProcessCommandLine(int argc, char *argv[]) + else + UseMsg(); + } ++ else if (strcmp(argv[i], "-displayfd") == 0) ++ { ++ if (++i < argc) ++ { ++ displayfd = atoi(argv[i]); ++ display = NULL; ++ nolock = TRUE; ++ } ++ else ++ UseMsg(); ++ } + #ifdef DPMSExtension + else if ( strcmp( argv[i], "dpms") == 0) + /* ignored for compatibility */ ; +-- +1.6.3.rc1.2.g0164.dirty + diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch new file mode 100644 index 0000000..cc80e6c --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch @@ -0,0 +1,31 @@ +From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Wed, 11 Mar 2009 14:02:11 -0400 +Subject: [PATCH] Don't build the ACPI code. + +No good can come of this. +--- + configure.ac | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 72ae67e..04716f8 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1269,13 +1269,11 @@ if test "x$XORG" = xyes; then + case $host_cpu in + ia64*) + linux_ia64=yes +- linux_acpi="yes" + ;; + alpha*) + linux_alpha=yes + ;; + i*86|amd64*|x86_64*) +- linux_acpi="yes" + ;; + *) + ;; +-- +1.6.1.3 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch b/pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch new file mode 100644 index 0000000..35a1ff9 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch @@ -0,0 +1,109 @@ +From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Tue, 16 Feb 2010 11:38:17 +1000 +Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs + +Also, don't treat DRI setup failure as an error for nouveau. +--- + glx/glxdri.c | 7 +++++-- + glx/glxdri2.c | 7 +++++-- + hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++- + 3 files changed, 28 insertions(+), 5 deletions(-) + +diff --git a/glx/glxdri.c b/glx/glxdri.c +index 21e44d1..30b820c 100644 +--- a/glx/glxdri.c ++++ b/glx/glxdri.c +@@ -968,6 +968,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + const __DRIconfig **driConfigs; + const __DRIextension **extensions; + int i; ++ int from = X_ERROR; + + if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || + !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || +@@ -1047,7 +1048,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + if (screen->driver == NULL) { +- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", ++ if (!strcmp(driverName, "nouveau")) ++ from = X_INFO; ++ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", + filename, dlerror()); + goto handle_error; + } +@@ -1184,7 +1187,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + xfree(screen); + +- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); ++ LogMessage(from, "AIGLX: reverting to software rendering\n"); + + return NULL; + } +diff --git a/glx/glxdri2.c b/glx/glxdri2.c +index 0f998de..a244809 100644 +--- a/glx/glxdri2.c ++++ b/glx/glxdri2.c +@@ -676,6 +676,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + const __DRIextension **extensions; + const __DRIconfig **driConfigs; + int i; ++ int from = X_ERROR; + + screen = xcalloc(1, sizeof *screen); + if (screen == NULL) +@@ -702,7 +703,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); + if (screen->driver == NULL) { +- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", ++ if (!strcmp(driverName, "nouveau")) ++ from = X_INFO; ++ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", + filename, dlerror()); + goto handle_error; + } +@@ -793,7 +796,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) + + xfree(screen); + +- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); ++ LogMessage(from, "AIGLX: reverting to software rendering\n"); + + return NULL; + } +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index 7f4ada8..d964c6c 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -192,7 +192,24 @@ videoPtrToDriverList(struct pci_device *dev, + break; + case 0x102b: driverList[0] = "mga"; break; + case 0x10c8: driverList[0] = "neomagic"; break; +- case 0x10de: case 0x12d2: driverList[0] = "nv"; break; ++ case 0x10de: case 0x12d2: ++ switch (dev->device_id) { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[0] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[0] = "nv"; ++ break; ++ default: ++ driverList[0] = "nouveau"; ++ driverList[1] = "nv"; ++ break; ++ } ++ break; + case 0x1106: driverList[0] = "openchrome"; break; + case 0x1b36: driverList[0] = "qxl"; break; + case 0x1163: driverList[0] = "rendition"; break; +-- +1.6.5.2 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch b/pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch new file mode 100644 index 0000000..0f0ba27 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch @@ -0,0 +1,35 @@ +From ca85ebddd804305322014c6a71b4122a56c5e634 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Thu, 4 Mar 2010 15:18:38 +1000 +Subject: [PATCH] tweak default mode list yet again + +--- + hw/xfree86/modes/xf86Crtc.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 03277be..571ffd0 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1582,7 +1582,7 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) + int min_clock = 0; + int max_clock = 0; + double clock; +- Bool add_default_modes = TRUE; ++ Bool add_default_modes; + Bool debug_modes = config->debug_modes || + xf86Initialising; + enum det_monrec_source sync_source = sync_default; +@@ -1628,6 +1628,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) + } + + output_modes = (*output->funcs->get_modes) (output); ++ ++ /* if the driver found modes, don't second-guess it */ ++ add_default_modes = (output_modes == NULL); + + edid_monitor = output->MonInfo; + +-- +1.6.6.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch b/pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch new file mode 100644 index 0000000..0e7a6ba --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch @@ -0,0 +1,42 @@ +From 16be69ef1e2ea9f19cd596b99b5ede7567d374b8 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Mon, 27 Jul 2009 16:52:42 -0400 +Subject: [PATCH 11/16] additional randr debugging + +--- + randr/randr.c | 16 +++++++++++++++- + 1 files changed, 15 insertions(+), 1 deletions(-) + +diff --git a/randr/randr.c b/randr/randr.c +index 1c1d0c4..accf614 100644 +--- a/randr/randr.c ++++ b/randr/randr.c +@@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode) + static int + ProcRRDispatch (ClientPtr client) + { ++ int ret; + REQUEST(xReq); + if (stuff->data >= RRNumberRequests || !ProcRandrVector[stuff->data]) + return BadRequest; +- return (*ProcRandrVector[stuff->data]) (client); ++ ret = ProcRandrVector[stuff->data](client); ++ ++ if (ret) { ++ int i; ++ ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase); ++ for (i = 0; i < stuff->length; i++) { ++ ErrorF("%08x ", ((unsigned int *)stuff) + i); ++ if ((i+1) % 4 == 0) ++ ErrorF("\n"); ++ } ++ ErrorF("\n"); ++ } ++ ++ return ret; + } + + static int +-- +1.6.4.2 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch b/pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch new file mode 100644 index 0000000..06c1183 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch @@ -0,0 +1,172 @@ +From 1766ae8a69daa06730e41d094fdddf53db3a1a9e Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Tue, 28 Jul 2009 11:07:13 -0400 +Subject: [PATCH] RANDR: right-of placement by default + +[Enhanced to add a new prefer clone option for drivers. This +allows for servers like RN50 where two heads are disjoint. - airlied] + +[Enhanced to ignore rightof on single crtc cards - airlied] +--- + hw/xfree86/common/xf86str.h | 9 ++++- + hw/xfree86/modes/xf86Crtc.c | 77 +++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 77 insertions(+), 9 deletions(-) + +diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h +index 5c3aa00..8224668 100644 +--- a/hw/xfree86/common/xf86str.h ++++ b/hw/xfree86/common/xf86str.h +@@ -503,10 +503,13 @@ typedef struct _confdrirec { + } confDRIRec, *confDRIPtr; + + /* These values should be adjusted when new fields are added to ScrnInfoRec */ +-#define NUM_RESERVED_INTS 15 ++#define NUM_RESERVED_INTS 14 + #define NUM_RESERVED_POINTERS 14 + #define NUM_RESERVED_FUNCS 11 + ++/* let clients know they can use this */ ++#define XF86_SCRN_HAS_PREFER_CLONE 1 ++ + typedef pointer (*funcPointer)(void); + + /* flags for depth 24 pixmap options */ +@@ -672,7 +675,6 @@ typedef void xf86SetOverscanProc (ScrnInfoPtr, int); + * are to be dependent on compile-time defines. + */ + +- + typedef struct _ScrnInfoRec { + int driverVersion; + char * driverName; /* canonical name used in */ +@@ -778,6 +780,9 @@ typedef struct _ScrnInfoRec { + /* -nr support */ + int canDoBGNoneRoot; + ++ /* initial rightof support disable */ ++ int preferClone; ++ + /* + * These can be used when the minor ABI version is incremented. + * The NUM_* parameters must be reduced appropriately to keep the +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index a66c979..4d14f57 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1146,6 +1146,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) + int o; + int min_x, min_y; + ++ /* check for initial right-of heuristic */ ++ for (o = 0; o < config->num_output; o++) ++ { ++ xf86OutputPtr output = config->output[o]; ++ ++ if (output->initial_x || output->initial_y) ++ return TRUE; ++ } ++ + for (o = 0; o < config->num_output; o++) + { + xf86OutputPtr output = config->output[o]; +@@ -2028,6 +2037,60 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) + return match; + } + ++static int ++numEnabledOutputs(xf86CrtcConfigPtr config, Bool *enabled) ++{ ++ int i = 0, p; ++ ++ for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ; ++ ++ return i; ++} ++ ++static Bool ++xf86TargetRightOf(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, ++ DisplayModePtr *modes, Bool *enabled, ++ int width, int height) ++{ ++ int o; ++ int w = 0; ++ ++ if (config->num_crtc == 1) ++ return FALSE; ++ ++ if (scrn->preferClone) ++ return FALSE; ++ ++ if (numEnabledOutputs(config, enabled) < 2) ++ return FALSE; ++ ++ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { ++ DisplayModePtr mode = ++ xf86OutputHasPreferredMode(config->output[o], width, height); ++ ++ if (!mode) ++ return FALSE; ++ ++ w += mode->HDisplay; ++ } ++ ++ if (w > width) ++ return FALSE; ++ ++ w = 0; ++ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { ++ DisplayModePtr mode = ++ xf86OutputHasPreferredMode(config->output[o], width, height); ++ ++ config->output[o]->initial_x = w; ++ w += mode->HDisplay; ++ ++ modes[o] = mode; ++ } ++ ++ return TRUE; ++} ++ + static Bool + xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + DisplayModePtr *modes, Bool *enabled, +@@ -2085,13 +2148,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + * biggest mode for its aspect ratio, assuming one exists. + */ + if (!ret) do { +- int i = 0; + float aspect = 0.0; + +- /* count the number of enabled outputs */ +- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ; +- +- if (i != 1) ++ if (numEnabledOutputs(config, enabled) != 1) + break; + + p = -1; +@@ -2378,6 +2437,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + + if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); ++ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); + else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) + xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); + else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) +@@ -2394,8 +2455,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + config->output[o]->name); + else + xf86DrvMsg (scrn->scrnIndex, X_INFO, +- "Output %s using initial mode %s\n", +- config->output[o]->name, modes[o]->name); ++ "Output %s using initial mode %s +%d+%d\n", ++ config->output[o]->name, modes[o]->name, ++ config->output[o]->initial_x, ++ config->output[o]->initial_y); + } + + /* +-- +1.7.0.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch b/pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch new file mode 100644 index 0000000..5206141 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch @@ -0,0 +1,36 @@ +From 18d2bd8cb513a0436739916620532247f13dbf03 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Thu, 8 Oct 2009 15:25:24 -0400 +Subject: [PATCH] randr gamma reload hack + +--- + hw/xfree86/loader/sdksyms.c | 4 ++++ + hw/xfree86/modes/xf86RandR12.c | 6 ++++++ + 2 files changed, 10 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c +index 6ea9d26..41bac11 100644 +--- a/hw/xfree86/modes/xf86RandR12.c ++++ b/hw/xfree86/modes/xf86RandR12.c +@@ -1746,12 +1746,18 @@ xf86RandR12EnterVT (int screen_index, int flags) + { + ScreenPtr pScreen = screenInfo.screens[screen_index]; + XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); ++ rrScrPrivPtr rp = rrGetScrPriv(pScreen); + + if (randrp->orig_EnterVT) { + if (!randrp->orig_EnterVT (screen_index, flags)) + return FALSE; + } + ++ /* reload gamma */ ++ int i; ++ for (i = 0; i < rp->numCrtcs; i++) ++ xf86RandR12CrtcSetGamma(pScreen, rp->crtcs[i]); ++ + return RRGetInfo (pScreen, TRUE); /* force a re-probe of outputs and notify clients about changes */ + } + +-- +1.6.5.rc2 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch b/pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch new file mode 100644 index 0000000..c62837e --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch @@ -0,0 +1,34 @@ +From acc64ce5be7383c09e88a23aab06ebc2403f2ca3 Mon Sep 17 00:00:00 2001 +From: Bill Nottingham <notting(a)redhat.com> +Date: Fri, 6 Nov 2009 10:32:27 +1000 +Subject: [PATCH] fix KDM gamma issue on vt switch + +--- + hw/xfree86/modes/xf86RandR12.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c +index 6ea9d26..ece12b9 100644 +--- a/hw/xfree86/modes/xf86RandR12.c ++++ b/hw/xfree86/modes/xf86RandR12.c +@@ -1761,6 +1761,7 @@ xf86RandR12Init12 (ScreenPtr pScreen) + ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + rrScrPrivPtr rp = rrGetScrPriv(pScreen); + XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen); ++ int i; + + rp->rrGetInfo = xf86RandR12GetInfo12; + rp->rrScreenSetSize = xf86RandR12ScreenSetSize; +@@ -1790,6 +1791,9 @@ xf86RandR12Init12 (ScreenPtr pScreen) + */ + if (!xf86RandR12SetInfo12 (pScreen)) + return FALSE; ++ for (i = 0; i < rp->numCrtcs; i++) { ++ xf86RandR12CrtcGetGamma(pScreen, rp->crtcs[i]); ++ } + return TRUE; + } + +-- +1.6.5.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch b/pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch new file mode 100644 index 0000000..6435999 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch @@ -0,0 +1,55 @@ +From 6d9585ba6a5784328de479c6b648d7b7d6cec64c Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax(a)redhat.com> +Date: Thu, 29 Oct 2009 19:04:10 -0400 +Subject: [PATCH] multilib fix for -devel subpackage + +--- + include/colormapst.h | 4 ++-- + include/xorg-server.h.in | 7 ++++--- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/include/colormapst.h b/include/colormapst.h +index f1fc8eb..274cd65 100644 +--- a/include/colormapst.h ++++ b/include/colormapst.h +@@ -103,12 +103,12 @@ typedef struct _ColormapRec + { + VisualPtr pVisual; + short class; /* PseudoColor or DirectColor */ +-#if defined(_XSERVER64) ++#ifdef __LP64__ + short pad0; + XID pad1; + #endif + XID mid; /* client's name for colormap */ +-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) ++#if defined(__LP64__) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) + XID pad2; + #endif + ScreenPtr pScreen; /* screen map is associated with */ +diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in +index 76cab16..081b8f3 100644 +--- a/include/xorg-server.h.in ++++ b/include/xorg-server.h.in +@@ -157,9 +157,6 @@ + /* Name of X server */ + #undef __XSERVERNAME__ + +-/* Define to 1 if unsigned long is 64 bits. */ +-#undef _XSERVER64 +- + /* Building vgahw module */ + #undef WITH_VGAHW + +@@ -187,4 +184,8 @@ + /* X Access Control Extension */ + #undef XACE + ++#ifdef __LP64__ ++#define _XSERVER64 1 ++#endif ++ + #endif /* _XORG_SERVER_H_ */ +-- +1.6.5.2 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch b/pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch new file mode 100644 index 0000000..60c0dce --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch @@ -0,0 +1,25 @@ +From 1f315578bf759c85261b1f2295efbf0dba852f73 Mon Sep 17 00:00:00 2001 +From: Adam Williamson <adamwill(a)shaw.ca> +Date: Thu, 25 Feb 2010 10:34:49 -0800 +Subject: [PATCH] disable vboxvideo driver in autodetect code + +--- + hw/xfree86/common/xf86AutoConfig.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c +index 7f4ada8..4e944ea 100644 +--- a/hw/xfree86/common/xf86AutoConfig.c ++++ b/hw/xfree86/common/xf86AutoConfig.c +@@ -220,7 +220,7 @@ videoPtrToDriverList(struct pci_device *dev, + case 0x1011: driverList[0] = "tga"; break; + case 0x1023: driverList[0] = "trident"; break; + case 0x100c: driverList[0] = "tseng"; break; +- case 0x80ee: driverList[0] = "vboxvideo"; break; ++ case 0x80ee: driverList[0] = "vesa"; break; + case 0x15ad: driverList[0] = "vmware"; break; + case 0x18ca: + if (dev->device_id == 0x47) +-- +1.7.0 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch b/pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch new file mode 100644 index 0000000..3ee8542 --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch @@ -0,0 +1,142 @@ +From b27f93c6dbe0a6e416db2c65738e996c70a403c1 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <airlied(a)redhat.com> +Date: Thu, 6 May 2010 12:55:34 +1000 +Subject: [PATCH] xf86: allow for no outputs connected at startup operation. + +When nothing is connected at startup and we canGrow, allow the server to start with a 1024x768 framebuffer, and when the drivers send hotplug events this will expand to the correct size dynamically. + +Signed-off-by: Dave Airlie <airlied(a)redhat.com> +--- + hw/xfree86/modes/xf86Crtc.c | 66 ++++++++++++++++++++++++++++++------------ + 1 files changed, 47 insertions(+), 19 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 571ffd0..99082ec 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -48,6 +48,8 @@ + + #include "xf86xv.h" + ++#define NO_OUTPUT_DEFAULT_WIDTH 1024 ++#define NO_OUTPUT_DEFAULT_HEIGHT 768 + /* + * Initialize xf86CrtcConfig structure + */ +@@ -1946,7 +1948,7 @@ xf86SetScrnInfoModes (ScrnInfoPtr scrn) + #endif + } + +-static void ++static Bool + xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + Bool *enabled) + { +@@ -1961,8 +1963,10 @@ xf86CollectEnabledOutputs(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, + "No outputs definitely connected, trying again...\n"); + + for (o = 0; o < config->num_output; o++) +- enabled[o] = xf86OutputEnabled(config->output[o], FALSE); ++ any_enabled |= enabled[o] = xf86OutputEnabled(config->output[o], FALSE); + } ++ ++ return any_enabled; + } + + static Bool +@@ -2409,6 +2413,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + Bool *enabled; + int width, height; + int i = scrn->scrnIndex; ++ Bool have_outputs = TRUE; ++ Bool ret; + + /* Set up the device options */ + config->options = xnfalloc (sizeof (xf86DeviceOptions)); +@@ -2433,20 +2439,26 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + modes = xnfcalloc (config->num_output, sizeof (DisplayModePtr)); + enabled = xnfcalloc (config->num_output, sizeof (Bool)); + +- xf86CollectEnabledOutputs(scrn, config, enabled); +- +- if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); +- else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); +- else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); +- else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); +- else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) +- xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); +- else +- xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); ++ ret = xf86CollectEnabledOutputs(scrn, config, enabled); ++ if (ret == FALSE && canGrow) { ++ xf86DrvMsg(i, X_WARNING, "Unable to find connected outputs - setting %dx%d initial framebuffer\n", ++ NO_OUTPUT_DEFAULT_WIDTH, NO_OUTPUT_DEFAULT_HEIGHT); ++ have_outputs = FALSE; ++ } ++ else { ++ if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); ++ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); ++ else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); ++ else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using fuzzy aspect match for initial modes\n"); ++ else if (xf86TargetFallback(scrn, config, modes, enabled, width, height)) ++ xf86DrvMsg(i, X_INFO, "Using sloppy heuristic for initial modes\n"); ++ else ++ xf86DrvMsg(i, X_WARNING, "Unable to find initial modes\n"); ++ } + + for (o = -1; nextEnabledOutput(config, enabled, &o); ) { + if (!modes[o]) +@@ -2479,7 +2491,7 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + /* + * Assign CRTCs to fit output configuration + */ +- if (!xf86PickCrtcs (scrn, crtcs, modes, 0, width, height)) ++ if (have_outputs && !xf86PickCrtcs (scrn, crtcs, modes, 0, width, height)) + { + xfree (crtcs); + xfree (modes); +@@ -2541,6 +2553,13 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + */ + xf86DefaultScreenLimits (scrn, &width, &height, canGrow); + ++ if (have_outputs == FALSE) { ++ if (width < NO_OUTPUT_DEFAULT_WIDTH && height < NO_OUTPUT_DEFAULT_HEIGHT) { ++ width = NO_OUTPUT_DEFAULT_WIDTH; ++ height = NO_OUTPUT_DEFAULT_HEIGHT; ++ } ++ } ++ + scrn->display->virtualX = width; + scrn->display->virtualY = height; + } +@@ -2566,8 +2585,17 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) + width, height); + } + +- /* Mirror output modes to scrn mode list */ +- xf86SetScrnInfoModes (scrn); ++ if (have_outputs) { ++ /* Mirror output modes to scrn mode list */ ++ xf86SetScrnInfoModes (scrn); ++ } else { ++ /* Clear any existing modes from scrn->modes */ ++ while (scrn->modes != NULL) ++ xf86DeleteMode(&scrn->modes, scrn->modes); ++ scrn->modes = xf86ModesAdd(scrn->modes, ++ xf86CVTMode(width, height, 60, 0, 0)); ++ } ++ + + xfree (crtcs); + xfree (modes); +-- +1.7.0.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch b/pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch new file mode 100644 index 0000000..2db8a8c --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch @@ -0,0 +1,35 @@ +From f22b6f8a5899f125de63738e69aaddc2dd0a5d0a Mon Sep 17 00:00:00 2001 +From: Ben Skeggs <bskeggs(a)redhat.com> +Date: Mon, 7 Jun 2010 10:10:10 +1000 +Subject: [PATCH] randr: prevent an unnecessary screen resize with multiple displays + +crtc->{x,y} is always 0 when xf86DefaultScreenLimits() is called, so we +calculate too small an area for the initial framebuffer and force a resize +to happen. + +This commit fixes the code to use desired{X,Y} instead, which contains the +initial output positions. + +Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> +--- + hw/xfree86/modes/xf86Crtc.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index 51e7b5a..c2ad7bc 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -1041,8 +1041,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp, + + if (crtc->enabled) + { +- crtc_width = crtc->x + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation); +- crtc_height = crtc->y + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation); ++ crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation); ++ crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation); + } + if (!canGrow) { + for (o = 0; o < config->num_output; o++) +-- +1.6.6 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch b/pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch new file mode 100644 index 0000000..93071fd --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch @@ -0,0 +1,37 @@ +From 57a188877b0472edb12bdf707b1550abbeb85af8 Mon Sep 17 00:00:00 2001 +From: Fedora X Ninjas <x(a)fedoraproject.org> +Date: Wed, 17 Feb 2010 11:12:36 +1000 +Subject: [PATCH] Stick giant warning into logfiles about udev configuration changes. + +Signed-off-by: Fedora X Ninjas <x(a)fedoraproject.org> +--- + hw/xfree86/common/xf86Config.c | 13 +++++++++++++ + 1 files changed, 13 insertions(+), 0 deletions(-) + +diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c +index 132e8bc..b1722cd 100644 +--- a/hw/xfree86/common/xf86Config.c ++++ b/hw/xfree86/common/xf86Config.c +@@ -1472,6 +1472,19 @@ checkCoreInputDevices(serverLayoutPtr servlayoutp, Bool implicitLayout) + "input devices.\n\tIf no devices become available, " + "reconfigure %s or disable AutoAddDevices.\n", + config_backend, config_backend); ++ ++ xf86Msg(X_INFO, "\n" ++ "***************************************************************\n" ++ "***************************************************************\n" ++ "** Fedora switched to udev-based device detection with **\n" ++ "** xorg-x11-server-1.7.99.901-1. Custom HAL configuration **\n" ++ "** stored in /etc/hal/fdi/policy will not be seen by this **\n" ++ "** server version. If you have such configuration you will **\n" ++ "** need to update it to the new format. **\n" ++ "** For more information, see the Fedora wiki page **\n" ++ "** https://fedoraproject.org/wiki/Input_device_configuration **\n" ++ "***************************************************************\n" ++ "***************************************************************\n"); + #else + xf86Msg(X_INFO, "Hotplugging is disabled and no input devices were configured.\n" + "\tTry disabling AllowEmptyInput.\n"); +-- +1.6.6.1 + diff --git a/pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch b/pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch new file mode 100644 index 0000000..ece8a6c --- /dev/null +++ b/pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch @@ -0,0 +1,909 @@ +From deab888bb3bb2a56963da50ff551bd66fbd858a1 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue, 29 Jun 2010 13:49:27 +1000 +Subject: [PATCH 1/5] xkb: Mark switch case fallthrough with comment. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + xkb/xkbActions.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 4c7bce2..6a7f36d 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -625,6 +625,8 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + break; + } + xkbi->lockedPtrButtons&= ~(1<<button); ++ ++ /* fallthrough */ + case XkbSA_PtrBtn: + XkbDDXFakeDeviceButton(xkbi->device, 0, button); + break; +-- +1.7.1 + +From 50b6311dbd2594acc36d6856fdde8623459f1374 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue, 29 Jun 2010 12:12:53 +1000 +Subject: [PATCH 2/5] xkb: merge lockedPtrButtons state from all attached SDs. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem: +lockedPtrButtons keeps the state of the buttons locked by a PointerKeys button +press. Unconditionally clearing the bits may cause stuck buttons in this +sequence of events: + +1. type Shift + NumLock to enable PointerKeys +2. type 0/Ins on keypad to emulate Button 1 press + → button1 press event to client +3. press and release button 1 on physical mouse + → button1 release event to client + +Button 1 on the MD is now stuck and cannot be released. + +Cause: +XKB PointerKeys button events are posted through the XTEST pointer device. +Once a press is generated, the XTEST device's button is down. The DIX merges +the button state of all attached SDs, hence the MD will have a button down +while the XTEST device has a button down. + +PointerKey button events are only generated on the master device to avoid +duplicate events (see XkbFakeDeviceButton()). If the MD has the +lockedPtrButtons bit cleared by a release event on a physical device, no +such event is generated when a keyboard device triggers the PointerKey +ButtonRelease trigger. Since the event - if generated - is posted through +the XTEST pointer device, lack of a generated ButtonRelease event on the +XTEST pointer device means the button is never released, resulting in the +stuck button observed above. + +Solution: +This patch merges the MD's lockedPtrButtons with the one of all attached +slave devices on release events. Thus, as long as one attached keyboard has +a lockedPtrButtons bit set, this bit is kept in the MD. Once a PointerKey +button is released on all keyboards, the matching release event is emulated +from the MD through the XTEST pointer device, thus also releasing the button +in the DIX. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + include/xkbsrv.h | 3 +++ + xkb/xkbAccessX.c | 18 +++++++++++++++++- + xkb/xkbActions.c | 8 ++++++++ + xkb/xkbUtils.c | 26 ++++++++++++++++++++++++++ + 4 files changed, 54 insertions(+), 1 deletions(-) + +diff --git a/include/xkbsrv.h b/include/xkbsrv.h +index c0cd501..f0db0e4 100644 +--- a/include/xkbsrv.h ++++ b/include/xkbsrv.h +@@ -933,6 +933,9 @@ extern int XkbGetEffectiveGroup( + XkbStatePtr /* xkbstate */, + CARD8 /* keycode */); + ++extern void XkbMergeLockedPtrBtns( ++ DeviceIntPtr /* master */); ++ + #include "xkbfile.h" + #include "xkbrules.h" + +diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c +index be1dcee..e3fdc06 100644 +--- a/xkb/xkbAccessX.c ++++ b/xkb/xkbAccessX.c +@@ -707,8 +707,24 @@ DeviceEvent *event = &ev->device_event; + changed |= XkbPointerButtonMask; + } + else if (event->type == ET_ButtonRelease) { +- if (xkbi) ++ if (xkbi) { + xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7)); ++ ++ /* Merge this MD's lockedPtrButtons with the one of all ++ * attached slave devices. ++ * The DIX uses a merged button state for MDs, not ++ * releasing buttons until the last SD has released ++ * thenm. If we unconditionally clear the ++ * lockedPtrButtons bit on the MD, a PointerKeys button ++ * release on the SD keyboard won't generate the required fake button ++ * event on the XTEST pointer, thus never processing the ++ * button event in the DIX and the XTEST pointer's ++ * buttons stay down - result is a stuck button. ++ */ ++ if (IsMaster(dev)) ++ XkbMergeLockedPtrBtns(dev); ++ } ++ + changed |= XkbPointerButtonMask; + } + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 6a7f36d..ab52b6a 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -626,6 +626,14 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + } + xkbi->lockedPtrButtons&= ~(1<<button); + ++ if (IsMaster(xkbi->device)) ++ { ++ XkbMergeLockedPtrBtns(xkbi->device); ++ /* One SD still has lock set, don't post event */ ++ if ((xkbi->lockedPtrButtons & (1 << button)) != 0) ++ break; ++ } ++ + /* fallthrough */ + case XkbSA_PtrBtn: + XkbDDXFakeDeviceButton(xkbi->device, 0, button); +diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c +index b1e0e55..d7d1935 100644 +--- a/xkb/xkbUtils.c ++++ b/xkb/xkbUtils.c +@@ -2190,3 +2190,29 @@ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode) + + return effectiveGroup; + } ++ ++/* Merge the lockedPtrButtons from all attached SDs for the given master ++ * device into the MD's state. ++ */ ++void ++XkbMergeLockedPtrBtns(DeviceIntPtr master) ++{ ++ DeviceIntPtr d = inputInfo.devices; ++ XkbSrvInfoPtr xkbi = NULL; ++ ++ if (!IsMaster(master)) ++ return; ++ ++ if (!master->key) ++ return; ++ ++ xkbi = master->key->xkbInfo; ++ xkbi->lockedPtrButtons = 0; ++ ++ for (; d; d = d->next) { ++ if (IsMaster(d) || GetMaster(d, MASTER_KEYBOARD) != master || !d->key) ++ continue; ++ ++ xkbi->lockedPtrButtons |= d->key->xkbInfo->lockedPtrButtons; ++ } ++} +-- +1.7.1 + +From 4a4224f5d786035af88c251a9ee177217e8f77fd Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed, 14 Apr 2010 10:54:29 +1000 +Subject: [PATCH 3/5] xkb: rename XkbFakeDeviceButton and XkbFakeDeviceMotion, move into xkbActions.c + +The name XkbDDXFakeDeviceButton and XkbDDXFakeDeviceMotion is somewhat +misleading, there's no DDX involved in the game at all anymore. + +This removes XkbFakeDeviceMotion and XkbFakeDeviceButton from the API where +it arguably shouldn't have been in the first place. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +Reviewed-by: Daniel Stone <daniel(a)fooishbar.org> +Reviewed-by: Dan Nicholson <dbn.lists(a)gmail.com> +--- + include/xkbsrv.h | 13 ------- + xkb/Makefile.am | 4 +-- + xkb/ddxDevBtn.c | 69 -------------------------------------- + xkb/ddxFakeMtn.c | 64 ----------------------------------- + xkb/xkbActions.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++------- + 5 files changed, 85 insertions(+), 162 deletions(-) + delete mode 100644 xkb/ddxDevBtn.c + delete mode 100644 xkb/ddxFakeMtn.c + +diff --git a/include/xkbsrv.h b/include/xkbsrv.h +index f0db0e4..d1cbd1a 100644 +--- a/include/xkbsrv.h ++++ b/include/xkbsrv.h +@@ -768,19 +768,6 @@ extern _X_EXPORT void XkbDDXUpdateDeviceIndicators( + CARD32 /* newState */ + ); + +-extern _X_EXPORT void XkbDDXFakePointerMotion( +- DeviceIntPtr /* dev */, +- unsigned int /* flags */, +- int /* x */, +- int /* y */ +-); +- +-extern _X_EXPORT void XkbDDXFakeDeviceButton( +- DeviceIntPtr /* dev */, +- Bool /* press */, +- int /* button */ +-); +- + extern _X_EXPORT int XkbDDXTerminateServer( + DeviceIntPtr /* dev */, + KeyCode /* key */, +diff --git a/xkb/Makefile.am b/xkb/Makefile.am +index e54ce59..fb3ccbf 100644 +--- a/xkb/Makefile.am ++++ b/xkb/Makefile.am +@@ -5,11 +5,9 @@ AM_CFLAGS = $(DIX_CFLAGS) + DDX_SRCS = \ + ddxBeep.c \ + ddxCtrls.c \ +- ddxFakeMtn.c \ + ddxLEDs.c \ + ddxLoad.c \ +- ddxList.c \ +- ddxDevBtn.c ++ ddxList.c + + DIX_SRCS = \ + xkb.c \ +diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c +deleted file mode 100644 +index b8a1255..0000000 +--- a/xkb/ddxDevBtn.c ++++ /dev/null +@@ -1,69 +0,0 @@ +-/************************************************************ +-Copyright (c) 1995 by Silicon Graphics Computer Systems, Inc. +- +-Permission to use, copy, modify, and distribute this +-software and its documentation for any purpose and without +-fee is hereby granted, provided that the above copyright +-notice appear in all copies and that both that copyright +-notice and this permission notice appear in supporting +-documentation, and that the name of Silicon Graphics not be +-used in advertising or publicity pertaining to distribution +-of the software without specific prior written permission. +-Silicon Graphics makes no representation about the suitability +-of this software for any purpose. It is provided "as is" +-without any express or implied warranty. +- +-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON +-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +-THE USE OR PERFORMANCE OF THIS SOFTWARE. +- +-********************************************************/ +- +-#ifdef HAVE_DIX_CONFIG_H +-#include <dix-config.h> +-#endif +- +-#include "inputstr.h" +-#include <xkbsrv.h> +-#include "mi.h" +- +-void +-XkbDDXFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) +-{ +- EventListPtr events; +- int nevents, i; +- DeviceIntPtr ptr; +- +- /* If dev is a slave device, and the SD is attached, do nothing. If we'd +- * post through the attached master pointer we'd get duplicate events. +- * +- * if dev is a master keyboard, post through the XTEST device +- * +- * if dev is a floating slave, post through the device itself. +- */ +- +- if (IsMaster(dev)) +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); +- else if (!dev->u.master) +- ptr = dev; +- else +- return; +- +- events = InitEventList(GetMaximumEventsNum()); +- OsBlockSignals(); +- nevents = GetPointerEvents(events, ptr, +- press ? ButtonPress : ButtonRelease, button, +- 0 /* flags */, 0 /* first */, +- 0 /* num_val */, NULL); +- OsReleaseSignals(); +- +- for (i = 0; i < nevents; i++) +- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); +- +- FreeEventList(events, GetMaximumEventsNum()); +-} +diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c +deleted file mode 100644 +index b383716..0000000 +--- a/xkb/ddxFakeMtn.c ++++ /dev/null +@@ -1,64 +0,0 @@ +-/************************************************************ +-Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. +- +-Permission to use, copy, modify, and distribute this +-software and its documentation for any purpose and without +-fee is hereby granted, provided that the above copyright +-notice appear in all copies and that both that copyright +-notice and this permission notice appear in supporting +-documentation, and that the name of Silicon Graphics not be +-used in advertising or publicity pertaining to distribution +-of the software without specific prior written permission. +-Silicon Graphics makes no representation about the suitability +-of this software for any purpose. It is provided "as is" +-without any express or implied warranty. +- +-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS +-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +-AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON +-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL +-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH +-THE USE OR PERFORMANCE OF THIS SOFTWARE. +- +-********************************************************/ +- +-#ifdef HAVE_DIX_CONFIG_H +-#include <dix-config.h> +-#endif +- +-#include "inputstr.h" +-#include <xkbsrv.h> +-#include "mi.h" +- +-void +-XkbDDXFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) +-{ +- EventListPtr events; +- int nevents, i; +- DeviceIntPtr ptr; +- int gpe_flags = 0; +- +- if (!dev->u.master) +- ptr = dev; +- else +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); +- +- if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) +- gpe_flags = POINTER_ABSOLUTE; +- else +- gpe_flags = POINTER_RELATIVE; +- +- events = InitEventList(GetMaximumEventsNum()); +- OsBlockSignals(); +- nevents = GetPointerEvents(events, ptr, +- MotionNotify, 0, +- gpe_flags, 0, 2, (int[]){x, y}); +- OsReleaseSignals(); +- +- for (i = 0; i < nevents; i++) +- mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); +- +- FreeEventList(events, GetMaximumEventsNum()); +-} +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index ab52b6a..2817e39 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -40,11 +40,15 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. + #include <xkbsrv.h> + #include "xkb.h" + #include <ctype.h> ++#include "mi.h" + #define EXTENSION_EVENT_BASE 64 + + static int xkbDevicePrivateKeyIndex; + DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; + ++static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); ++static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y); ++ + void + xkbUnwrapProc(DeviceIntPtr device, DeviceHandleProc proc, + pointer data) +@@ -479,7 +483,7 @@ int dx,dy; + dx= xkbi->mouseKeysDX; + dy= xkbi->mouseKeysDY; + } +- XkbDDXFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy); ++ XkbFakePointerMotion(xkbi->device, xkbi->mouseKeysFlags,dx,dy); + return xkbi->desc->ctrls->mk_interval; + } + +@@ -507,7 +511,7 @@ Bool accel; + accel= ((pAction->ptr.flags&XkbSA_NoAcceleration)==0); + x= XkbPtrActionX(&pAction->ptr); + y= XkbPtrActionY(&pAction->ptr); +- XkbDDXFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y); ++ XkbFakePointerMotion(xkbi->device, pAction->ptr.flags,x,y); + AccessXCancelRepeatKey(xkbi,keycode); + xkbi->mouseKeysAccel= accel&& + (xkbi->desc->ctrls->enabled_ctrls&XkbMouseKeysAccelMask); +@@ -554,7 +558,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + ((pAction->btn.flags&XkbSA_LockNoLock)==0)) { + xkbi->lockedPtrButtons|= (1<<button); + AccessXCancelRepeatKey(xkbi,keycode); +- XkbDDXFakeDeviceButton(xkbi->device, 1, button); ++ XkbFakeDeviceButton(xkbi->device, 1, button); + filter->upAction.type= XkbSA_NoAction; + } + break; +@@ -565,12 +569,12 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + if (pAction->btn.count>0) { + nClicks= pAction->btn.count; + for (i=0;i<nClicks;i++) { +- XkbDDXFakeDeviceButton(xkbi->device, 1, button); +- XkbDDXFakeDeviceButton(xkbi->device, 0, button); ++ XkbFakeDeviceButton(xkbi->device, 1, button); ++ XkbFakeDeviceButton(xkbi->device, 0, button); + } + filter->upAction.type= XkbSA_NoAction; + } +- else XkbDDXFakeDeviceButton(xkbi->device, 1, button); ++ else XkbFakeDeviceButton(xkbi->device, 1, button); + } + break; + case XkbSA_SetPtrDflt: +@@ -636,7 +640,7 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi, + + /* fallthrough */ + case XkbSA_PtrBtn: +- XkbDDXFakeDeviceButton(xkbi->device, 0, button); ++ XkbFakeDeviceButton(xkbi->device, 0, button); + break; + } + filter->active = 0; +@@ -974,7 +978,7 @@ int button; + if ((pAction->devbtn.flags&XkbSA_LockNoLock)|| + BitIsOn(dev->button->down, button)) + return 0; +- XkbDDXFakeDeviceButton(dev,TRUE,button); ++ XkbFakeDeviceButton(dev,TRUE,button); + filter->upAction.type= XkbSA_NoAction; + break; + case XkbSA_DeviceBtn: +@@ -982,12 +986,12 @@ int button; + int nClicks,i; + nClicks= pAction->btn.count; + for (i=0;i<nClicks;i++) { +- XkbDDXFakeDeviceButton(dev,TRUE,button); +- XkbDDXFakeDeviceButton(dev,FALSE,button); ++ XkbFakeDeviceButton(dev,TRUE,button); ++ XkbFakeDeviceButton(dev,FALSE,button); + } + filter->upAction.type= XkbSA_NoAction; + } +- else XkbDDXFakeDeviceButton(dev,TRUE,button); ++ else XkbFakeDeviceButton(dev,TRUE,button); + break; + } + } +@@ -1006,10 +1010,10 @@ int button; + if ((filter->upAction.devbtn.flags&XkbSA_LockNoUnlock)|| + !BitIsOn(dev->button->down, button)) + return 0; +- XkbDDXFakeDeviceButton(dev,FALSE,button); ++ XkbFakeDeviceButton(dev,FALSE,button); + break; + case XkbSA_DeviceBtn: +- XkbDDXFakeDeviceButton(dev,FALSE,button); ++ XkbFakeDeviceButton(dev,FALSE,button); + break; + } + filter->active = 0; +@@ -1326,3 +1330,70 @@ xkbStateNotify sn; + return; + } + ++static void ++XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) ++{ ++ EventListPtr events; ++ int nevents, i; ++ DeviceIntPtr ptr; ++ int gpe_flags = 0; ++ ++ if (!dev->u.master) ++ ptr = dev; ++ else ++ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ ++ if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) ++ gpe_flags = POINTER_ABSOLUTE; ++ else ++ gpe_flags = POINTER_RELATIVE; ++ ++ events = InitEventList(GetMaximumEventsNum()); ++ OsBlockSignals(); ++ nevents = GetPointerEvents(events, ptr, ++ MotionNotify, 0, ++ gpe_flags, 0, 2, (int[]){x, y}); ++ OsReleaseSignals(); ++ ++ for (i = 0; i < nevents; i++) ++ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); ++ ++ FreeEventList(events, GetMaximumEventsNum()); ++} ++ ++static void ++XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) ++{ ++ EventListPtr events; ++ int nevents, i; ++ DeviceIntPtr ptr; ++ ++ /* If dev is a slave device, and the SD is attached, do nothing. If we'd ++ * post through the attached master pointer we'd get duplicate events. ++ * ++ * if dev is a master keyboard, post through the XTEST device ++ * ++ * if dev is a floating slave, post through the device itself. ++ */ ++ ++ if (IsMaster(dev)) ++ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ else if (!dev->u.master) ++ ptr = dev; ++ else ++ return; ++ ++ events = InitEventList(GetMaximumEventsNum()); ++ OsBlockSignals(); ++ nevents = GetPointerEvents(events, ptr, ++ press ? ButtonPress : ButtonRelease, button, ++ 0 /* flags */, 0 /* first */, ++ 0 /* num_val */, NULL); ++ OsReleaseSignals(); ++ ++ ++ for (i = 0; i < nevents; i++) ++ mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); ++ ++ FreeEventList(events, GetMaximumEventsNum()); ++} +-- +1.7.1 + +From dcb46252f959893f1934232698e2ae26390a8a5b Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Tue, 29 Jun 2010 15:24:51 +1000 +Subject: [PATCH 4/5] xkb: emulate PointerKeys events only on the master device. + +This patch replicates the behaviour for button events. Only generate a +PointerKeys motion event on the master device, not on the slave device. +Fixes the current issue of PointerKey motion events generating key events as +well. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + xkb/xkbActions.c | 9 ++++----- + 1 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 2817e39..391c375 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -496,9 +496,6 @@ _XkbFilterPointerMove( XkbSrvInfoPtr xkbi, + int x,y; + Bool accel; + +- if (xkbi->device == inputInfo.keyboard) +- return 0; +- + if (filter->keycode==0) { /* initial press */ + filter->keycode = keycode; + filter->active = 1; +@@ -1338,10 +1335,12 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) + DeviceIntPtr ptr; + int gpe_flags = 0; + +- if (!dev->u.master) ++ if (IsMaster(dev)) ++ ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ else if (!dev->u.master) + ptr = dev; + else +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); ++ return; + + if (flags & XkbSA_MoveAbsoluteX || flags & XkbSA_MoveAbsoluteY) + gpe_flags = POINTER_ABSOLUTE; +-- +1.7.1 + +From 40941fb2e9ae763add7b74850e8a0471ac754db6 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Thu, 1 Jul 2010 12:44:57 +1000 +Subject: [PATCH 5/5] xkb: release XTEST pointer buttons on physical releases. (#28808) + +If a button release event is posted for the MD pointer, post a release event +through the matching XTEST device. This way, a client who posts a button +press through the XTEST extension cannot inadvertedly lock the button. + +This behaviour is required for historical reasons, until server 1.7 the core +pointer would release a button press on physical events, regardless of the +XTEST state. Clients seem to rely on this behaviour, causing seemingly stuck +grabs. + +The merged behaviour is kept for multiple keyboard PointerKey events, if two +physical keyboards hold the button down as a result of PointerKey actions, +the button is not released until the last keyboard releases the button. + +X.Org Bug 28808 <http://bugs.freedesktop.org/show_bug.cgi?id=28808> + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + include/xkbsrv.h | 6 ++++++ + xkb/xkbAccessX.c | 23 ++++++++++------------- + xkb/xkbActions.c | 4 ++-- + 3 files changed, 18 insertions(+), 15 deletions(-) + +diff --git a/include/xkbsrv.h b/include/xkbsrv.h +index d1cbd1a..a96ca56 100644 +--- a/include/xkbsrv.h ++++ b/include/xkbsrv.h +@@ -923,6 +923,12 @@ extern int XkbGetEffectiveGroup( + extern void XkbMergeLockedPtrBtns( + DeviceIntPtr /* master */); + ++extern void XkbFakeDeviceButton( ++ DeviceIntPtr /* dev */, ++ int /* press */, ++ int /* button */); ++ ++ + #include "xkbfile.h" + #include "xkbrules.h" + +diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c +index e3fdc06..d3f9652 100644 +--- a/xkb/xkbAccessX.c ++++ b/xkb/xkbAccessX.c +@@ -710,19 +710,16 @@ DeviceEvent *event = &ev->device_event; + if (xkbi) { + xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7)); + +- /* Merge this MD's lockedPtrButtons with the one of all +- * attached slave devices. +- * The DIX uses a merged button state for MDs, not +- * releasing buttons until the last SD has released +- * thenm. If we unconditionally clear the +- * lockedPtrButtons bit on the MD, a PointerKeys button +- * release on the SD keyboard won't generate the required fake button +- * event on the XTEST pointer, thus never processing the +- * button event in the DIX and the XTEST pointer's +- * buttons stay down - result is a stuck button. +- */ +- if (IsMaster(dev)) +- XkbMergeLockedPtrBtns(dev); ++ if (IsMaster(dev)) ++ { ++ DeviceIntPtr source; ++ int rc; ++ rc = dixLookupDevice(&source, event->sourceid, serverClient, DixWriteAccess); ++ if (rc != Success) ++ ErrorF("[xkb] bad sourceid '%d' on button release event.\n", event->sourceid); ++ else if (!IsXTestDevice(source, GetMaster(dev, MASTER_POINTER))) ++ XkbFakeDeviceButton(dev, FALSE, event->detail.key); ++ } + } + + changed |= XkbPointerButtonMask; +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 391c375..5d40199 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -46,7 +46,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. + static int xkbDevicePrivateKeyIndex; + DevPrivateKey xkbDevicePrivateKey = &xkbDevicePrivateKeyIndex; + +-static void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); ++void XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button); + static void XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y); + + void +@@ -1360,7 +1360,7 @@ XkbFakePointerMotion(DeviceIntPtr dev, unsigned flags,int x,int y) + FreeEventList(events, GetMaximumEventsNum()); + } + +-static void ++void + XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) + { + EventListPtr events; +-- +1.7.1 + +From 7273832bcdc6f43e9a5a8fdbb56844466efb710a Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Fri, 23 Jul 2010 11:46:30 +1000 +Subject: [PATCH 1/3] xkb: post-fix PointerKeys button events with a DeviceChangedEvent. + +commit 14327858391ebe929b806efb53ad79e789361883 + xkb: release XTEST pointer buttons on physical releases. (#28808) +revealed a bug with the XTEST/PointerKeys interaction. + +Events resulting from PointerKeys are injected into the event processing +stream, not appended to the event queue. The events generated for the fake +button press include a DeviceChangedEvent (DCE), a raw button event and the +button event itself. The DCE causes the master to switch classes to the +attached XTEST pointer device. + +Once the fake button is processed, normal event processing continues with +events in the EQ. The master still contains the XTEST classes, causing some +events to be dropped if e.g. the number of valuators of the event in the +queue exceeds the XTEST device's number of valuators. + +Example: the EQ contains the following events, processed one-by-one, left to +right. + +[DCE (dev)][Btn down][Btn up][Motion][Motion][...] + ^ XkbFakeDeviceButton injects [DCE (XTEST)][Btn up] + +Thus the event sequence processed looks like this: + +[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][Motion][Motion][...] + +The first DCE causes the master to switch to the device. The button up event +injects a DCE to the XTEST device, causing the following Motion events to be +processed with the master still being on XTEST classes. + +This patch post-fixes the injected event sequence with a DCE to restore the +classes of the original slave device, resulting in an event sequence like +this: +[DCE (dev)][Btn down][Btn up][DCE (XTEST)][Btn up][DCE (dev)][Motion][Motion] + +Note that this is a simplified description. The event sequence injected by +the PointerKeys code is injected for the master device only and the matching +slave device that caused the injection has already finished processing on +the slave. Furthermore, the injection happens as part of the the XKB layer, +before the unwrapping of the processInputProc takes us into the DIX where +the DCE is actually handled. + +Bug reproducible with a device that reports more than 2 valuators. Simply +cause button releases on the device and wait for a "too many valuators" +warning message. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + xkb/xkbActions.c | 26 +++++++++++++++++++------- + 1 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c +index 5d40199..2afd46d 100644 +--- a/xkb/xkbActions.c ++++ b/xkb/xkbActions.c +@@ -1365,34 +1365,46 @@ XkbFakeDeviceButton(DeviceIntPtr dev,Bool press,int button) + { + EventListPtr events; + int nevents, i; +- DeviceIntPtr ptr; ++ DeviceIntPtr ptr, mpointer, lastSlave; + + /* If dev is a slave device, and the SD is attached, do nothing. If we'd + * post through the attached master pointer we'd get duplicate events. + * + * if dev is a master keyboard, post through the XTEST device +- * + * if dev is a floating slave, post through the device itself. ++ * ++ * The event is injected into the event processing, not the EQ. Thus, ++ * ensure that we restore the master after the event sequence to the ++ * original set of classes. Otherwise, the master remains on the XTEST ++ * classes and drops events that don't fit into the XTEST layout (e.g. ++ * events with more than 2 valuators). ++ * To do so, we remember the lastSlave that posted through the master ++ * and add a DeviceChangedEvent to the end of the list. + */ + +- if (IsMaster(dev)) +- ptr = GetXTestDevice(GetMaster(dev, MASTER_POINTER)); +- else if (!dev->u.master) ++ if (IsMaster(dev)) { ++ mpointer = GetMaster(dev, MASTER_POINTER); ++ lastSlave = mpointer->u.lastSlave; ++ ptr = GetXTestDevice(mpointer); ++ } else if (!dev->u.master) + ptr = dev; + else + return; + +- events = InitEventList(GetMaximumEventsNum()); ++ events = InitEventList(GetMaximumEventsNum() + 1); + OsBlockSignals(); + nevents = GetPointerEvents(events, ptr, + press ? ButtonPress : ButtonRelease, button, + 0 /* flags */, 0 /* first */, + 0 /* num_val */, NULL); ++ if (IsMaster(dev) && (lastSlave && lastSlave != ptr)) ++ CreateClassesChangedEvent(&events[nevents++], mpointer, ++ lastSlave, DEVCHANGE_POINTER_EVENT); + OsReleaseSignals(); + + + for (i = 0; i < nevents; i++) + mieqProcessDeviceEvent(ptr, (InternalEvent*)events[i].event, NULL); + +- FreeEventList(events, GetMaximumEventsNum()); ++ FreeEventList(events, GetMaximumEventsNum() + 1); + } +-- +1.7.2 + +From 817e031a996a5f5aa16fc789d7e570cc589d96cb Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer(a)who-t.net> +Date: Wed, 28 Jul 2010 14:24:59 +1000 +Subject: [PATCH 3/3] Xi: reset the unused classes pointer after copying + +After copying the unused_classes into the device, reset the original +pointer. Otherwise we have two pointers pointing to the same field and both +get freed on device removal. + +Some classes already have this behaviour since 51c8fd69. + +Signed-off-by: Peter Hutterer <peter.hutterer(a)who-t.net> +--- + Xi/exevents.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index 566b0ef..a6160dd 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -227,6 +227,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->intfeed = classes->intfeed; ++ classes->intfeed = NULL; + } + + i = &to->intfeed; +@@ -263,6 +264,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->stringfeed = classes->stringfeed; ++ classes->stringfeed = NULL; + } + + s = &to->stringfeed; +@@ -299,6 +301,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->bell = classes->bell; ++ classes->bell = NULL; + } + + b = &to->bell; +@@ -336,6 +339,7 @@ DeepCopyFeedbackClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->leds = classes->leds; ++ classes->leds = NULL; + } + + l = &to->leds; +@@ -387,6 +391,7 @@ DeepCopyKeyboardClasses(DeviceIntPtr from, DeviceIntPtr to) + to->kbdfeed = classes->kbdfeed; + if (!to->kbdfeed) + InitKeyboardDeviceStruct(to, NULL, NULL, NULL); ++ classes->kbdfeed = NULL; + } + + k = &to->kbdfeed; +@@ -517,6 +522,7 @@ DeepCopyPointerClasses(DeviceIntPtr from, DeviceIntPtr to) + classes = dixLookupPrivate(&to->devPrivates, + UnusedClassesPrivateKey); + to->ptrfeed = classes->ptrfeed; ++ classes->ptrfeed = NULL; + } + + p = &to->ptrfeed; +-- +1.7.2 + diff --git a/pkgs/core/xorg-server/xorg-server.nm b/pkgs/core/xorg-server/xorg-server.nm new file mode 100644 index 0000000..93cde25 --- /dev/null +++ b/pkgs/core/xorg-server/xorg-server.nm @@ -0,0 +1,104 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-server +PKG_VER = 1.8.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Server +PKG_URL = http://www.x.org +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 X server. + +PKG_BUILD_DEPS+= autoconf automake pkg-config \ + xorg-x11-font-utils \ + xorg-x11-util-macros xorg-x11-proto-devel xorg-x11-xtrans-devel +PKG_DEPS += libX11 libXau libXfont libpciaccess libxcb libxkbfile pixman udev + +define PKG_DESCRIPTION + X.org X11 is an open source implementation of the X Window System. \ + It provides the basic low level functionality which full fledged \ + graphical user interfaces (GUIs) such as GNOME and KDE are designed \ + upon. +endef + +PKG_TARBALL = $(THISAPP).tar.bz2 + +CFLAGS += -Wstrict-overflow -rdynamic + +CONFIGURE_OPTIONS += \ + --enable-xvfb \ + --disable-xnest \ + --enable-kdrive \ + --disable-xephyr \ + --disable-xsdl \ + --disable-xfake \ + --disable-xfbdev \ + --enable-xorg \ + --disable-static \ + --with-pic \ + --with-int10=x86emu \ + --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ + --with-module-dir=/usr/lib/xorg/modules \ + --with-builderstring="Build ID: $(PKG_NAME) $(PKG_VER)-$(PKG_REL)" \ + --with-os-name="$(hostname -s) $(uname -r)" \ + --with-xkb-output=/var/lib/xkb \ + --enable-install-libxf86config \ + --localstatedir=/var \ + --disable-aiglx \ + --disable-composite \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --disable-glx \ + --disable-screensaver \ + --disable-dri \ + --disable-dri2 \ + --disable-xinerama \ + --disable-dbe \ + --disable-config-dbus \ + --disable-config-hal \ + --disable-xquartz \ + --enable-config-udev \ + --with-vendor-name="$(DISTRO_NAME) Project" + +define STAGE_PREPARE_CMDS + cd $(DIR_APP) && autoreconf -vfi +endef + +define STAGE_INSTALL + cd $(DIR_APP) && make install DESTDIR=$(BUILDROOT) \ + moduledir=/usr/lib/xorg/modules + + rm -vf $(BUILDROOT)/usr/lib/xorg/modules/libxf8_16bpp.so + rm -vrf $(BUILDROOT)/var/log + + -mkdir -pv $(BUILDROOT)/etc/X11/xorg.conf.d $(BUILDROOT)/usr/share/xorg + cd $(DIR_APP) && install -m 0444 hw/xfree86/common/{vesa,extra}modes \ + $(BUILDROOT)/usr/share/xorg/ + cd $(DIR_APP) && install -m 644 $(DIR_SOURCE)/10-quirks.conf \ + $(BUILDROOT)/usr/share/X11/xorg.conf.d +endef diff --git a/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm new file mode 100644 index 0000000..c524786 --- /dev/null +++ b/pkgs/core/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm @@ -0,0 +1,48 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-drv-evdev +PKG_VER = 2.4.99.901 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Driver +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = Xorg X11 evdev input driver. + +PKG_DEPS += libxbkfile xkeyboard-config xorg-server + +define PKG_DESCRIPTION + X.Org X11 evdev input driver. +endef + +PKG_TARBALL = xf86-input-evdev-$(PKG_VER).tar.bz2 + +DIR_APP = $(DIR_SRC)/xf86-input-evdev-$(PKG_VER) + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm new file mode 100644 index 0000000..fcab804 --- /dev/null +++ b/pkgs/core/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm @@ -0,0 +1,49 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-drv-keyboard +PKG_VER = 1.4.0 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Driver +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = Xorg X11 keyboard input driver. + +PKG_BUILD_DEPS += libpciaccess libX11 pkg-config xorg-x11-util-macros +PKG_DEPS+= xorg-server + +define PKG_DESCRIPTION + X.Org X11 keyboard input driver. +endef + +PKG_TARBALL = xf86-input-keyboard-$(PKG_VER).tar.bz2 + +DIR_APP = $(DIR_SRC)/xf86-input-keyboard-$(PKG_VER) + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm new file mode 100644 index 0000000..86cf79b --- /dev/null +++ b/pkgs/core/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm @@ -0,0 +1,49 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-drv-mouse +PKG_VER = 1.5.0 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Driver +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = Xorg X11 mouse input driver. + +PKG_BUILD_DEPS += libpciaccess libX11 pkg-config xorg-x11-util-macros +PKG_DEPS+= xorg-server + +define PKG_DESCRIPTION + X.Org X11 mouse input driver. +endef + +PKG_TARBALL = xf86-input-mouse-$(PKG_VER).tar.bz2 + +DIR_APP = $(DIR_SRC)/xf86-input-mouse-$(PKG_VER) + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm new file mode 100644 index 0000000..e25781f --- /dev/null +++ b/pkgs/core/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm @@ -0,0 +1,49 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-drv-vesa +PKG_VER = 2.3.0 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Driver +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = Xorg X11 vesa video driver. + +PKG_BUILD_DEPS += libpciaccess libX11 pkg-config xorg-x11-util-macros +PKG_DEPS+= xorg-server + +define PKG_DESCRIPTION + X.Org X11 vesa video driver. +endef + +PKG_TARBALL = xf86-video-vesa-$(PKG_VER).tar.bz2 + +DIR_APP = $(DIR_SRC)/xf86-video-vesa-$(PKG_VER) + +CONFIGURE_OPTIONS += \ + --disable-static diff --git a/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm b/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm new file mode 100644 index 0000000..b79376c --- /dev/null +++ b/pkgs/core/xorg-x11-font-utils/xorg-x11-font-utils.nm @@ -0,0 +1,80 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-font-utils +PKG_VER = 7.4 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Fonts +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 font utilities. + +PKG_BUILD_DEPS+= autoconf pkg-config +PKG_DEPS += freetype libX11 libXfont libfontenc zlib + +define PKG_DESCRIPTION + X.Org X11 font utilities required for font installation, conversion, \ + and generation. +endef + +SRC_PACKAGES = \ + bdftopcf-1.0.1 \ + fonttosfnt-1.0.3 \ + mkfontdir-1.0.5 \ + mkfontscale-1.0.7 \ + font-util-1.1.0 + +PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2) + +define STAGE_PREPARE + for object in $(PKG_OBJECTS); do \ + cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$${object}; \ + done +endef + +define MACRO_BUILD + cd $(DIR_SRC)/$(1) && autoconf + cd $(DIR_SRC)/$(1) && \ + ./configure \ + --prefix=/usr \ + --with-mapdir=/usr/share/x11/fonts/util + + cd $(DIR_SRC)/$(1) && make $(PARALLELISMFLAGS) + +endef + +STAGE_BUILD = $(foreach package,$(SRC_PACKAGES),$(call MACRO_BUILD,$(package))) + +define MACRO_INSTALL + cd $(DIR_SRC)/$(1) && make install DESTDIR=$(BUILDROOT) + +endef + +STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package))) + + diff --git a/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm new file mode 100644 index 0000000..ac0c7fa --- /dev/null +++ b/pkgs/core/xorg-x11-fonts/xorg-x11-fonts.nm @@ -0,0 +1,115 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-fonts +PKG_VER = 7.2 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Fonts +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 fonts. + +PKG_BUILD_DEPS+= pkg-config xorg-x11-font-utils +PKG_DEPS += fontconfig + +define PKG_DESCRIPTION + This package contains misc bitmap Chinese, Japanese, Korean, Indic, and \ + Arabic fonts for use with X Window System. +endef + +# Add all development headers to the package +# Don't remove empty lines in the defined MACROS! + +SRC_PACKAGES = \ + encodings-1.0.3 \ + font-alias-1.0.2 \ + font-adobe-100dpi-1.0.1 \ + font-adobe-75dpi-1.0.1 \ + font-adobe-utopia-100dpi-1.0.2 \ + font-adobe-utopia-75dpi-1.0.2 \ + font-adobe-utopia-type1-1.0.2 \ + font-arabic-misc-1.0.1 \ + font-bh-100dpi-1.0.1 \ + font-bh-75dpi-1.0.1 \ + font-bh-lucidatypewriter-100dpi-1.0.1 \ + font-bh-lucidatypewriter-75dpi-1.0.1 \ + font-bitstream-100dpi-1.0.1 \ + font-bitstream-75dpi-1.0.1 \ + font-bitstream-type1-1.0.1 \ + font-cronyx-cyrillic-1.0.1 \ + font-cursor-misc-1.0.1 \ + font-daewoo-misc-1.0.1 \ + font-dec-misc-1.0.1 \ + font-isas-misc-1.0.1 \ + font-jis-misc-1.0.1 \ + font-micro-misc-1.0.1 \ + font-misc-cyrillic-1.0.1 \ + font-misc-misc-1.1.0 \ + font-mutt-misc-1.0.1 \ + font-schumacher-misc-1.1.0 \ + font-screen-cyrillic-1.0.2 \ + font-sony-misc-1.0.1 \ + font-sun-misc-1.0.1 \ + font-winitzki-cyrillic-1.0.1 \ + font-xfree86-type1-1.0.2 + +PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2) + +define STAGE_PREPARE + for object in $(PKG_OBJECTS); do \ + cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$${object}; \ + done +endef + +define MACRO_BUILD + cd $(DIR_SRC)/$(1) && ./configure \ + --prefix=/usr \ + --with-fontrootdir=/usr/share/X11/fonts \ + --disable-iso8859-3 \ + --disable-iso8859-4 \ + --disable-iso8859-6 \ + --disable-iso8859-10 \ + --disable-iso8859-11 \ + --disable-iso8859-12 \ + --disable-iso8859-13 \ + --disable-iso8859-16 + + cd $(DIR_SRC)/$(1) && make $(PARALLELISMFLAGS) + +endef + +STAGE_BUILD = $(foreach package,$(SRC_PACKAGES),$(call MACRO_BUILD,$(package))) + +define MACRO_INSTALL + cd $(DIR_SRC)/$(1) && make install DESTDIR=$(BUILDROOT) + +endef + +STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package))) + + diff --git a/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm new file mode 100644 index 0000000..7275b12 --- /dev/null +++ b/pkgs/core/xorg-x11-proto-devel/xorg-x11-proto-devel.nm @@ -0,0 +1,99 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-proto-devel +PKG_VER = 7.4 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = Development/System +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X11 potocol headers. + +PKG_BUILD_DEPS+= pkg-config + +define PKG_DESCRIPTION + Development headers for X.org X11 protocol. +endef + +# Add all development headers to the package +# Don't remove empty lines in the defined MACROS! + +SRC_PACKAGES = \ + bigreqsproto-1.1.0 \ + compositeproto-0.4.1 \ + damageproto-1.2.0 \ + dmxproto-2.3 \ + dri2proto-2.3 \ + evieext-1.1.0 \ + fixesproto-4.1.1\ + fontsproto-2.1.0 \ + glproto-1.4.12 \ + inputproto-2.0 \ + kbproto-1.0.5 \ + randrproto-1.3.1 \ + recordproto-1.14 \ + renderproto-0.11.1 \ + resourceproto-1.1.0 \ + scrnsaverproto-1.2.0 \ + videoproto-2.3.1 \ + xcmiscproto-1.2.0 \ + xextproto-7.1.2 \ + xf86bigfontproto-1.2.0 \ + xf86dgaproto-2.1 \ + xf86driproto-2.1.0 \ + xf86miscproto-0.9.3 \ + xf86vidmodeproto-2.3 \ + xineramaproto-1.2 \ + xproto-7.0.18 \ + xproxymanagementprotocol-1.0.3 + +PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2) + +define STAGE_PREPARE + for object in $(PKG_OBJECTS); do \ + cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$${object}; \ + done +endef + +define MACRO_BUILD + cd $(DIR_SRC)/$(1) && [ -e configure ] || ./autogen.sh + cd $(DIR_SRC)/$(1) && ./configure --prefix=/usr + cd $(DIR_SRC)/$(1) && make $(PARALLELISMFLAGS) + +endef + +STAGE_BUILD = $(foreach package,$(SRC_PACKAGES),$(call MACRO_BUILD,$(package))) + +define MACRO_INSTALL + cd $(DIR_SRC)/$(1) && make install DESTDIR=$(BUILDROOT) + +endef + +STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package))) + + diff --git a/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm b/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm new file mode 100644 index 0000000..b966d5d --- /dev/null +++ b/pkgs/core/xorg-x11-util-macros/xorg-x11-util-macros.nm @@ -0,0 +1,51 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-util-macros +PKG_VER = 1.10.0 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 Autotools macros. + +PKG_BUILD_DEPS+= pkg-config + +define PKG_DESCRIPTION + X.Org X11 autotools macros required for building the various \ + packages that comprise the X Window System. +endef + +PKG_TARBALL = util-macros-$(PKG_VER).tar.bz2 + +DIR_APP = $(DIR_SRC)/util-macros-$(PKG_VER) + +CONFIGURE_OPTIONS += \ + --disable-static + +INSTALL_TARGET += INSTALL="install -p" diff --git a/pkgs/core/xorg-x11-xinit/xorg-x11-xinit.nm b/pkgs/core/xorg-x11-xinit/xorg-x11-xinit.nm new file mode 100644 index 0000000..a169307 --- /dev/null +++ b/pkgs/core/xorg-x11-xinit/xorg-x11-xinit.nm @@ -0,0 +1,44 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xinit +PKG_VER = 1.2.1 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Server +PKG_URL = http://www.x.org +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 X Window System xinit startup scripts. + +PKG_BUILD_DEPS+= autoconf automake pkg-config +PKG_DEPS += libX11 + +define PKG_DESCRIPTION + X.Org X11 X Window System xinit startup scripts. +endef + +PKG_TARBALL = $(THISAPP).tar.gz diff --git a/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm new file mode 100644 index 0000000..ac3e279 --- /dev/null +++ b/pkgs/core/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm @@ -0,0 +1,76 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-x11-xkb-utils +PKG_VER = 7.4 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Fonts +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X.Org X11 xkb utilities. + +PKG_BUILD_DEPS+= pkg-config +PKG_DEPS += libX11 libxkbfile + +define PKG_DESCRIPTION + X.Org X11 xkb utilities. +endef + +CFLAGS += -DHAVE_STRCASECMP + +SRC_PACKAGES = \ + xkbcomp-1.1.1 + +PKG_OBJECTS += $(foreach package,$(SRC_PACKAGES),$(package).tar.bz2) + +define STAGE_PREPARE + for object in $(PKG_OBJECTS); do \ + cd $(DIR_SRC) && $(DO_EXTRACT) $(DIR_DL)/$${object}; \ + done +endef + +define MACRO_BUILD + cd $(DIR_SRC)/$(1) && rm -vf xkbparse.c # force regen + cd $(DIR_SRC)/$(1) && \ + ./configure \ + --prefix=/usr + + cd $(DIR_SRC)/$(1) && make $(PARALLELISMFLAGS) + +endef + +STAGE_BUILD = $(foreach package,$(SRC_PACKAGES),$(call MACRO_BUILD,$(package))) + +define MACRO_INSTALL + cd $(DIR_SRC)/$(1) && make install DESTDIR=$(BUILDROOT) + +endef + +STAGE_INSTALL = $(foreach package,$(SRC_PACKAGES),$(call MACRO_INSTALL,$(package))) + + diff --git a/pkgs/core/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch b/pkgs/core/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch new file mode 100644 index 0000000..5d474d5 --- /dev/null +++ b/pkgs/core/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch @@ -0,0 +1,11 @@ +diff -up xtrans-1.0.3/Xtransutil.c.jx xtrans-1.0.3/Xtransutil.c +--- xtrans-1.0.3/Xtransutil.c.jx 2006-12-06 11:08:53.000000000 -0500 ++++ xtrans-1.0.3/Xtransutil.c 2007-10-01 14:53:43.000000000 -0400 +@@ -271,6 +271,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ci + case AF_UNIX: + { + struct sockaddr_un *saddr = (struct sockaddr_un *) addr; ++ strcpy(hostnamebuf, "unix"); + networkId = (char *) xalloc (3 + strlen (transName) + + strlen (hostnamebuf) + strlen (saddr->sun_path)); + sprintf (networkId, "%s/%s:%s", transName, diff --git a/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm new file mode 100644 index 0000000..ad6df5e --- /dev/null +++ b/pkgs/core/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm @@ -0,0 +1,46 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include $(PKGROOT)/Include + +PKG_NAME = xorg-xtrans +PKG_VER = 1.2.5 +PKG_REL = 0 + +PKG_MAINTAINER = +PKG_GROUP = X/Libraries +PKG_URL = http://www.x.org/ +PKG_LICENSE = MIT +PKG_SUMMARY = X11 transport library. + +PKG_BUILD_DEPS+= pkg-config + +define PKG_DESCRIPTION + Transprot library for X.org X11 protocol. +endef + +PKG_TARBALL = xtrans-$(PKG_VER).tar.bz2 + +DIR_APP = $(DIR_SRC)/xtrans-$(PKG_VER) + diff --git a/pkgs/toolchain/gcc-static/gcc-static.nm b/pkgs/toolchain/gcc-static/gcc-static.nm index 0f94cd0..aab6c8e 100644 --- a/pkgs/toolchain/gcc-static/gcc-static.nm +++ b/pkgs/toolchain/gcc-static/gcc-static.nm @@ -47,6 +47,8 @@ define STAGE_BUILD --disable-shared \ --disable-nls \ --enable-esp \ + --without-cloog \ + --without-ppl \ $(CONFIGURE_ARGS) cd $(DIR_SRC)/gcc-build && make #$(PARALLELISMFLAGS) diff --git a/pkgs/toolchain/gcc/gcc.nm b/pkgs/toolchain/gcc/gcc.nm index dbe5965..304cea7 100644 --- a/pkgs/toolchain/gcc/gcc.nm +++ b/pkgs/toolchain/gcc/gcc.nm @@ -1,7 +1,7 @@ include ../gcc-static/gcc-static.nm -PKG_TOOLCHAIN_DEPS += binutils glibc +PKG_TOOLCHAIN_DEPS += binutils elfutils glibc define STAGE_PREPARE_CMDS2 cd $(DIR_APP) && sed \ @@ -33,6 +33,7 @@ define STAGE_BUILD --enable-threads=posix \ --enable-__cxa_atexit \ --enable-languages=c,c++ \ + --enable-lto \ --disable-libstdcxx-pch \ --disable-multilib \ --disable-libssp \ hooks/post-receive -- IPFire 3.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 7c42d6855321cb3247e476235fbc7538cb81f479
by git＠ipfire.org 26 Aug '10

26 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 7c42d6855321cb3247e476235fbc7538cb81f479 (commit) from d6d19d9280b1232629ed21643b2646e98d01fcaf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7c42d6855321cb3247e476235fbc7538cb81f479 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 26 18:47:39 2010 +0200 Ipfireseeder: open also 35700 udp in external access. Ipfireseeder: autorestart at reconnect. ----------------------------------------------------------------------- Summary of changes: lfs/ipfireseeder | 2 +- src/initscripts/init.d/ipfireseeder | 1 + src/paks/ipfireseeder/install.sh | 3 +++ src/paks/ipfireseeder/uninstall.sh | 8 ++++++++ src/paks/ipfireseeder/update.sh | 2 +- 5 files changed, 14 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder index 3d1a32f..a0921c6 100644 --- a/lfs/ipfireseeder +++ b/lfs/ipfireseeder @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = ipfireseeder -PAK_VER = 13 +PAK_VER = 14 DEPS = "rtorrent" diff --git a/src/initscripts/init.d/ipfireseeder b/src/initscripts/init.d/ipfireseeder index def3292..5ce5cdf 100644 --- a/src/initscripts/init.d/ipfireseeder +++ b/src/initscripts/init.d/ipfireseeder @@ -30,6 +30,7 @@ case "${1}" in evaluate_retval if ! grep -q "35700:35700" /var/ipfire/xtaccess/config ; then echo "tcp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config + echo "udp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config /usr/local/bin/setxtaccess fi ;; diff --git a/src/paks/ipfireseeder/install.sh b/src/paks/ipfireseeder/install.sh index 76f1efe..81abf5a 100644 --- a/src/paks/ipfireseeder/install.sh +++ b/src/paks/ipfireseeder/install.sh @@ -23,4 +23,7 @@ # . /opt/pakfire/lib/functions.sh extract_files +ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.up/90-S-ipfireseeder +ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.down/01-K-ipfireseeder + start_service --delay 90 --background ${NAME} diff --git a/src/paks/ipfireseeder/uninstall.sh b/src/paks/ipfireseeder/uninstall.sh index 973a2f9..888c701 100644 --- a/src/paks/ipfireseeder/uninstall.sh +++ b/src/paks/ipfireseeder/uninstall.sh @@ -31,4 +31,12 @@ cat /opt/pakfire/db/rootfiles/ipfireseeder | \ mv /opt/pakfire/db/rootfiles/ipfireseeder.tmp \ /opt/pakfire/db/rootfiles/ipfireseeder +grep -v "IPFireSeeder" /var/ipfire/xtaccess/config > /var/ipfire/xtaccess/config.tmp +mv /var/ipfire/xtaccess/config.tmp /var/ipfire/xtaccess/config +chown nobody:nobody /var/ipfire/xtaccess/config +chmod 644 /var/ipfire/xtaccess/config + +rm -f /etc/rc.d/rc?.d/???ipfireseeder +rm -f /etc/rc.d/init.d/networking/red.*/??-?-ipfireseeder + remove_files diff --git a/src/paks/ipfireseeder/update.sh b/src/paks/ipfireseeder/update.sh index 10b3490..89c40d0 100644 --- a/src/paks/ipfireseeder/update.sh +++ b/src/paks/ipfireseeder/update.sh @@ -22,5 +22,5 @@ ############################################################################ # . /opt/pakfire/lib/functions.sh -/etc/init.d/ipfireseeder stop +./uninstall.sh ./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. a500f481856700c218d6723fa28104f1510d6abe
by git＠ipfire.org 25 Aug '10

25 Aug '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. d6d19d9280b1232629ed21643b2646e98d01fcaf
by git＠ipfire.org 25 Aug '10

25 Aug '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c0ab03b580b939db4f7581fb00dc59f2211b6842
by git＠ipfire.org 23 Aug '10

23 Aug '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. dcc9dcbdc4b788d65c70a594ebfc94c7c247fa3f
by git＠ipfire.org 19 Aug '10

19 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via dcc9dcbdc4b788d65c70a594ebfc94c7c247fa3f (commit) from 0b1d3e68d50513e0b119b455b652d80727060af0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit dcc9dcbdc4b788d65c70a594ebfc94c7c247fa3f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 19 23:18:05 2010 +0200 Updater: converting fstab entries to UUID. todo add UUID's if they are missing... ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/test/update.sh | 59 ++++++++++++++++++++++++++++++++- 1 files changed, 57 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh index 1a18fce..7d136c8 100644 --- a/config/rootfiles/core/test/update.sh +++ b/config/rootfiles/core/test/update.sh @@ -25,7 +25,6 @@ /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # KVER="2.6.32.19" -ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1` MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null @@ -33,6 +32,8 @@ MOUNT=$_ if [ ! $MOUNT == "rw" ]; then MOUNT="ro" fi + + # # check if we the backup file already exist if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then @@ -80,12 +81,66 @@ echo Unpack the updated files ... # tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ --no-overwrite-dir + +# Convert /etc/fstab entries to UUID ... +# +echo Convert fstab entries to UUID ... +ROOT=`mount | grep " / " | cut -d" " -f1` +BOOT=`mount | grep " /boot " | cut -d" " -f1` +VAR=`mount | grep " /var " | cut -d" " -f1` +SWAP=`grep "/dev/" /proc/swaps | cut -d" " -f1` +# + +if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -sUUID $ROOT | cut -d'"' -f2` + if [ ! -z $ROOTUUID ]; then + sed -i "s|^$ROOT|UUID=$ROOTUUID|g" /etc/fstab + #else + #to do add uuid to rootfs + fi + else + echo "ERROR! / not found!!!" +fi + +if [ ! -z $BOOT ]; then + BOOTUUID=`blkid -sUUID $BOOT | cut -d'"' -f2` + if [ ! -z $BOOTUUID ]; then + sed -i "s|^$BOOT|UUID=$BOOTUUID|g" /etc/fstab + #else + #to do add uuid to bootfs + fi + else + echo "WARNING! /boot not found!!!" +fi + +if [ ! -z $VAR ]; then + VARUUID=`blkid -sUUID $VAR | cut -d'"' -f2` + if [ ! -z $VARUUID ]; then + sed -i "s|^$VAR|UUID=$VARUUID|g" /etc/fstab + #else + #to do add uuid to varfs + fi + else + echo "WARNING! /var not found!!!" +fi + +if [ ! -z $SWAP ]; then + SWAPUUID=`blkid -sUUID $SWAP | cut -d'"' -f2` + if [ ! -z $SWAPUUID ]; then + sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab + #else + #to do add uuid to swap + fi + else + echo "WARNING! swap not found!!!" +fi + # # Modify grub.conf # echo echo Update grub configuration ... -sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf hooks/post-receive -- IPFire 2.x development tree

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1f10d162dce4014536a16afc960650a2f728c215
by git＠ipfire.org 19 Aug '10

19 Aug '10

1 0

[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0b1d3e68d50513e0b119b455b652d80727060af0
by git＠ipfire.org 19 Aug '10

19 Aug '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 0b1d3e68d50513e0b119b455b652d80727060af0 (commit) via 7829d1d0195d99cdb30790909d9edf25ec0e40da (commit) from 927eb20ae3c6ecaa0a5795335263f636fd549382 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0b1d3e68d50513e0b119b455b652d80727060af0 Merge: 927eb20 7829d1d Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Aug 19 14:49:57 2010 +0200 Merge branch 'master' into next Conflicts: config/rootfiles/core/40/filelists/files config/rootfiles/core/40/update.sh ----------------------------------------------------------------------- Summary of changes: doc/packages-list.txt | 2 +- lfs/openvpn | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index e1ed310..ef6b635 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -261,7 +261,7 @@ * openmailadmin-1.0.0 * openssh-5.4p1 * openssl-0.9.8o -* openvpn-2.1.1 +* openvpn-2.1.2 * p7zip_4.65 * pam_mysql-0.7RC1 * patch-2.5.4 diff --git a/lfs/openvpn b/lfs/openvpn index b7d651f..8c8ad71 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -24,7 +24,7 @@ include Config -VER = 2.1.1 +VER = 2.1.2 THISAPP = openvpn-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = b273ed2b5ec8616fb9834cde8634bce7 +$(DL_FILE)_MD5 = 543a30dafcdefe1d67c0e47b80741755 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM August 2010