diff options
Diffstat (limited to 'x11-base')
3 files changed, 366 insertions, 0 deletions
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index 13df9f9..b5420ff 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -35,6 +35,7 @@ AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b7710 AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 RMD160 dcf4213b088225a75af044fee0bed70eabe6a2fa SHA1 8a26839ed6a321175205ac68b72572652d2b534a SHA256 08735edbf6fd336412dfee94e087946af1c6e02d2fc348fa1e5a655e704df9c0 AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 RMD160 efd24cfd80d140c8ba5155c3feeddc6d41fbe85f SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e AUX 1.5.3-builtin-fonts.patch 646 RMD160 29bf7a3ba112621f9d8e645c0c9129caee318735 SHA1 f1cf5a1b525e4165c57271d11edf10087b2aeb7e SHA256 614c214118be05452cb81b8959a372961a6a8e4474cb69bcee50614cc04e1f9d +AUX 1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch 3303 RMD160 69966b78924cc4f03df8ff0edc1666370a6b9e67 SHA1 a95b2e0ec5f47e91769b596872c4a7700101d730 SHA256 8f24228cf93819a59f016b42d31cd1d4c6d4b014a24d690dd3b5e88e0040563f AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0 AUX xorg-server-1.3.0.0-loongson.patch 1931 RMD160 cc84def06fdfa7099342411baa037529166f56c0 SHA1 3596b2abaab7f58e78722988f9e4f1ca97bd7cd3 SHA256 e77dad77f9c36053ddc52f2aa6af7fc6c65b24a9d8456ac346382ca2a18b6d90 @@ -64,6 +65,7 @@ EBUILD xorg-server-1.5.2.ebuild 16624 RMD160 3d8138427c0e2d74f8ca7bddda1450a2e43 EBUILD xorg-server-1.5.3.ebuild 16703 RMD160 97d1d64120e5c7a6c40236894880bcce0e27e6dd SHA1 0abc2d7b74dc01ccfdd765dd6d73e73d2258a887 SHA256 3c7aa222bb7aa967f6c0cd2e8f03b542dfb619599c5f3c36a07ea8b37392a257 EBUILD xorg-server-1.6.0.ebuild 13969 RMD160 a04a13060589a65202bad1c16402976ec17718af SHA1 22e92b969602857bc93257c4264ed6876fa699ed SHA256 92ca658906114d8627d22bcda284723cd9ba6cfafffd0dc2af457adcb19e0f83 EBUILD xorg-server-1.6.2-r1.ebuild 14290 RMD160 b57a099f50ca3f3309fb733433f7f5ca2ca7d934 SHA1 09690993f683b488e3f220572ccd9de875e52139 SHA256 da513429e9eedf29f546eb8951fc0aa20bacdb66812ee0b0969b03d6b03102e5 +EBUILD xorg-server-1.6.3.901-r2.ebuild 7131 RMD160 b4b6c1bfe2c2db7bb6d73be021d76480159fd925 SHA1 8d776a61608f78c9c3c17ba0834e3dfe4aeb04a9 SHA256 ae2d13c5c43e134ad67eeafcaa8150c53fcccbab2fb353b3f3d802f5d80d0ab0 EBUILD xorg-server-1.6.3.901.ebuild 12819 RMD160 dedd385ee407a1c53c44de1ac0b06da1d238b6b6 SHA1 dadfda299c55730c2f57fc4827e0cdf696879ff4 SHA256 3f11e5a3789c2f40500c1b28f75aa7dc8bcdad9516009c980b49c668ba0a5e5e EBUILD xorg-server-1.6.3.ebuild 12880 RMD160 c9b1f4008f1d9b55705e5b3d154b96b33d45fd81 SHA1 89cc29b24146da322697403769e115e811796080 SHA256 58be6b8f78af5020567ea91ae5aab2301e9a72d857ae5522c46838d3fc962efe EBUILD xorg-server-9999.ebuild 13974 RMD160 5df9e7a97e2becf05a56756b21e2945416ec04ba SHA1 4ae167f622911208539bb80330d287ffdce259a6 SHA256 bd73081e164fe8aae6b2d589b04d345d999ec098a7be4eec09b296b0140ed26b diff --git a/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch b/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch new file mode 100644 index 0000000..eb3ec7d --- /dev/null +++ b/x11-base/xorg-server/files/1.6.3.901-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch @@ -0,0 +1,102 @@ +From c6753b750d76564bee02b317d10a496d0ced4274 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> +Date: Fri, 4 Sep 2009 23:05:29 +0200 +Subject: [PATCH] dix: append "built-ins" to the font path in SetDefaultFontPath +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on +a "fixed" font go away but only Xorg could use the built-ins fonts by +default. + +With this commit, all DDXs get "built-ins" appended to their FontPath, not +just Xorg. + +Tested with Xorg, Xvfb and Xnest. + +Signed-off-by: Rémi Cardona <remi@gentoo.org> +--- + dix/dixfonts.c | 20 ++++++++++++++++++-- + hw/xfree86/common/xf86Config.c | 16 ---------------- + 2 files changed, 18 insertions(+), 18 deletions(-) + +diff --git a/dix/dixfonts.c b/dix/dixfonts.c +index 719bca4..4d69025 100644 +--- a/dix/dixfonts.c ++++ b/dix/dixfonts.c +@@ -1818,6 +1818,9 @@ SetDefaultFontPath(char *path) + unsigned char *cp, + *pp, + *nump, ++ *temp_path, ++ *start, ++ *end, + *newpath; + int num = 1, + len, +@@ -1825,12 +1828,24 @@ SetDefaultFontPath(char *path) + size = 0, + bad; + ++ /* ensure temp_path contains "built-ins" */ ++ start = strstr(path, "built-ins"); ++ end = start + strlen("built-ins"); ++ if (start == NULL || ++ !((start == path || start[-1] == ',') && (!*end || *end == ','))) { ++ temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : ""); ++ } else { ++ temp_path = Xstrdup(path); ++ } ++ if (!temp_path) ++ return BadAlloc; ++ + /* get enough for string, plus values -- use up commas */ +- len = strlen(path) + 1; ++ len = strlen(temp_path) + 1; + nump = cp = newpath = (unsigned char *) xalloc(len); + if (!newpath) + return BadAlloc; +- pp = (unsigned char *) path; ++ pp = (unsigned char *) temp_path; + cp++; + while (*pp) { + if (*pp == ',') { +@@ -1849,6 +1864,7 @@ SetDefaultFontPath(char *path) + err = SetFontPathElements(num, newpath, &bad, TRUE); + + xfree(newpath); ++ xfree(temp_path); + + return err; + } +diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c +index 9376119..ddf4745 100644 +--- a/hw/xfree86/common/xf86Config.c ++++ b/hw/xfree86/common/xf86Config.c +@@ -612,22 +612,6 @@ configFiles(XF86ConfFilesPtr fileconf) + pathFrom = X_DEFAULT; + temp_path = defaultFontPath ? defaultFontPath : ""; + +- /* ensure defaultFontPath contains "built-ins" */ +- start = strstr(temp_path, "built-ins"); +- end = start + strlen("built-ins"); +- if (start == NULL || +- !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) { +- defaultFontPath = Xprintf("%s%sbuilt-ins", +- temp_path, *temp_path ? "," : ""); +- if (must_copy == TRUE) { +- if (defaultFontPath != NULL) { +- must_copy = FALSE; +- } +- } else { +- /* already made a copy of the font path */ +- xfree(temp_path); +- } +- } + /* xf86ValidateFontPath modifies its argument, but returns a copy of it. */ + temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath; + defaultFontPath = xf86ValidateFontPath(temp_path); +-- +1.6.4.2 + diff --git a/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild b/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild new file mode 100644 index 0000000..34e3313 --- /dev/null +++ b/x11-base/xorg-server/xorg-server-1.6.3.901-r2.ebuild @@ -0,0 +1,262 @@ +# Copyright 1999-2009 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.6.3.901-r2.ebuild,v 1.1 2009/09/15 10:07:13 scarabeus Exp $ + +EAPI="2" + +# Must be before x-modular eclass is inherited +#SNAPSHOT="yes" + +inherit x-modular multilib versionator + +SRC_URI="${SRC_URI}" +# mirror://gentoo/${P}-gentoo-patches-01.tar.bz2 + +OPENGL_DIR="xorg-x11" + +DESCRIPTION="X.Org X servers" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" + +IUSE_SERVERS="dmx kdrive xorg" +IUSE="${IUSE_SERVERS} tslib hal ipv6 minimal nptl sdl" +RDEPEND="hal? ( sys-apps/hal ) + tslib? ( >=x11-libs/tslib-1.0 x11-proto/xcalibrateproto ) + dev-libs/openssl + >=x11-libs/libXfont-1.4.0 + >=x11-libs/xtrans-1.2.3 + >=x11-libs/libXau-1.0.4 + >=x11-libs/libXext-1.0.4 + >=x11-libs/libX11-1.1.5 + >=x11-libs/libxkbfile-1.0.4 + >=x11-libs/libXdmcp-1.0.2 + >=x11-libs/libXmu-1.0.3 + >=x11-libs/libXrender-0.9.4 + >=x11-libs/libXi-1.2.1 + >=x11-libs/pixman-0.14.0 + media-libs/freetype + >=x11-misc/xbitmaps-1.0.1 + >=x11-misc/xkeyboard-config-1.4 + x11-apps/xkbcomp + >=x11-apps/iceauth-1.0.2 + >=x11-apps/rgb-1.0.3 + >=x11-apps/xauth-1.0.3 + >=x11-apps/xinit-1.0.8-r3 + >=app-admin/eselect-opengl-1.0.8 + >=x11-libs/libXaw-1.0.5 + >=x11-libs/libXpm-3.5.7 + >=x11-libs/libpciaccess-0.10.3 + dmx? ( + >=x11-libs/libdmx-1.0.2 + >=x11-libs/libXfixes-4.0.3 + ) + !minimal? ( + >=x11-libs/libXtst-1.0.3 + >=x11-libs/libXres-1.0.3 + >=media-libs/mesa-7.3_rc1[nptl=] + ) + >=x11-libs/libxkbui-1.0.2 + kdrive? ( sdl? ( media-libs/libsdl ) )" + # Xres is dmx-dependent + # Xaw is dmx-dependent + # Xpm is dmx-dependent, pulls in Xt + # xkbcomp is launched at startup but not checked by ./configure +DEPEND="${RDEPEND} + !net-dialup/dtrace + sys-devel/flex + >=x11-proto/randrproto-1.2.99.4 + >=x11-proto/renderproto-0.9.3 + >=x11-proto/fixesproto-4 + >=x11-proto/damageproto-1.1 + >=x11-proto/xextproto-7.0.4 + >=x11-proto/xproto-7.0.14 + >=x11-proto/xf86dgaproto-2.0.3 + >=x11-proto/xf86rushproto-1.1.2 + >=x11-proto/xf86vidmodeproto-2.2.2 + >=x11-proto/compositeproto-0.4 + >=x11-proto/recordproto-1.13.2 + >=x11-proto/resourceproto-1.0.2 + >=x11-proto/videoproto-2.2.2 + >=x11-proto/scrnsaverproto-1.1.0 + >=x11-proto/trapproto-3.4.3 + >=x11-proto/xineramaproto-1.1.2 + >=x11-proto/fontsproto-2.0.2 + >=x11-proto/kbproto-1.0.3 + >=x11-proto/inputproto-1.5.0 + >=x11-proto/bigreqsproto-1.0.2 + >=x11-proto/xcmiscproto-1.1.2 + >=x11-proto/glproto-1.4.9 + dmx? ( >=x11-proto/dmxproto-2.2.2 ) + !minimal? ( + >=x11-proto/xf86driproto-2.0.4 + >=x11-proto/dri2proto-2.1 + >=x11-libs/libdrm-2.3 + )" + +PDEPEND="xorg? ( >=x11-base/xorg-drivers-$(get_version_component_range 1-2) )" +LICENSE="${LICENSE} MIT" + +EPATCH_FORCE="yes" +EPATCH_SUFFIX="patch" + +# Local customizations, unsuitable for upstream +GENTOO_PATCHES=( + "${FILESDIR}/${P}-loongson.patch" + "${FILESDIR}/1.4-fpic-libxf86config.patch" + "${FILESDIR}/${PV}-0001-dix-append-built-ins-to-the-font-path-in-SetDefaultF.patch" + ) + +# These have been sent upstream +#UPSTREAMED_PATCHES=( +# "${WORKDIR}/patches/" +# ) + +PATCHES=( + "${GENTOO_PATCHES[@]}" + "${UPSTREAMED_PATCHES[@]}" + ) + +pkg_setup() { + use minimal || ensure_a_server_is_building + + # SDL only available in kdrive build + if use kdrive && use sdl; then + conf_opts="${conf_opts} --enable-xsdl" + else + conf_opts="${conf_opts} --disable-xsdl" + fi + + # 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 + CONFIGURE_OPTIONS=" + $(use_enable ipv6) + $(use_enable dmx) + $(use_enable kdrive) + $(use_enable tslib) + $(use_enable tslib xcalibrate) + $(use_enable !minimal xvfb) + $(use_enable !minimal xnest) + $(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 xorg) + $(use_enable nptl glx-tls) + $(use_enable hal config-hal) + --sysconfdir=/etc/X11 + --localstatedir=/var + --enable-install-setuid + --with-fontdir=/usr/share/fonts + --with-xkb-output=/var/lib/xkb + --without-dtrace + ${conf_opts}" + + # (#121394) Causes window corruption + filter-flags -fweb + + # Incompatible with GCC 3.x SSP on x86, bug #244352 + if use x86 ; then + if [[ $(gcc-major-version) -lt 4 ]]; then + filter-flags -fstack-protector + fi + fi + + OLD_IMPLEM="$(eselect opengl show)" + eselect opengl set --impl-headers ${OPENGL_DIR} +} + +src_install() { + x-modular_src_install + + dynamic_libgl_install + + server_based_install + + # Install video mode files for system-config-display + insinto /usr/share/xorg + doins hw/xfree86/common/{extra,vesa}modes \ + || die "couldn't install extra modes" + + # Bug #151421 - this file is not built with USE="minimal" + # Bug #151670 - this file is also not build if USE="-xorg" + if ! use minimal && use xorg; then + # Install xorg.conf.example + insinto /etc/X11 + doins hw/xfree86/xorg.conf.example \ + || die "couldn't install xorg.conf.example" + fi +} + +pkg_postinst() { + switch_opengl_implem + + # Bug #135544 + ewarn "Users of reduced blanking now need:" + ewarn " Option \"ReducedBlanking\"" + ewarn "In the relevant Monitor section(s)." + ewarn "Make sure your reduced blanking modelines are safe!" + + echo + ewarn "You must rebuild all drivers if upgrading from xorg-server 1.5" + ewarn "or earlier, 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/" + + ebeep 5 + epause 10 +} + +pkg_postrm() { + # Get rid of module dir to ensure opengl-update works properly + if ! has_version x11-base/xorg-server; then + if [[ -e ${ROOT}/usr/$(get_libdir)/xorg/modules ]]; then + rm -rf "${ROOT}"/usr/$(get_libdir)/xorg/modules + fi + 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/${OPENGL_DIR}/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/${OPENGL_DIR}/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 +} + +switch_opengl_implem() { + # Switch to the xorg implementation. + # Use new opengl-update that will not reset user selected + # OpenGL interface ... + echo + eselect opengl set ${OLD_IMPLEM} +} + +ensure_a_server_is_building() { + for server in ${IUSE_SERVERS}; do + use ${server} && return; + done + eerror "You need to specify at least one server to build." + eerror "Valid servers are: ${IUSE_SERVERS}." + die "No servers were specified to build." +} |