| 1 |
commit: df027d08b0273a29481942d54401651e9aa885bb |
| 2 |
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 28 19:02:03 2015 +0000 |
| 4 |
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 28 19:02:03 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df027d08 |
| 7 |
|
| 8 |
x11-base/xorg-server: Version bump |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.23 |
| 11 |
|
| 12 |
x11-base/xorg-server/Manifest | 1 + |
| 13 |
x11-base/xorg-server/xorg-server-1.17.4.ebuild | 245 +++++++++++++++++++++++++ |
| 14 |
2 files changed, 246 insertions(+) |
| 15 |
|
| 16 |
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest |
| 17 |
index a1703a0..2363cbf 100644 |
| 18 |
--- a/x11-base/xorg-server/Manifest |
| 19 |
+++ b/x11-base/xorg-server/Manifest |
| 20 |
@@ -5,3 +5,4 @@ DIST xorg-server-1.16-cve-2014-8091..8103.patches.tar.xz 27892 SHA256 47d8c9bb79 |
| 21 |
DIST xorg-server-1.16.4.tar.bz2 5817330 SHA256 abb6e1cc9213a9915a121f48576ff6739a0b8cdb3d32796f9a7743c9a6efc871 SHA512 f756fca65535aa921a85d8d8eb36ea2ba5b7af90a46d640b0ca76259a9abd9d323885087e11156528d95240937c70373045001ae20266a1b9e89909f007e9e74 WHIRLPOOL 63980a3e2b57d2860998344f21a6524598b3dc135c277e5a868e34b57ab5060681ae7137358b3ba8b9ca5fd622a91aeb06bd0ac9e3e5ce1f4dc55df2b2dc0e33 |
| 22 |
DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776 |
| 23 |
DIST xorg-server-1.17.2.tar.bz2 5767983 SHA256 f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993 SHA512 7e7b7620890cc8db696695758fa22fa879f9d3c33946663611ec0b37f02116e9c6f08779f9eece59907b430d3df93f0c0548939683ea156b3c4cbe02571b7551 WHIRLPOOL bfa04d9a6fba776138ec239183bd9f7badd73da520f1c4c62f7bf00bc264431959cd73ba145b5698429a6d5f3ae71d8dc07ab3f9442f365fae94ba2a98d69b96 |
| 24 |
+DIST xorg-server-1.17.4.tar.bz2 5791384 SHA256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 SHA512 4b8377b86ca88f27dcf59db2996b2ee620ce6f181a37dc47600365db588d48f2f3ca66a3149e7c856e686e5783b1cccb2ba0827aa7413299163dfca869f4d376 WHIRLPOOL c5baa1b01e57eac9e18bd1890c0a7e2246836524645057d5e05a1a19225d863645616aafaadbf9d083ffb672d47ea1934ad8323d813533e9519f0d92f9a1c6ab |
| 25 |
|
| 26 |
diff --git a/x11-base/xorg-server/xorg-server-1.17.4.ebuild b/x11-base/xorg-server/xorg-server-1.17.4.ebuild |
| 27 |
new file mode 100644 |
| 28 |
index 0000000..fc8f46a |
| 29 |
--- /dev/null |
| 30 |
+++ b/x11-base/xorg-server/xorg-server-1.17.4.ebuild |
| 31 |
@@ -0,0 +1,245 @@ |
| 32 |
+# Copyright 1999-2015 Gentoo Foundation |
| 33 |
+# Distributed under the terms of the GNU General Public License v2 |
| 34 |
+# $Id$ |
| 35 |
+ |
| 36 |
+EAPI=5 |
| 37 |
+ |
| 38 |
+XORG_DOC=doc |
| 39 |
+inherit xorg-2 multilib versionator flag-o-matic |
| 40 |
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/xserver" |
| 41 |
+ |
| 42 |
+DESCRIPTION="X.Org X servers" |
| 43 |
+SLOT="0/${PV}" |
| 44 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
| 45 |
+ |
| 46 |
+IUSE_SERVERS="dmx kdrive xephyr xnest xorg xvfb" |
| 47 |
+IUSE="${IUSE_SERVERS} glamor ipv6 libressl minimal nptl selinux +suid systemd tslib +udev unwind wayland" |
| 48 |
+ |
| 49 |
+CDEPEND=">=app-eselect/eselect-opengl-1.3.0 |
| 50 |
+ !libressl? ( dev-libs/openssl:0 ) |
| 51 |
+ libressl? ( dev-libs/libressl ) |
| 52 |
+ media-libs/freetype |
| 53 |
+ >=x11-apps/iceauth-1.0.2 |
| 54 |
+ >=x11-apps/rgb-1.0.3 |
| 55 |
+ >=x11-apps/xauth-1.0.3 |
| 56 |
+ x11-apps/xkbcomp |
| 57 |
+ >=x11-libs/libdrm-2.4.46 |
| 58 |
+ >=x11-libs/libpciaccess-0.12.901 |
| 59 |
+ >=x11-libs/libXau-1.0.4 |
| 60 |
+ >=x11-libs/libXdmcp-1.0.2 |
| 61 |
+ >=x11-libs/libXfont-1.4.2 |
| 62 |
+ >=x11-libs/libxkbfile-1.0.4 |
| 63 |
+ >=x11-libs/libxshmfence-1.1 |
| 64 |
+ >=x11-libs/pixman-0.27.2 |
| 65 |
+ >=x11-libs/xtrans-1.3.5 |
| 66 |
+ >=x11-misc/xbitmaps-1.0.1 |
| 67 |
+ >=x11-misc/xkeyboard-config-2.4.1-r3 |
| 68 |
+ dmx? ( |
| 69 |
+ x11-libs/libXt |
| 70 |
+ >=x11-libs/libdmx-1.0.99.1 |
| 71 |
+ >=x11-libs/libX11-1.1.5 |
| 72 |
+ >=x11-libs/libXaw-1.0.4 |
| 73 |
+ >=x11-libs/libXext-1.0.99.4 |
| 74 |
+ >=x11-libs/libXfixes-5.0 |
| 75 |
+ >=x11-libs/libXi-1.2.99.1 |
| 76 |
+ >=x11-libs/libXmu-1.0.3 |
| 77 |
+ x11-libs/libXrender |
| 78 |
+ >=x11-libs/libXres-1.0.3 |
| 79 |
+ >=x11-libs/libXtst-1.0.99.2 |
| 80 |
+ ) |
| 81 |
+ glamor? ( |
| 82 |
+ media-libs/libepoxy |
| 83 |
+ >=media-libs/mesa-10.3.4-r1[egl,gbm] |
| 84 |
+ !x11-libs/glamor |
| 85 |
+ ) |
| 86 |
+ kdrive? ( |
| 87 |
+ >=x11-libs/libXext-1.0.5 |
| 88 |
+ x11-libs/libXv |
| 89 |
+ ) |
| 90 |
+ xephyr? ( |
| 91 |
+ x11-libs/libxcb |
| 92 |
+ x11-libs/xcb-util |
| 93 |
+ x11-libs/xcb-util-image |
| 94 |
+ x11-libs/xcb-util-keysyms |
| 95 |
+ x11-libs/xcb-util-renderutil |
| 96 |
+ x11-libs/xcb-util-wm |
| 97 |
+ ) |
| 98 |
+ !minimal? ( |
| 99 |
+ >=x11-libs/libX11-1.1.5 |
| 100 |
+ >=x11-libs/libXext-1.0.5 |
| 101 |
+ >=media-libs/mesa-10.3.4-r1[nptl=] |
| 102 |
+ ) |
| 103 |
+ tslib? ( >=x11-libs/tslib-1.0 ) |
| 104 |
+ udev? ( >=virtual/udev-150 ) |
| 105 |
+ unwind? ( sys-libs/libunwind ) |
| 106 |
+ wayland? ( |
| 107 |
+ >=dev-libs/wayland-1.3.0 |
| 108 |
+ media-libs/libepoxy |
| 109 |
+ ) |
| 110 |
+ >=x11-apps/xinit-1.3.3-r1 |
| 111 |
+ systemd? ( |
| 112 |
+ sys-apps/dbus |
| 113 |
+ sys-apps/systemd |
| 114 |
+ )" |
| 115 |
+ |
| 116 |
+DEPEND="${CDEPEND} |
| 117 |
+ sys-devel/flex |
| 118 |
+ >=x11-proto/bigreqsproto-1.1.0 |
| 119 |
+ >=x11-proto/compositeproto-0.4 |
| 120 |
+ >=x11-proto/damageproto-1.1 |
| 121 |
+ >=x11-proto/fixesproto-5.0 |
| 122 |
+ >=x11-proto/fontsproto-2.1.3 |
| 123 |
+ >=x11-proto/glproto-1.4.17-r1 |
| 124 |
+ >=x11-proto/inputproto-2.2.99.1 |
| 125 |
+ >=x11-proto/kbproto-1.0.3 |
| 126 |
+ >=x11-proto/randrproto-1.4.0 |
| 127 |
+ >=x11-proto/recordproto-1.13.99.1 |
| 128 |
+ >=x11-proto/renderproto-0.11 |
| 129 |
+ >=x11-proto/resourceproto-1.2.0 |
| 130 |
+ >=x11-proto/scrnsaverproto-1.1 |
| 131 |
+ >=x11-proto/trapproto-3.4.3 |
| 132 |
+ >=x11-proto/videoproto-2.2.2 |
| 133 |
+ >=x11-proto/xcmiscproto-1.2.0 |
| 134 |
+ >=x11-proto/xextproto-7.2.99.901 |
| 135 |
+ >=x11-proto/xf86dgaproto-2.0.99.1 |
| 136 |
+ >=x11-proto/xf86rushproto-1.1.2 |
| 137 |
+ >=x11-proto/xf86vidmodeproto-2.2.99.1 |
| 138 |
+ >=x11-proto/xineramaproto-1.1.3 |
| 139 |
+ >=x11-proto/xproto-7.0.26 |
| 140 |
+ >=x11-proto/presentproto-1.0 |
| 141 |
+ >=x11-proto/dri3proto-1.0 |
| 142 |
+ dmx? ( |
| 143 |
+ >=x11-proto/dmxproto-2.2.99.1 |
| 144 |
+ doc? ( |
| 145 |
+ || ( |
| 146 |
+ www-client/links |
| 147 |
+ www-client/lynx |
| 148 |
+ www-client/w3m |
| 149 |
+ ) |
| 150 |
+ ) |
| 151 |
+ ) |
| 152 |
+ !minimal? ( |
| 153 |
+ >=x11-proto/xf86driproto-2.1.0 |
| 154 |
+ >=x11-proto/dri2proto-2.8 |
| 155 |
+ )" |
| 156 |
+ |
| 157 |
+RDEPEND="${CDEPEND} |
| 158 |
+ selinux? ( sec-policy/selinux-xserver ) |
| 159 |
+ !x11-drivers/xf86-video-modesetting |
| 160 |
+" |
| 161 |
+ |
| 162 |
+PDEPEND=" |
| 163 |
+ xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" |
| 164 |
+ |
| 165 |
+REQUIRED_USE="!minimal? ( |
| 166 |
+ || ( ${IUSE_SERVERS} ) |
| 167 |
+ ) |
| 168 |
+ xephyr? ( kdrive )" |
| 169 |
+ |
| 170 |
+#UPSTREAMED_PATCHES=( |
| 171 |
+# "${WORKDIR}/patches/" |
| 172 |
+#) |
| 173 |
+ |
| 174 |
+PATCHES=( |
| 175 |
+ "${UPSTREAMED_PATCHES[@]}" |
| 176 |
+ "${FILESDIR}"/${PN}-1.17-ia64-fix_inx_outx.patch |
| 177 |
+ "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch |
| 178 |
+ # needed for new eselect-opengl, bug #541232 |
| 179 |
+ "${FILESDIR}"/${PN}-1.17-support-multiple-Files-sections.patch |
| 180 |
+) |
| 181 |
+ |
| 182 |
+pkg_pretend() { |
| 183 |
+ # older gcc is not supported |
| 184 |
+ [[ "${MERGE_TYPE}" != "binary" && $(gcc-major-version) -lt 4 ]] && \ |
| 185 |
+ die "Sorry, but gcc earlier than 4.0 will not work for xorg-server." |
| 186 |
+} |
| 187 |
+ |
| 188 |
+src_configure() { |
| 189 |
+ # localstatedir is used for the log location; we need to override the default |
| 190 |
+ # from ebuild.sh |
| 191 |
+ # sysconfdir is used for the xorg.conf location; same applies |
| 192 |
+ # NOTE: fop is used for doc generating ; and i have no idea if gentoo |
| 193 |
+ # package it somewhere |
| 194 |
+ XORG_CONFIGURE_OPTIONS=( |
| 195 |
+ $(use_enable ipv6) |
| 196 |
+ $(use_enable dmx) |
| 197 |
+ $(use_enable glamor) |
| 198 |
+ $(use_enable kdrive) |
| 199 |
+ $(use_enable kdrive kdrive-kbd) |
| 200 |
+ $(use_enable kdrive kdrive-mouse) |
| 201 |
+ $(use_enable kdrive kdrive-evdev) |
| 202 |
+ $(use_enable suid install-setuid) |
| 203 |
+ $(use_enable tslib) |
| 204 |
+ $(use_enable unwind libunwind) |
| 205 |
+ $(use_enable wayland xwayland) |
| 206 |
+ $(use_enable !minimal record) |
| 207 |
+ $(use_enable !minimal xfree86-utils) |
| 208 |
+ $(use_enable !minimal install-libxf86config) |
| 209 |
+ $(use_enable !minimal dri) |
| 210 |
+ $(use_enable !minimal dri2) |
| 211 |
+ $(use_enable !minimal glx) |
| 212 |
+ $(use_enable xephyr) |
| 213 |
+ $(use_enable xnest) |
| 214 |
+ $(use_enable xorg) |
| 215 |
+ $(use_enable xvfb) |
| 216 |
+ $(use_enable nptl glx-tls) |
| 217 |
+ $(use_enable udev config-udev) |
| 218 |
+ $(use_with doc doxygen) |
| 219 |
+ $(use_with doc xmlto) |
| 220 |
+ $(use_with systemd systemd-daemon) |
| 221 |
+ $(use_enable systemd systemd-logind) |
| 222 |
+ --enable-libdrm |
| 223 |
+ --sysconfdir="${EPREFIX}"/etc/X11 |
| 224 |
+ --localstatedir="${EPREFIX}"/var |
| 225 |
+ --with-fontrootdir="${EPREFIX}"/usr/share/fonts |
| 226 |
+ --with-xkb-output="${EPREFIX}"/var/lib/xkb |
| 227 |
+ --disable-config-hal |
| 228 |
+ --disable-linux-acpi |
| 229 |
+ --without-dtrace |
| 230 |
+ --without-fop |
| 231 |
+ --with-os-vendor=Gentoo |
| 232 |
+ --with-sha1=libcrypto |
| 233 |
+ ) |
| 234 |
+ |
| 235 |
+ xorg-2_src_configure |
| 236 |
+} |
| 237 |
+ |
| 238 |
+src_install() { |
| 239 |
+ xorg-2_src_install |
| 240 |
+ |
| 241 |
+ server_based_install |
| 242 |
+ |
| 243 |
+ if ! use minimal && use xorg; then |
| 244 |
+ # Install xorg.conf.example into docs |
| 245 |
+ dodoc "${AUTOTOOLS_BUILD_DIR}"/hw/xfree86/xorg.conf.example |
| 246 |
+ fi |
| 247 |
+ |
| 248 |
+ newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup |
| 249 |
+ newinitd "${FILESDIR}"/xdm.initd-11 xdm |
| 250 |
+ newconfd "${FILESDIR}"/xdm.confd-4 xdm |
| 251 |
+ |
| 252 |
+ # install the @x11-module-rebuild set for Portage |
| 253 |
+ insinto /usr/share/portage/config/sets |
| 254 |
+ newins "${FILESDIR}"/xorg-sets.conf xorg.conf |
| 255 |
+} |
| 256 |
+ |
| 257 |
+pkg_postinst() { |
| 258 |
+ # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install) |
| 259 |
+ eselect opengl set xorg-x11 --use-old |
| 260 |
+} |
| 261 |
+ |
| 262 |
+pkg_postrm() { |
| 263 |
+ # Get rid of module dir to ensure opengl-update works properly |
| 264 |
+ if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then |
| 265 |
+ rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules |
| 266 |
+ fi |
| 267 |
+} |
| 268 |
+ |
| 269 |
+server_based_install() { |
| 270 |
+ if ! use xorg; then |
| 271 |
+ rm "${ED}"/usr/share/man/man1/Xserver.1x \ |
| 272 |
+ "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \ |
| 273 |
+ "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \ |
| 274 |
+ "${ED}"/usr/share/man/man1/Xserver.1x |
| 275 |
+ fi |
| 276 |
+} |
Archives