summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-12-16 22:45:39 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2013-12-16 22:45:39 +0000
commitefa601d0b6540e46bbea1f742cef1f237d88b850 (patch)
treef692778269411980e36987405afd6976aff82bc6 /x11-base
parentVersion bump. (diff)
downloadgentoo-2-efa601d0b6540e46bbea1f742cef1f237d88b850.tar.gz
gentoo-2-efa601d0b6540e46bbea1f742cef1f237d88b850.tar.bz2
gentoo-2-efa601d0b6540e46bbea1f742cef1f237d88b850.zip
Version bump. Remove old prerelease.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog11
-rw-r--r--x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch43
-rw-r--r--x11-base/xorg-server/xorg-server-1.14.5.ebuild (renamed from x11-base/xorg-server/xorg-server-1.14.99.903.ebuild)20
-rw-r--r--x11-base/xorg-server/xorg-server-1.14.99.904.ebuild (renamed from x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild)7
4 files changed, 21 insertions, 60 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 643dece783c7..dcf709ffdeb6 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.777 2013/12/04 10:06:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.778 2013/12/16 22:45:39 chithanh Exp $
+
+*xorg-server-1.14.99.904 (16 Dec 2013)
+*xorg-server-1.14.5 (16 Dec 2013)
+
+ 16 Dec 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ +xorg-server-1.14.5.ebuild, +xorg-server-1.14.99.904.ebuild,
+ -files/xorg-server-1.15-xshmfence-1.1.patch,
+ -xorg-server-1.14.99.903-r1.ebuild, -xorg-server-1.14.99.903.ebuild:
+ Version bump. Remove old prerelease.
*xorg-server-1.14.99.903-r1 (04 Dec 2013)
diff --git a/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch b/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch
deleted file mode 100644
index d2cffe73b284..000000000000
--- a/x11-base/xorg-server/files/xorg-server-1.15-xshmfence-1.1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From eafba23b34be31c141ddafb8380520ac9a0622ac Mon Sep 17 00:00:00 2001
-From: Keith Packard <keithp@keithp.com>
-Date: Fri, 22 Nov 2013 06:45:18 +0000
-Subject: miext/sync: Handle libxshmfence API change
-
-libxshmfence had an unfortunate 'int32_t' type for the mapped fence.
-That changed to exposing a 'struct shmfence' instead, which is nice
-and opaque and offers fine type checking across the API.
-
-This patch requires the newer version of the library and uses
-the new interface type.
-
-Signed-off-by: Keith Packard <keithp@keithp.com>
-Reviewed-by: Julien Cristau <jcristau@debian.org>
----
-diff --git a/configure.ac b/configure.ac
-index f6ecdc6..5a36e54 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -787,7 +787,7 @@ DMXPROTO="dmxproto >= 2.2.99.1"
- VIDMODEPROTO="xf86vidmodeproto >= 2.2.99.1"
- WINDOWSWMPROTO="windowswmproto"
- APPLEWMPROTO="applewmproto >= 1.4"
--XSHMFENCE="xshmfence"
-+XSHMFENCE="xshmfence >= 1.1"
-
- dnl Required modules
- XPROTO="xproto >= 7.0.22"
-diff --git a/miext/sync/misyncshm.c b/miext/sync/misyncshm.c
-index 20780fd..01f82fc 100644
---- a/miext/sync/misyncshm.c
-+++ b/miext/sync/misyncshm.c
-@@ -38,7 +38,7 @@
- static DevPrivateKeyRec syncShmFencePrivateKey;
-
- typedef struct _SyncShmFencePrivate {
-- int32_t *fence;
-+ struct xshmfence *fence;
- int fd;
- } SyncShmFencePrivateRec, *SyncShmFencePrivatePtr;
-
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-base/xorg-server/xorg-server-1.14.99.903.ebuild b/x11-base/xorg-server/xorg-server-1.14.5.ebuild
index 941d8f91a9fd..8060037588e6 100644
--- a/x11-base/xorg-server/xorg-server-1.14.99.903.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.14.5.ebuild
@@ -1,10 +1,12 @@
# 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/xorg-server-1.14.99.903.ebuild,v 1.2 2013/11/29 15:39:39 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.5.ebuild,v 1.1 2013/12/16 22:45:39 chithanh Exp $
EAPI=5
XORG_DOC=doc
+# avoid maintainer mode, bug #484634
+XORG_EAUTORECONF=yes
inherit xorg-2 multilib versionator flag-o-matic
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
@@ -28,9 +30,8 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXfont-1.4.2
>=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libxshmfence-1.0
>=x11-libs/pixman-0.27.2
- >=x11-libs/xtrans-1.3.2
+ >=x11-libs/xtrans-1.2.2
>=x11-misc/xbitmaps-1.0.1
>=x11-misc/xkeyboard-config-2.4.1-r3
dmx? (
@@ -53,7 +54,7 @@ RDEPEND=">=app-admin/eselect-opengl-1.0.8
!minimal? (
>=x11-libs/libX11-1.1.5
>=x11-libs/libXext-1.0.5
- >=media-libs/mesa-9.2.0[nptl=]
+ >=media-libs/mesa-8[nptl=]
)
tslib? ( >=x11-libs/tslib-1.0 )
udev? ( >=virtual/udev-150 )
@@ -78,14 +79,12 @@ DEPEND="${RDEPEND}
>=x11-proto/trapproto-3.4.3
>=x11-proto/videoproto-2.2.2
>=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xextproto-7.2.99.901
+ >=x11-proto/xextproto-7.1.99
>=x11-proto/xf86dgaproto-2.0.99.1
>=x11-proto/xf86rushproto-1.1.2
>=x11-proto/xf86vidmodeproto-2.2.99.1
>=x11-proto/xineramaproto-1.1.3
>=x11-proto/xproto-7.0.22
- >=x11-proto/presentproto-1.0
- >=x11-proto/dri3proto-1.0
dmx? (
>=x11-proto/dmxproto-2.2.99.1
doc? (
@@ -114,6 +113,7 @@ 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
)
@@ -158,7 +158,6 @@ 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
@@ -191,7 +190,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
@@ -204,9 +203,6 @@ pkg_postinst() {
eselect opengl set xorg-x11 --use-old
if [[ ${PV} != 9999 && $(get_version_component_range 2 ${REPLACING_VERSIONS}) != $(get_version_component_range 2 ${PV}) ]]; then
- elog "You should consider reading upgrade guide for this release:"
- elog " http://www.gentoo.org/proj/en/desktop/x/x11/xorg-server-$(get_version_component_range 1-2)-upgrade-guide.xml"
- echo
ewarn "You must rebuild all drivers if upgrading from <xorg-server-$(get_version_component_range 1-2)"
ewarn "because the ABI changed. If you cannot start X because"
ewarn "of module version mismatch errors, this is your problem."
diff --git a/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild b/x11-base/xorg-server/xorg-server-1.14.99.904.ebuild
index 4923fb3a3a6d..2866fbb5efa8 100644
--- a/x11-base/xorg-server/xorg-server-1.14.99.903-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.14.99.904.ebuild
@@ -1,6 +1,6 @@
# 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/xorg-server-1.14.99.903-r1.ebuild,v 1.1 2013/12/04 10:06:57 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.14.99.904.ebuild,v 1.1 2013/12/16 22:45:39 chithanh Exp $
EAPI=5
@@ -68,7 +68,7 @@ DEPEND="${RDEPEND}
>=x11-proto/damageproto-1.1
>=x11-proto/fixesproto-5.0
>=x11-proto/fontsproto-2.0.2
- >=x11-proto/glproto-1.4.16
+ >=x11-proto/glproto-1.4.17
>=x11-proto/inputproto-2.2.99.1
>=x11-proto/kbproto-1.0.3
>=x11-proto/randrproto-1.4.0
@@ -117,7 +117,6 @@ PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
"${FILESDIR}"/${PN}-1.12-ia64-fix_inx_outx.patch
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- "${FILESDIR}"/${PN}-1.15-xshmfence-1.1.patch
)
pkg_pretend() {
@@ -193,7 +192,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