* [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.11.0.ebuild xorg-server-1.10.99.901.ebuild xorg-server-1.10.99.902.ebuild
@ 2011-08-27 3:57 Chi-Thanh Christopher Nguyen (chithanh)
0 siblings, 0 replies; only message in thread
From: Chi-Thanh Christopher Nguyen (chithanh) @ 2011-08-27 3:57 UTC (permalink / raw
To: gentoo-commits
chithanh 11/08/27 03:57:13
Modified: ChangeLog
Added: xorg-server-1.11.0.ebuild
Removed: xorg-server-1.10.99.901.ebuild
xorg-server-1.10.99.902.ebuild
Log:
Version bump.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.607 x11-base/xorg-server/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.607&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?rev=1.607&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/ChangeLog?r1=1.606&r2=1.607
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -r1.606 -r1.607
--- ChangeLog 20 Aug 2011 15:41:42 -0000 1.606
+++ ChangeLog 27 Aug 2011 03:57:12 -0000 1.607
@@ -1,6 +1,13 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.606 2011/08/20 15:41:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.607 2011/08/27 03:57:12 chithanh Exp $
+
+*xorg-server-1.11.0 (27 Aug 2011)
+
+ 27 Aug 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ -xorg-server-1.10.99.901.ebuild, -xorg-server-1.10.99.902.ebuild,
+ +xorg-server-1.11.0.ebuild:
+ Version bump.
20 Aug 2011; Jeroen Roovers <jer@gentoo.org> xorg-server-1.10.2.ebuild:
Stable for HPPA (bug #371857).
1.1 x11-base/xorg-server/xorg-server-1.11.0.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.0.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-base/xorg-server/xorg-server-1.11.0.ebuild?rev=1.1&content-type=text/plain
Index: xorg-server-1.11.0.ebuild
===================================================================
# Copyright 1999-2011 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.11.0.ebuild,v 1.1 2011/08/27 03:57:12 chithanh Exp $
EAPI=4
XORG_DOC=doc
inherit xorg-2 multilib versionator
EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver"
DESCRIPTION="X.Org X servers"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
IUSE="${IUSE_SERVERS} ipv6 minimal nptl tslib +udev"
RDEPEND=">=app-admin/eselect-opengl-1.0.8
dev-libs/openssl
media-libs/freetype
>=x11-apps/iceauth-1.0.2
>=x11-apps/rgb-1.0.3
>=x11-apps/xauth-1.0.3
x11-apps/xkbcomp
>=x11-libs/libpciaccess-0.10.3
>=x11-libs/libXau-1.0.4
>=x11-libs/libXdmcp-1.0.2
>=x11-libs/libXfont-1.4.2
>=x11-libs/libxkbfile-1.0.4
>=x11-libs/pixman-0.21.8
>=x11-libs/xtrans-1.2.2
>=x11-misc/xbitmaps-1.0.1
>=x11-misc/xkeyboard-config-1.4
dmx? (
x11-libs/libXt
>=x11-libs/libdmx-1.0.99.1
>=x11-libs/libX11-1.1.5
>=x11-libs/libXaw-1.0.4
>=x11-libs/libXext-1.0.99.4
>=x11-libs/libXfixes-4.0.3
>=x11-libs/libXi-1.2.99.1
>=x11-libs/libXmu-1.0.3
>=x11-libs/libXres-1.0.3
>=x11-libs/libXtst-1.0.99.2
)
kdrive? (
>=x11-libs/libXext-1.0.5
x11-libs/libXv
)
!minimal? (
>=x11-libs/libX11-1.1.5
>=x11-libs/libXext-1.0.5
>=media-libs/mesa-7.8_rc[nptl=]
)
tslib? ( >=x11-libs/tslib-1.0 )
udev? ( >=sys-fs/udev-150 )
>=x11-apps/xinit-1.3"
DEPEND="${RDEPEND}
sys-devel/flex
>=x11-proto/bigreqsproto-1.1.0
>=x11-proto/compositeproto-0.4
>=x11-proto/damageproto-1.1
>=x11-proto/fixesproto-4.1
>=x11-proto/fontsproto-2.0.2
>=x11-proto/glproto-1.4.14
>=x11-proto/inputproto-1.9.99.902
>=x11-proto/kbproto-1.0.3
>=x11-proto/randrproto-1.2.99.3
>=x11-proto/recordproto-1.13.99.1
>=x11-proto/renderproto-0.11
>=x11-proto/resourceproto-1.0.2
>=x11-proto/scrnsaverproto-1.1
>=x11-proto/trapproto-3.4.3
>=x11-proto/videoproto-2.2.2
>=x11-proto/xcmiscproto-1.2.0
>=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
dmx? ( >=x11-proto/dmxproto-2.2.99.1 )
!minimal? (
>=x11-proto/xf86driproto-2.1.0
>=x11-proto/dri2proto-2.6
>=x11-libs/libdrm-2.4.20
)"
PDEPEND="
xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
REQUIRED_USE="!minimal? (
|| ( ${IUSE_SERVERS} )
)"
#UPSTREAMED_PATCHES=(
# "${WORKDIR}/patches/"
#)
PATCHES=(
"${UPSTREAMED_PATCHES[@]}"
"${FILESDIR}"/${PN}-disable-acpi.patch
"${FILESDIR}"/${PN}-1.9-nouveau-default.patch
)
pkg_pretend() {
# older gcc is not supported
[[ $(gcc-major-version) -lt 4 ]] && \
die "Sorry, but gcc earlier than 4.0 wont work for xorg-server."
}
pkg_setup() {
xorg-2_pkg_setup
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
# --enable-install-setuid needed because sparcs default off
# NOTE: fop is used for doc generating ; and i have no idea if gentoo
# package it somewhere
XORG_CONFIGURE_OPTIONS=(
$(use_enable ipv6)
$(use_enable dmx)
$(use_enable kdrive)
$(use_enable kdrive kdrive-kbd)
$(use_enable kdrive kdrive-mouse)
$(use_enable kdrive kdrive-evdev)
$(use_enable tslib)
$(use_enable !minimal record)
$(use_enable !minimal xfree86-utils)
$(use_enable !minimal install-libxf86config)
$(use_enable !minimal dri)
$(use_enable !minimal dri2)
$(use_enable !minimal glx)
$(use_enable xnest)
$(use_enable xorg)
$(use_enable xvfb)
$(use_enable nptl glx-tls)
$(use_enable udev config-udev)
$(use_with doc doxygen)
$(use_with doc xmlto)
--sysconfdir=/etc/X11
--localstatedir=/var
--enable-install-setuid
--with-fontrootdir=/usr/share/fonts
--with-xkb-output=/var/lib/xkb
--disable-config-hal
--without-dtrace
--without-fop
--with-os-vendor=Gentoo
)
# Xorg-server requires includes from OS mesa which are not visible for
# users of binary drivers.
mkdir -p "${T}/mesa-symlinks/GL"
for i in gl glx glxmd glxproto glxtokens; do
ln -s "${EROOT}usr/$(get_libdir)/opengl/xorg-x11/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
done
for i in glext glxext; do
ln -s "${EROOT}usr/$(get_libdir)/opengl/global/include/$i.h" "${T}/mesa-symlinks/GL/$i.h" || die
done
append-cppflags "-I${T}/mesa-symlinks"
}
src_install() {
xorg-2_src_install
dynamic_libgl_install
server_based_install
if ! use minimal && use xorg; then
# Install xorg.conf.example into docs
dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example
fi
newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
newinitd "${FILESDIR}"/xdm.initd-3 xdm
newconfd "${FILESDIR}"/xdm.confd-3 xdm
# install the @x11-module-rebuild set for Portage
insinto /usr/share/portage/config/sets
newins "${FILESDIR}"/xorg-sets.conf xorg.conf
}
pkg_postinst() {
# sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
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."
echo
ewarn "You can generate a list of all installed packages in the x11-drivers"
ewarn "category using this command:"
ewarn " emerge portage-utils; qlist -I -C x11-drivers/"
ewarn "or using sets from portage-2.2:"
ewarn " emerge @x11-module-rebuild"
fi
}
pkg_postrm() {
# Get rid of module dir to ensure opengl-update works properly
if [[ -z ${REPLACED_BY_VERSION} && -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then
rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules
fi
}
dynamic_libgl_install() {
# next section is to setup the dynamic libGL stuff
ebegin "Moving GL files for dynamic switching"
dodir /usr/$(get_libdir)/opengl/xorg-x11/extensions
local x=""
for x in "${D}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
if [ -f ${x} -o -L ${x} ]; then
mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
fi
done
eend 0
}
server_based_install() {
if ! use xorg; then
rm "${D}"/usr/share/man/man1/Xserver.1x \
"${D}"/usr/$(get_libdir)/xserver/SecurityPolicy \
"${D}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
"${D}"/usr/share/man/man1/Xserver.1x
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-27 3:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-27 3:57 [gentoo-commits] gentoo-x86 commit in x11-base/xorg-server: ChangeLog xorg-server-1.11.0.ebuild xorg-server-1.10.99.901.ebuild xorg-server-1.10.99.902.ebuild Chi-Thanh Christopher Nguyen (chithanh)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox