diff options
| author | James Cloos <cloos@jhcloos.com> | 2008-07-17 19:08:28 -0400 |
|---|---|---|
| committer | James Cloos <cloos@jhcloos.com> | 2008-07-17 19:08:28 -0400 |
| commit | aa81237892198e91a9f76d976e8cfc232da55593 (patch) | |
| tree | 9f937a20520f0723b4f42bc4b95505e38c06041f | |
| parent | b390eb803fbe0134a6dd5a4c208726a61feb175b (diff) | |
Resync mesa and xorg-server with X11 project overlay
| -rw-r--r-- | media-libs/mesa/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/Manifest | 2 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-9999.ebuild | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 228e164..1688aa0 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,5 +1,3 @@ AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91 AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 -DIST MesaLib-7.1-rc1.tar.gz 4495101 RMD160 2468daa0fe177462fdf3f5e222012377aadfc99e SHA1 f4d5a74251577ffa5e6fe14117209c0b3f2fdb8c SHA256 d1aa69223b13ce7a6aac92e7c11a83140cae69b7913a9e879481385e8ec17ae7 -EBUILD mesa-7.1_rc1.ebuild 7436 RMD160 cda270f6c9a314667f1146d8cf9dedd279beef6b SHA1 abc20110e91f6dc0fd003f0390a2bed659f16b54 SHA256 f664487a658f049541221f3f5233153fd4c3e6f770dc744b924383b0cf1fd624 -EBUILD mesa-9999.ebuild 7436 RMD160 cda270f6c9a314667f1146d8cf9dedd279beef6b SHA1 abc20110e91f6dc0fd003f0390a2bed659f16b54 SHA256 f664487a658f049541221f3f5233153fd4c3e6f770dc744b924383b0cf1fd624 +EBUILD mesa-9999.ebuild 7441 RMD160 0c57d779ea45545758ad2ed6ec21363433bfe826 SHA1 052e6757cc59928ec0182a26f4add0a88fd5b49a SHA256 b1fef3a592643efe1a47d99aa287f6724fa8d9eac7e80c9c2daf1ec9da8630c6 diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index fe6e64e..1f96d7f 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -56,7 +56,7 @@ RDEPEND="app-admin/eselect-opengl x11-libs/libXdamage >=x11-libs/libdrm-9999 x11-libs/libICE - motif? ( virtual/motif ) + motif? ( x11-libs/openmotif ) doc? ( app-doc/opengl-manpages ) !<=x11-base/xorg-x11-6.9" DEPEND="${RDEPEND} diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest index f4108c9..8dfc9b1 100644 --- a/x11-base/xorg-server/Manifest +++ b/x11-base/xorg-server/Manifest @@ -1,2 +1,2 @@ AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e22c1 SHA1 1f113823c03f69e79b10965908945df629b73474 SHA256 017e7ba2954dcc2281f8626977d47fd8bd037f05e680e51b8e4ae7316455a237 -EBUILD xorg-server-9999.ebuild 12058 RMD160 82f7c6470cb69ce91e7af707cd265543e59b8afb SHA1 e6dbdfea3fe6f9e535e06bc8b0a83b1898519dde SHA256 2240948df0f8c6a2032930344f8ac4ec606e0c32899b1c6bfac03a72149ab170 +EBUILD xorg-server-9999.ebuild 12070 RMD160 705e6b5aa334552c1e4fd1d019831a500b332da6 SHA1 7353cdd585a824d458177548054344cf5666f1f7 SHA256 ab37fedf4f003ede641f18873bb4d6c0d3c2251aec4fb6785b1551c4e593e970 diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild index 5e89861..e24833a 100644 --- a/x11-base/xorg-server/xorg-server-9999.ebuild +++ b/x11-base/xorg-server/xorg-server-9999.ebuild @@ -247,6 +247,7 @@ pkg_setup() { $(use_enable dmx) $(use_enable kdrive) $(use_enable x86 kdrive-vesa) + $(use_enable minimal builtin-fonts) $(use_enable !minimal xvfb) $(use_enable !minimal xnest) $(use_enable !minimal xfree86-utils) @@ -262,7 +263,6 @@ pkg_setup() { --enable-install-setuid --with-fontdir=/usr/share/fonts --with-xkb-output=/var/lib/xkb - --disable-builtin-fonts ${conf_opts}" local diemsg="You must build xorg-server and mesa with the same nptl USE setting." |