mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-01 11:18:09 -07:00
x11-base/xorg-server: Version bump to 1.18.3
Package-Manager: portage-2.2.28
This commit is contained in:
Manuel Rüger
@@ -7,3 +7,4 @@ DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c
|
||||
DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9
|
||||
DIST xorg-server-1.18.1.tar.bz2 5846953 SHA256 85ec56dbeb89a951295cdf4f39bf38e515f900d35e06d4a8081b114d1520789d SHA512 4b2db85fe4386329b3d20fc53848556ce8dedeb9553d610afc45962d477c8e7ea887abb6c27ba2701160d15ddff9a500bfaae6deff9cf62a80452c4b18278429 WHIRLPOOL 8588631538c759331f352cb278f755ccd10bd69e22f637d358cabfc397eed656b419cfa628276d60548cf4b102f735f7079f00c069d1dccd43800fae0ab98bfc
|
||||
DIST xorg-server-1.18.2.tar.bz2 5864615 SHA256 022142b07f6477d140dcc915902df326408a53ca3a352426a499f142b25d632d SHA512 c44a1b39150fff3ab673cb252d7b498c8c3bc5b3b2abfb6c358c64fadb9ef97789ac457d6acb8afaece29bbbe66399854fd2db13763cb40e7c63fb4237601da9 WHIRLPOOL 83dbcae14e3857ca244930e91cc5ba5f22e4284ace1447ffb086f5dd69526b878bb45bf3ef8451b27838dc20924e9e465fa8e586b6ba672a51dc051bc51abda1
|
||||
DIST xorg-server-1.18.3.tar.bz2 5867330 SHA256 ea739c22517cdbe2b5f7c0a5fd05fe8a10ac0629003e71c0c7862f4bb60142cd SHA512 9540b2fb69bf531b57e54af09b103c92c8d9d9cc4e6abe911f63b73b7c63eb6587eeae87927d7bdd7be83749785bf6b395891f85394e86ad2b01c182749f2171 WHIRLPOOL 8ddf040ff24a4668a460b323b6604347120868658d61b9b84853568f768f7f84267d7caf299c4fe306aeff0bc68d28613a51eaee5a2904bfd524e2aac7ff2e7a
|
||||
|
||||
242
x11-base/xorg-server/xorg-server-1.18.3.ebuild
Normal file
242
x11-base/xorg-server/xorg-server-1.18.3.ebuild
Normal file
@@ -0,0 +1,242 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
XORG_DOC=doc
|
||||
inherit xorg-2 multilib versionator flag-o-matic
|
||||
EGIT_REPO_URI="git://anongit.freedesktop.org/xorg/xserver"
|
||||
|
||||
DESCRIPTION="X.Org X servers"
|
||||
SLOT="0/${PV}"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
|
||||
|
||||
IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb"
|
||||
IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal selinux +suid systemd tslib +udev unwind wayland"
|
||||
|
||||
CDEPEND=">=app-eselect/eselect-opengl-1.3.0
|
||||
!libressl? ( dev-libs/openssl:0 )
|
||||
libressl? ( dev-libs/libressl )
|
||||
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/libdrm-2.4.46
|
||||
>=x11-libs/libpciaccess-0.12.901
|
||||
>=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/libxshmfence-1.1
|
||||
>=x11-libs/pixman-0.27.2
|
||||
>=x11-libs/xtrans-1.3.5
|
||||
>=x11-misc/xbitmaps-1.0.1
|
||||
>=x11-misc/xkeyboard-config-2.4.1-r3
|
||||
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-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
|
||||
)
|
||||
glamor? (
|
||||
media-libs/libepoxy
|
||||
>=media-libs/mesa-10.3.4-r1[egl,gbm]
|
||||
!x11-libs/glamor
|
||||
)
|
||||
kdrive? (
|
||||
>=x11-libs/libXext-1.0.5
|
||||
x11-libs/libXv
|
||||
)
|
||||
xephyr? (
|
||||
x11-libs/libxcb
|
||||
x11-libs/xcb-util
|
||||
x11-libs/xcb-util-image
|
||||
x11-libs/xcb-util-keysyms
|
||||
x11-libs/xcb-util-renderutil
|
||||
x11-libs/xcb-util-wm
|
||||
)
|
||||
!minimal? (
|
||||
>=x11-libs/libX11-1.1.5
|
||||
>=x11-libs/libXext-1.0.5
|
||||
>=media-libs/mesa-10.3.4-r1
|
||||
)
|
||||
tslib? ( >=x11-libs/tslib-1.0 )
|
||||
udev? ( >=virtual/udev-150 )
|
||||
unwind? ( sys-libs/libunwind )
|
||||
wayland? (
|
||||
>=dev-libs/wayland-1.3.0
|
||||
media-libs/libepoxy
|
||||
)
|
||||
>=x11-apps/xinit-1.3.3-r1
|
||||
systemd? (
|
||||
sys-apps/dbus
|
||||
sys-apps/systemd
|
||||
)"
|
||||
|
||||
DEPEND="${CDEPEND}
|
||||
sys-devel/flex
|
||||
>=x11-proto/bigreqsproto-1.1.0
|
||||
>=x11-proto/compositeproto-0.4
|
||||
>=x11-proto/damageproto-1.1
|
||||
>=x11-proto/fixesproto-5.0
|
||||
>=x11-proto/fontsproto-2.1.3
|
||||
>=x11-proto/glproto-1.4.17-r1
|
||||
>=x11-proto/inputproto-2.3
|
||||
>=x11-proto/kbproto-1.0.3
|
||||
>=x11-proto/randrproto-1.5.0
|
||||
>=x11-proto/recordproto-1.13.99.1
|
||||
>=x11-proto/renderproto-0.11
|
||||
>=x11-proto/resourceproto-1.2.0
|
||||
>=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.2.99.901
|
||||
>=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.28
|
||||
>=x11-proto/presentproto-1.0
|
||||
>=x11-proto/dri3proto-1.0
|
||||
dmx? (
|
||||
>=x11-proto/dmxproto-2.2.99.1
|
||||
doc? (
|
||||
|| (
|
||||
www-client/links
|
||||
www-client/lynx
|
||||
www-client/w3m
|
||||
)
|
||||
)
|
||||
)
|
||||
!minimal? (
|
||||
>=x11-proto/xf86driproto-2.1.0
|
||||
>=x11-proto/dri2proto-2.8
|
||||
)"
|
||||
|
||||
RDEPEND="${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-xserver )
|
||||
!x11-drivers/xf86-video-modesetting
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )"
|
||||
|
||||
REQUIRED_USE="!minimal? (
|
||||
|| ( ${IUSE_SERVERS} )
|
||||
)
|
||||
xephyr? ( kdrive )"
|
||||
|
||||
#UPSTREAMED_PATCHES=(
|
||||
# "${WORKDIR}/patches/"
|
||||
#)
|
||||
|
||||
PATCHES=(
|
||||
"${UPSTREAMED_PATCHES[@]}"
|
||||
"${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
|
||||
# needed for new eselect-opengl, bug #541232
|
||||
"${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
|
||||
)
|
||||
|
||||
pkg_pretend() {
|
||||
# older gcc is not supported
|
||||
[[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \
|
||||
die "Sorry, but gcc earlier than 4.0 will not work for xorg-server."
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# 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
|
||||
# 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 glamor)
|
||||
$(use_enable kdrive)
|
||||
$(use_enable kdrive kdrive-kbd)
|
||||
$(use_enable kdrive kdrive-mouse)
|
||||
$(use_enable kdrive kdrive-evdev)
|
||||
$(use_enable suid install-setuid)
|
||||
$(use_enable tslib)
|
||||
$(use_enable unwind libunwind)
|
||||
$(use_enable wayland xwayland)
|
||||
$(use_enable !minimal record)
|
||||
$(use_enable !minimal xfree86-utils)
|
||||
$(use_enable !minimal dri)
|
||||
$(use_enable !minimal dri2)
|
||||
$(use_enable !minimal glx)
|
||||
$(use_enable xephyr)
|
||||
$(use_enable xnest)
|
||||
$(use_enable xorg)
|
||||
$(use_enable xvfb)
|
||||
$(use_enable udev config-udev)
|
||||
$(use_with doc doxygen)
|
||||
$(use_with doc xmlto)
|
||||
$(use_with systemd systemd-daemon)
|
||||
$(use_enable systemd systemd-logind)
|
||||
--enable-libdrm
|
||||
--sysconfdir="${EPREFIX}"/etc/X11
|
||||
--localstatedir="${EPREFIX}"/var
|
||||
--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
|
||||
--with-sha1=libcrypto
|
||||
)
|
||||
|
||||
xorg-2_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
xorg-2_src_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-11 xdm
|
||||
newconfd "${FILESDIR}"/xdm.confd-4 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
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
# Get rid of module dir to ensure opengl-update works properly
|
||||
if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
|
||||
rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
|
||||
fi
|
||||
}
|
||||
|
||||
server_based_install() {
|
||||
if ! use xorg; then
|
||||
rm "${ED}"/usr/share/man/man1/Xserver.1x \
|
||||
"${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
|
||||
"${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
|
||||
"${ED}"/usr/share/man/man1/Xserver.1x
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user