* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2011-10-23 22:00 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-10-23 22:00 UTC (permalink / raw
To: gentoo-commits
commit: 06e5c02608ec6fce8b2fab36ac59c1b75410edfb
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 23 22:00:50 2011 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Oct 23 22:00:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=06e5c026
x11-base/xorg-server: Drop acpi patch that no longer applies and hopefully is no longer needed.
---
.../files/xorg-server-disable-acpi.patch | 31 --------------------
x11-base/xorg-server/xorg-server-9999.ebuild | 1 -
2 files changed, 0 insertions(+), 32 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
deleted file mode 100644
index cc80e6c..0000000
--- a/x11-base/xorg-server/files/xorg-server-disable-acpi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a8079882f1884edc62a9de28af915bd8b65dfbbe Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@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/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 7f71e91..b791678 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -108,7 +108,6 @@ REQUIRED_USE="!minimal? (
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-disable-acpi.patch
"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
)
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2011-10-31 18:44 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-10-31 18:44 UTC (permalink / raw
To: gentoo-commits
commit: bb54f2447d16fee7882b43bf7c6c9d01e67c7839
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 18:44:37 2011 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Oct 31 18:44:37 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=bb54f244
x11-base/xorg-server: re-introduce acpi patch, drop nouveau patch which was merged upstream.
---
.../files/xorg-server-1.12-disable-acpi.patch | 11 +++++++
.../files/xorg-server-1.9-nouveau-default.patch | 30 --------------------
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
3 files changed, 12 insertions(+), 31 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
new file mode 100644
index 0000000..df43dbd
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
@@ -0,0 +1,11 @@
+diff -ur a/configure.ac b/configure.ac
+--- a/configure.ac 2011-10-31 19:40:02.000000000 +0100
++++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100
+@@ -1624,7 +1624,6 @@
+ linux_alpha=yes
+ ;;
+ i*86|amd64*|x86_64*|ia64*)
+- linux_acpi="yes"
+ ;;
+ *)
+ ;;
diff --git a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch b/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
deleted file mode 100644
index 2b05967..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.9-nouveau-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
-index 74016af..9c296f5 100644
---- a/hw/xfree86/common/xf86pciBus.c
-+++ b/hw/xfree86/common/xf86pciBus.c
-@@ -1118,7 +1118,23 @@ 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";
-+ break;
-+ }
-+ break;
- case 0x1106: driverList[0] = "openchrome"; break;
- case 0x1b36: driverList[0] = "qxl"; break;
- case 0x1163: driverList[0] = "rendition"; break;
---
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index b791678..d65f6da 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -108,7 +108,7 @@ REQUIRED_USE="!minimal? (
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.9-nouveau-default.patch
+ "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2011-11-06 9:54 Tomas Chvatal
0 siblings, 0 replies; 14+ messages in thread
From: Tomas Chvatal @ 2011-11-06 9:54 UTC (permalink / raw
To: gentoo-commits
commit: d58aa8118dbd97bf890f96c73f71e2a0bd6f240e
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Sun Nov 6 09:54:09 2011 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 09:54:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d58aa811
Remove the kdeprefix specific notes from xdm config as it is gone.
---
x11-base/xorg-server/files/xdm.confd-3 | 16 ----------------
x11-base/xorg-server/files/xdm.confd-4 | 10 ++++++++++
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
3 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.confd-3 b/x11-base/xorg-server/files/xdm.confd-3
deleted file mode 100644
index 9c560bb..0000000
--- a/x11-base/xorg-server/files/xdm.confd-3
+++ /dev/null
@@ -1,16 +0,0 @@
-# We always try and start X on a static VT. The various DMs normally default
-# to using VT7. If you wish to use the xdm init script, then you should ensure
-# that the VT checked is the same VT your DM wants to use. We do this check to
-# ensure that you haven't accidentally configured something to run on the VT
-# in your /etc/inittab file so that you don't get a dead keyboard.
-CHECKVT=7
-
-# What display manager do you use ? [ xdm | gdm | kdm | kdm-4.3 | gpe | entrance ]
-# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
-#
-# KDE-specific note:
-# - If you are using kdeprefix go with "kdm-4.Y", e.g. "kdm-4.3".
-# You can find possible versions by looking at the directories in /usr/kde/.
-# - Else, if you are using KDE 3 enter "kdm-3.5"
-# - Else, if you are using KDE 4 enter "kdm" without a version
-DISPLAYMANAGER="xdm"
\ No newline at end of file
diff --git a/x11-base/xorg-server/files/xdm.confd-4 b/x11-base/xorg-server/files/xdm.confd-4
new file mode 100644
index 0000000..c82fece
--- /dev/null
+++ b/x11-base/xorg-server/files/xdm.confd-4
@@ -0,0 +1,10 @@
+# We always try and start X on a static VT. The various DMs normally default
+# to using VT7. If you wish to use the xdm init script, then you should ensure
+# that the VT checked is the same VT your DM wants to use. We do this check to
+# ensure that you haven't accidentally configured something to run on the VT
+# in your /etc/inittab file so that you don't get a dead keyboard.
+CHECKVT=7
+
+# What display manager do you use ? [ xdm | gdm | kdm | gpe | entrance ]
+# NOTE: If this is set in /etc/rc.conf, that setting will override this one.
+DISPLAYMANAGER="xdm"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 79c39f3..3947705 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -184,7 +184,7 @@ src_install() {
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
newinitd "${FILESDIR}"/xdm.initd-3 xdm
- newconfd "${FILESDIR}"/xdm.confd-3 xdm
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
insinto /usr/share/portage/config/sets
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2011-11-16 22:05 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-11-16 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 8250d73c56637b466ba32c1f26894877532846ce
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 16 22:04:59 2011 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Nov 16 22:04:59 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8250d73c
x11-base/xorg-server: Import fixes for bugs #383155, #390609 and #390697 from portage.
---
.../xorg-server/files/{xdm.initd-3 => xdm.initd-4} | 2 ++
x11-base/xorg-server/xorg-server-9999.ebuild | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-3 b/x11-base/xorg-server/files/xdm.initd-4
similarity index 98%
rename from x11-base/xorg-server/files/xdm.initd-3
rename to x11-base/xorg-server/files/xdm.initd-4
index 993af2f..695e03c 100755
--- a/x11-base/xorg-server/files/xdm.initd-3
+++ b/x11-base/xorg-server/files/xdm.initd-4
@@ -45,9 +45,11 @@ depend() {
# (#145219 #180163) Could use lirc mouse as input device
# (#70689 comment #92) Start after consolefont to avoid display corruption
# (#291269) Start after quota, since some dm need readable home
+ # (#390609) gdm-3 will fail when dbus is not running
after bootmisc consolefont modules netmount
after readahead-list ypbind autofs openvpn gpm lircmd
after quota
+ after dbus
before alsasound
# Start before X
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 3947705..bb14d9e 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -39,6 +39,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
>=x11-libs/libXfixes-5.0
>=x11-libs/libXi-1.2.99.1
>=x11-libs/libXmu-1.0.3
+ x11-libs/libXrender
>=x11-libs/libXres-1.0.3
>=x11-libs/libXtst-1.0.99.2
)
@@ -113,7 +114,7 @@ PATCHES=(
pkg_pretend() {
# older gcc is not supported
- [[ $(gcc-major-version) -lt 4 ]] && \
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
}
@@ -183,7 +184,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-3 xdm
+ newinitd "${FILESDIR}"/xdm.initd-4 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2011-11-24 13:15 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2011-11-24 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 67f0887c7d9143e3b48da043147e8b89b6ea40f2
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 24 13:15:09 2011 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Nov 24 13:15:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=67f0887c
x11-base/xorg-server: sync with portage for xdm.initd dbus changes, bug #390609.
---
.../xorg-server/files/{xdm.initd-4 => xdm.initd-5} | 3 +--
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-4 b/x11-base/xorg-server/files/xdm.initd-5
similarity index 99%
rename from x11-base/xorg-server/files/xdm.initd-4
rename to x11-base/xorg-server/files/xdm.initd-5
index 695e03c..c849c84 100755
--- a/x11-base/xorg-server/files/xdm.initd-4
+++ b/x11-base/xorg-server/files/xdm.initd-5
@@ -49,11 +49,10 @@ depend() {
after bootmisc consolefont modules netmount
after readahead-list ypbind autofs openvpn gpm lircmd
after quota
- after dbus
before alsasound
# Start before X
- use consolekit xfs
+ use consolekit dbus xfs
}
setup_dm() {
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index bb14d9e..f683455 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -184,7 +184,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-4 xdm
+ newinitd "${FILESDIR}"/xdm.initd-5 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-14 17:42 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-03-14 17:42 UTC (permalink / raw
To: gentoo-commits
commit: 4c8616274c2c1ee4c9b0d84820a6028bd314691a
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 14 17:42:47 2012 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Mar 14 17:42:47 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4c861627
x11-base/xorg-server: add "after keymaps" to xdm init script, bug #366753.
---
.../xorg-server/files/{xdm.initd-5 => xdm.initd-6} | 3 ++-
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-5 b/x11-base/xorg-server/files/xdm.initd-6
similarity index 98%
rename from x11-base/xorg-server/files/xdm.initd-5
rename to x11-base/xorg-server/files/xdm.initd-6
index c849c84..ad37861 100755
--- a/x11-base/xorg-server/files/xdm.initd-5
+++ b/x11-base/xorg-server/files/xdm.initd-6
@@ -46,9 +46,10 @@ depend() {
# (#70689 comment #92) Start after consolefont to avoid display corruption
# (#291269) Start after quota, since some dm need readable home
# (#390609) gdm-3 will fail when dbus is not running
+ # (#366753) starting keymaps after X causes problems
after bootmisc consolefont modules netmount
after readahead-list ypbind autofs openvpn gpm lircmd
- after quota
+ after quota keymaps
before alsasound
# Start before X
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index c375c15..68df3a3 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -185,7 +185,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-5 xdm
+ newinitd "${FILESDIR}"/xdm.initd-6 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-03-20 16:10 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-03-20 16:10 UTC (permalink / raw
To: gentoo-commits
commit: 895bbaf28504f11323a287ad245d8bd364905d30
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 20 16:10:57 2012 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue Mar 20 16:10:57 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=895bbaf2
x11-base/xorg-server: import lightdm support from portage, bug #389309.
---
.../xorg-server/files/{xdm.initd-6 => xdm.initd-7} | 9 +++++++--
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-6 b/x11-base/xorg-server/files/xdm.initd-7
old mode 100755
new mode 100644
similarity index 96%
rename from x11-base/xorg-server/files/xdm.initd-6
rename to x11-base/xorg-server/files/xdm.initd-7
index ad37861..51fc700
--- a/x11-base/xorg-server/files/xdm.initd-6
+++ b/x11-base/xorg-server/files/xdm.initd-7
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-3,v 1.2 2011/01/22 15:30:07 lxnay Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-7,v 1.1 2012/03/20 16:02:51 ssuominen Exp $
# This is here to serve as a note to myself, and future developers.
#
@@ -97,6 +97,11 @@ setup_dm() {
PIDFILE=/var/run/lxdm.pid
START_STOP_ARGS="--background"
;;
+ lightdm)
+ EXE=/usr/sbin/lightdm
+ PIDFILE=/var/run/lightdm.pid
+ START_STOP_ARGS="--background"
+ ;;
*)
# first find out if there is such executable
EXE="$(which ${MY_XDM} 2>/dev/null)"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 7701025..3334c09 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -185,7 +185,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-6 xdm
+ newinitd "${FILESDIR}"/xdm.initd-7 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-04-29 13:07 Tomas Chvatal
0 siblings, 0 replies; 14+ messages in thread
From: Tomas Chvatal @ 2012-04-29 13:07 UTC (permalink / raw
To: gentoo-commits
commit: b46e0cd479d9880aeab4b2580d70d129de835a4a
Author: Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Sun Apr 29 13:03:43 2012 +0000
Commit: Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Apr 29 13:03:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b46e0cd4
Version bump the init script wrt bug#410229.
---
.../xorg-server/files/{xdm.initd-7 => xdm.initd-8} | 8 ++------
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-7 b/x11-base/xorg-server/files/xdm.initd-8
similarity index 97%
rename from x11-base/xorg-server/files/xdm.initd-7
rename to x11-base/xorg-server/files/xdm.initd-8
index 51fc700..063f88b 100644
--- a/x11-base/xorg-server/files/xdm.initd-7
+++ b/x11-base/xorg-server/files/xdm.initd-8
@@ -68,11 +68,7 @@ setup_dm() {
NAME=
case "${MY_XDM}" in
kdm|kde)
- EXE="$(which kdm)"
- PIDFILE=/var/run/kdm.pid
- ;;
- kdm-*)
- EXE="/usr/kde/${MY_XDM#kdm-}/bin/kdm"
+ EXE=/usr/bin/kdm
PIDFILE=/var/run/kdm.pid
;;
entrance*)
@@ -104,7 +100,7 @@ setup_dm() {
;;
*)
# first find out if there is such executable
- EXE="$(which ${MY_XDM} 2>/dev/null)"
+ EXE="$(command -v ${MY_XDM} 2>/dev/null)"
PIDFILE="/var/run/${MY_XDM}.pid"
# warn user that he is doing sick things if the exe was not found
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 3334c09..c89b1ac 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -185,7 +185,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-7 xdm
+ newinitd "${FILESDIR}"/xdm.initd-8 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2012-11-11 1:51 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2012-11-11 1:51 UTC (permalink / raw
To: gentoo-commits
commit: d1390a957cbc8f0fd4c3d1179752389abd263fa7
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 01:51:49 2012 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Nov 11 01:51:49 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d1390a95
x11-base/xorg-server: Fix xdm init script for entrance, bug #439760.
---
.../xorg-server/files/{xdm.initd-8 => xdm.initd-9} | 4 ++--
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-8 b/x11-base/xorg-server/files/xdm.initd-9
similarity index 98%
rename from x11-base/xorg-server/files/xdm.initd-8
rename to x11-base/xorg-server/files/xdm.initd-9
index 063f88b..3c52316 100644
--- a/x11-base/xorg-server/files/xdm.initd-8
+++ b/x11-base/xorg-server/files/xdm.initd-9
@@ -72,8 +72,8 @@ setup_dm() {
PIDFILE=/var/run/kdm.pid
;;
entrance*)
- EXE=/usr/sbin/entranced
- PIDFILE=/var/lib/entranced.pid
+ EXE=/usr/sbin/entrance
+ PIDFILE=/var/run/entrance.pid
;;
gdm|gnome)
EXE=/usr/bin/gdm
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index df2e62c..23c8358 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -186,7 +186,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-8 xdm
+ newinitd "${FILESDIR}"/xdm.initd-9 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2013-09-15 14:16 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2013-09-15 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 2152bf82a29d52722e2c375ec7e5801680b33fd1
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 14:16:52 2013 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Sep 15 14:16:52 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2152bf82
x11-base/xorg-server: add ia64 patches for bug #447152.
---
.../files/xorg-server-1.12-ia64-fix_inx_outx.patch | 60 ++++++++++++++++++++++
.../files/xorg-server-1.12-unloadsubmodule.patch | 53 +++++++++++++++++++
x11-base/xorg-server/xorg-server-9999.ebuild | 4 +-
3 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
new file mode 100644
index 0000000..24a5a02
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
@@ -0,0 +1,60 @@
+diff -r --context xorg-server-1.12.3/hw/xfree86/common/compiler.h xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h
+*** xorg-server-1.12.3/hw/xfree86/common/compiler.h 2012-07-06 07:17:19.000000000 +0200
+--- xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h 2012-08-29 00:14:39.000000000 +0200
+***************
+*** 421,426 ****
+--- 421,474 ----
+ #include <machine/pio.h>
+ #endif /* __NetBSD__ */
+
++ #elif defined(linux) && defined(__ia64__)
++ /* for Linux on ia64, we use the LIBC _inx/_outx routines */
++ /* note that the appropriate setup via "ioperm" needs to be done */
++ /* *before* any inx/outx is done. */
++
++ extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
++ extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
++ extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
++ extern _X_EXPORT unsigned int _inb(unsigned long port);
++ extern _X_EXPORT unsigned int _inw(unsigned long port);
++ extern _X_EXPORT unsigned int _inl(unsigned long port);
++
++ static __inline__ void
++ outb(unsigned long port, unsigned char val)
++ {
++ _outb(val, port);
++ }
++
++ static __inline__ void
++ outw(unsigned long port, unsigned short val)
++ {
++ _outw(val, port);
++ }
++
++ static __inline__ void
++ outl(unsigned long port, unsigned int val)
++ {
++ _outl(val, port);
++ }
++
++ static __inline__ unsigned int
++ inb(unsigned long port)
++ {
++ return _inb(port);
++ }
++
++ static __inline__ unsigned int
++ inw(unsigned long port)
++ {
++ return _inw(port);
++ }
++
++ static __inline__ unsigned int
++ inl(unsigned long port)
++ {
++ return _inl(port);
++ }
++
+ #elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
+
+ #include <inttypes.h>
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
new file mode 100644
index 0000000..57c7349
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-1.12-unloadsubmodule.patch
@@ -0,0 +1,53 @@
+diff -u13 -r xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c xorg-server-1.12.3/hw/xfree86/loader/loadmod.c
+--- xorg-server-1.12.3-old/hw/xfree86/loader/loadmod.c 2012-09-05 18:26:42.000000000 +0200
++++ xorg-server-1.12.3/hw/xfree86/loader/loadmod.c 2012-09-05 18:28:54.000000000 +0200
+@@ -1109,39 +1109,38 @@
+ static void
+ RemoveChild(ModuleDescPtr child)
+ {
+ ModuleDescPtr mdp;
+ ModuleDescPtr prevsib;
+ ModuleDescPtr parent;
+
+ if (!child->parent)
+ return;
+
+ parent = child->parent;
+ if (parent->child == child) {
+ parent->child = child->sib;
+- return;
+- }
+-
+- prevsib = parent->child;
+- mdp = prevsib->sib;
+- while (mdp && mdp != child) {
+- prevsib = mdp;
+- mdp = mdp->sib;
++ }
++ else {
++ prevsib = parent->child;
++ mdp = prevsib->sib;
++ while (mdp && mdp != child) {
++ prevsib = mdp;
++ mdp = mdp->sib;
++ }
++ if (mdp == child)
++ prevsib->sib = child->sib;
+ }
+- if (mdp == child)
+- prevsib->sib = child->sib;
+ child->sib = NULL;
+- return;
+ }
+
+ void
+ LoaderErrorMsg(const char *name, const char *modname, int errmaj, int errmin)
+ {
+ const char *msg;
+ MessageType type = X_ERROR;
+
+ switch (errmaj) {
+ case LDR_NOERROR:
+ msg = "no error";
+ break;
+ case LDR_NOMEM:
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 6921767..5a616c9 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -10,7 +10,7 @@ EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
DESCRIPTION="X.Org X servers"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
IUSE="${IUSE_SERVERS} ipv6 minimal nptl selinux +suid tslib +udev"
@@ -112,6 +112,8 @@ REQUIRED_USE="!minimal? (
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
"${FILESDIR}"/${PN}-1.12-disable-acpi.patch
+ "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
)
pkg_pretend() {
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2013-11-09 13:38 Michał Górny
0 siblings, 0 replies; 14+ messages in thread
From: Michał Górny @ 2013-11-09 13:38 UTC (permalink / raw
To: gentoo-commits
commit: a156cacb380d18a8d42fc4c3e8f2b805d12af145
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 13:38:43 2013 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 13:38:43 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a156cacb
x11-base/xorg-server: Replace the linux-acpi disable patch with --disable-linux-acpi.
Package-Manager: portage-2.2.7
---
.../xorg-server/files/xorg-server-1.12-disable-acpi.patch | 11 -----------
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch b/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
deleted file mode 100644
index df43dbd..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-disable-acpi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac 2011-10-31 19:40:02.000000000 +0100
-+++ b/configure.ac 2011-10-31 19:41:02.372745481 +0100
-@@ -1624,7 +1624,6 @@
- linux_alpha=yes
- ;;
- i*86|amd64*|x86_64*|ia64*)
-- linux_acpi="yes"
- ;;
- *)
- ;;
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 5d00cf8..a7bdcd1 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -114,7 +114,6 @@ REQUIRED_USE="!minimal? (
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-disable-acpi.patch
"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
)
@@ -159,6 +158,7 @@ src_configure() {
--with-fontrootdir="${EPREFIX}"/usr/share/fonts
--with-xkb-output="${EPREFIX}"/var/lib/xkb
--disable-config-hal
+ --disable-linux-acpi
--without-dtrace
--without-fop
--with-os-vendor=Gentoo
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2013-12-16 23:57 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2013-12-16 23:57 UTC (permalink / raw
To: gentoo-commits
commit: cc0599da7d828396c8b9ce3179bf82d60654d0cd
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 16 23:57:39 2013 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Dec 16 23:57:39 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=cc0599da
x11-base/xorg-server: update to latest xdm init script.
---
.../files/{xdm.initd-9 => xdm.initd-10} | 34 ++++++++++++++--------
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-9 b/x11-base/xorg-server/files/xdm.initd-10
similarity index 88%
rename from x11-base/xorg-server/files/xdm.initd-9
rename to x11-base/xorg-server/files/xdm.initd-10
index 3c52316..9826e6b 100644
--- a/x11-base/xorg-server/files/xdm.initd-9
+++ b/x11-base/xorg-server/files/xdm.initd-10
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-7,v 1.1 2012/03/20 16:02:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/files/xdm.initd-10,v 1.1 2013/09/26 15:23:33 axs Exp $
# This is here to serve as a note to myself, and future developers.
#
@@ -69,16 +69,24 @@ setup_dm() {
case "${MY_XDM}" in
kdm|kde)
EXE=/usr/bin/kdm
- PIDFILE=/var/run/kdm.pid
+ PIDFILE=/run/kdm.pid
;;
entrance*)
EXE=/usr/sbin/entrance
- PIDFILE=/var/run/entrance.pid
+ PIDFILE=/run/entrance.pid
;;
gdm|gnome)
- EXE=/usr/bin/gdm
+ # gdm-3 and above has different paths
+ if [ -f /usr/sbin/gdm ]; then
+ EXE=/usr/sbin/gdm
+ PIDFILE=/run/gdm/gdm.pid
+ START_STOP_ARGS="--background"
+ AUTOCLEAN_CGROUP="yes"
+ else
+ EXE=/usr/bin/gdm
+ PIDFILE=/run/gdm.pid
+ fi
[ "${RC_UNAME}" != "Linux" ] && NAME=gdm-binary
- PIDFILE=/var/run/gdm.pid
;;
wdm)
EXE=/usr/bin/wdm
@@ -86,22 +94,22 @@ setup_dm() {
;;
gpe)
EXE=/usr/bin/gpe-dm
- PIDFILE=/var/run/gpe-dm.pid
+ PIDFILE=/run/gpe-dm.pid
;;
lxdm)
EXE=/usr/sbin/lxdm-binary
- PIDFILE=/var/run/lxdm.pid
+ PIDFILE=/run/lxdm.pid
START_STOP_ARGS="--background"
;;
lightdm)
EXE=/usr/sbin/lightdm
- PIDFILE=/var/run/lightdm.pid
+ PIDFILE=/run/lightdm.pid
START_STOP_ARGS="--background"
;;
*)
# first find out if there is such executable
EXE="$(command -v ${MY_XDM} 2>/dev/null)"
- PIDFILE="/var/run/${MY_XDM}.pid"
+ PIDFILE="/run/${MY_XDM}.pid"
# warn user that he is doing sick things if the exe was not found
if [ -z "${EXE}" ]; then
@@ -113,7 +121,7 @@ setup_dm() {
if ! [ -x "${EXE}" ]; then
EXE=/usr/bin/xdm
- PIDFILE=/var/run/xdm.pid
+ PIDFILE=/run/xdm.pid
if ! [ -x "/usr/bin/xdm" ]; then
echo "ERROR: Please set your DISPLAYMANAGER variable in /etc/conf.d/xdm,"
echo " or install x11-apps/xdm package"
@@ -134,7 +142,7 @@ vtstatic() {
}
start() {
- local EXE NAME PIDFILE
+ local EXE NAME PIDFILE AUTOCLEAN_CGROUP
setup_dm
if [ -f /etc/.noxdm ]; then
@@ -150,6 +158,7 @@ start() {
save_options "name" "${NAME}"
save_options "pidfile" "${PIDFILE}"
save_options "start_stop_args" "${START_STOP_ARGS}"
+ save_options "autoclean_cgroup" "${AUTOCLEAN_CGROUP:-no}"
if [ -n "${CHECKVT-y}" ] ; then
if vtstatic "${CHECKVT:-7}" ; then
@@ -188,6 +197,7 @@ stop() {
myname=$(get_options "name")
mypidfile=$(get_options "pidfile")
myservice=${myexe##*/}
+ yesno "${rc_cgroup_cleanup:-no}" || rc_cgroup_cleanup=$(get_options "autoclean_cgroup")
[ -z "${myexe}" ] && return 0
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 14ccc2a..1062cf8 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -191,7 +191,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-9 xdm
+ newinitd "${FILESDIR}"/xdm.initd-10 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2014-01-26 17:41 Chi-Thanh Christopher Nguyen
0 siblings, 0 replies; 14+ messages in thread
From: Chi-Thanh Christopher Nguyen @ 2014-01-26 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 486ed0687972a50fc683182309630de5e35a0919
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 26 17:41:57 2014 +0000
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Jan 26 17:41:57 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=486ed068
x11-base/xorg-server: add sddm support to xdm init script, bug #498972.
---
x11-base/xorg-server/files/{xdm.initd-10 => xdm.initd-11} | 4 ++++
x11-base/xorg-server/xorg-server-9999.ebuild | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/x11-base/xorg-server/files/xdm.initd-10 b/x11-base/xorg-server/files/xdm.initd-11
similarity index 98%
rename from x11-base/xorg-server/files/xdm.initd-10
rename to x11-base/xorg-server/files/xdm.initd-11
index 9826e6b..864726f 100644
--- a/x11-base/xorg-server/files/xdm.initd-10
+++ b/x11-base/xorg-server/files/xdm.initd-11
@@ -106,6 +106,10 @@ setup_dm() {
PIDFILE=/run/lightdm.pid
START_STOP_ARGS="--background"
;;
+ sddm)
+ EXE=/usr/bin/sddm
+ START_STOP_ARGS="--background"
+ ;;
*)
# first find out if there is such executable
EXE="$(command -v ${MY_XDM} 2>/dev/null)"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 0367b18..dbca4be 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -191,7 +191,7 @@ src_install() {
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-10 xdm
+ newinitd "${FILESDIR}"/xdm.initd-11 xdm
newconfd "${FILESDIR}"/xdm.confd-4 xdm
# install the @x11-module-rebuild set for Portage
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/
@ 2014-10-03 12:01 David Heidelberger
0 siblings, 0 replies; 14+ messages in thread
From: David Heidelberger @ 2014-10-03 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 723e9fb124997472a58e743df441e191f4b2ccac
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Fri Oct 3 12:01:07 2014 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri Oct 3 12:01:07 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=723e9fb1
x11-base/xorg-server: remove ia64 broken patch
Signed-off-by: David Heidelberger <david.heidelberger <AT> ixit.cz>
---
.../files/xorg-server-1.12-ia64-fix_inx_outx.patch | 60 ----------------------
x11-base/xorg-server/xorg-server-9999.ebuild | 1 -
2 files changed, 61 deletions(-)
diff --git a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch b/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
deleted file mode 100644
index 24a5a02..0000000
--- a/x11-base/xorg-server/files/xorg-server-1.12-ia64-fix_inx_outx.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -r --context xorg-server-1.12.3/hw/xfree86/common/compiler.h xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h
-*** xorg-server-1.12.3/hw/xfree86/common/compiler.h 2012-07-06 07:17:19.000000000 +0200
---- xorg-server-1.12.3-fix/hw/xfree86/common/compiler.h 2012-08-29 00:14:39.000000000 +0200
-***************
-*** 421,426 ****
---- 421,474 ----
- #include <machine/pio.h>
- #endif /* __NetBSD__ */
-
-+ #elif defined(linux) && defined(__ia64__)
-+ /* for Linux on ia64, we use the LIBC _inx/_outx routines */
-+ /* note that the appropriate setup via "ioperm" needs to be done */
-+ /* *before* any inx/outx is done. */
-+
-+ extern _X_EXPORT void _outb(unsigned char val, unsigned long port);
-+ extern _X_EXPORT void _outw(unsigned short val, unsigned long port);
-+ extern _X_EXPORT void _outl(unsigned int val, unsigned long port);
-+ extern _X_EXPORT unsigned int _inb(unsigned long port);
-+ extern _X_EXPORT unsigned int _inw(unsigned long port);
-+ extern _X_EXPORT unsigned int _inl(unsigned long port);
-+
-+ static __inline__ void
-+ outb(unsigned long port, unsigned char val)
-+ {
-+ _outb(val, port);
-+ }
-+
-+ static __inline__ void
-+ outw(unsigned long port, unsigned short val)
-+ {
-+ _outw(val, port);
-+ }
-+
-+ static __inline__ void
-+ outl(unsigned long port, unsigned int val)
-+ {
-+ _outl(val, port);
-+ }
-+
-+ static __inline__ unsigned int
-+ inb(unsigned long port)
-+ {
-+ return _inb(port);
-+ }
-+
-+ static __inline__ unsigned int
-+ inw(unsigned long port)
-+ {
-+ return _inw(port);
-+ }
-+
-+ static __inline__ unsigned int
-+ inl(unsigned long port)
-+ {
-+ return _inl(port);
-+ }
-+
- #elif (defined(linux) || defined(__FreeBSD__)) && defined(__amd64__)
-
- #include <inttypes.h>
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index e3269f1..f717665 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -128,7 +128,6 @@ REQUIRED_USE="!minimal? (
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
)
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-10-03 12:01 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-03 12:01 [gentoo-commits] proj/x11:master commit in: x11-base/xorg-server/files/, x11-base/xorg-server/ David Heidelberger
-- strict thread matches above, loose matches on Subject: below --
2014-01-26 17:41 Chi-Thanh Christopher Nguyen
2013-12-16 23:57 Chi-Thanh Christopher Nguyen
2013-11-09 13:38 Michał Górny
2013-09-15 14:16 Chi-Thanh Christopher Nguyen
2012-11-11 1:51 Chi-Thanh Christopher Nguyen
2012-04-29 13:07 Tomas Chvatal
2012-03-20 16:10 Chi-Thanh Christopher Nguyen
2012-03-14 17:42 Chi-Thanh Christopher Nguyen
2011-11-24 13:15 Chi-Thanh Christopher Nguyen
2011-11-16 22:05 Chi-Thanh Christopher Nguyen
2011-11-06 9:54 Tomas Chvatal
2011-10-31 18:44 Chi-Thanh Christopher Nguyen
2011-10-23 22:00 Chi-Thanh Christopher Nguyen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox