commit: 78dba3d5f6d2d9422e23eeae4ee008e581aa5140
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 15 20:57:21 2014 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 15 20:57:21 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=78dba3d5
Update to support the new eselect-opengl framework
---
media-libs/mesa/mesa-9999.ebuild | 41 +++-------------------------
x11-base/xorg-server/xorg-server-9999.ebuild | 34 +++--------------------
x11-proto/glproto/glproto-9999.ebuild | 18 +-----------
3 files changed, 9 insertions(+), 84 deletions(-)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 4120974..dffd922 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -95,7 +95,7 @@ RDEPEND="
abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
classic? ( app-admin/eselect-mesa )
gallium? ( app-admin/eselect-mesa )
- >=app-admin/eselect-opengl-1.2.7
+ >=app-admin/eselect-opengl-1.3.0
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
@@ -165,7 +165,7 @@ DEPEND="${RDEPEND}
>=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
>=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
)
- >=x11-proto/glproto-1.4.16-r1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
>=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
@@ -176,8 +176,8 @@ EGIT_CHECKOUT_DIR=${S}
# It is slow without texrels, if someone wants slow
# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+QA_EXECSTACK="usr/lib*/libGL.so*"
+QA_WX_LOAD="usr/lib*/libGL.so*"
# Think about: ggi, fbcon, no-X configs
@@ -332,32 +332,6 @@ multilib_src_configure() {
multilib_src_install() {
emake install DESTDIR="${D}"
- # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
- # because user can eselect desired GL provider.
- ebegin "Moving libGL and friends for dynamic switching"
- local x
- local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
- dodir ${gl_dir}/{lib,extensions,include/GL}
- for x in
"${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${ED}${gl_dir}"/lib \
- || die "Failed to move ${x}"
- fi
- done
- for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h};
do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${ED}${gl_dir}"/include/GL \
- || die "Failed to move ${x}"
- fi
- done
- for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
- if [ -d ${x} ]; then
- mv -f "${x}" "${ED}${gl_dir}"/include \
- || die "Failed to move ${x}"
- fi
- done
- eend $?
-
if use classic || use gallium; then
ebegin "Moving DRI/Gallium drivers for dynamic
switching"
local gallium_drivers=( i915_dri.so i965_dri.so
r300_dri.so r600_dri.so swrast_dri.so )
@@ -440,13 +414,6 @@ pkg_postinst() {
echo
eselect opengl set --use-old ${OPENGL_DIR}
- # switch to xorg-x11 and back if necessary, bug #374647 comment 11
- OLD_IMPLEM="$(eselect opengl show)"
- if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
- eselect opengl set ${OPENGL_DIR}
- eselect opengl set ${OLD_IMPLEM}
- fi
-
# Select classic/gallium drivers
if use classic || use gallium; then
eselect mesa set --auto
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild
b/x11-base/xorg-server/xorg-server-9999.ebuild
index 8203329..ec31957 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86
IUSE_SERVERS="dmx kdrive xnest xorg xvfb"
IUSE="${IUSE_SERVERS} glamor ipv6 minimal nptl selinux +suid systemd tslib
+udev unwind wayland"
-CDEPEND=">=app-admin/eselect-opengl-1.0.8
+CDEPEND=">=app-admin/eselect-opengl-1.3.0
dev-libs/openssl
media-libs/freetype
>=x11-apps/iceauth-1.0.2
@@ -48,7 +48,7 @@ CDEPEND=">=app-admin/eselect-opengl-1.0.8
)
glamor? (
media-libs/libepoxy
- media-libs/mesa[egl,gbm]
+ >=media-libs/mesa-10.3.4-r1[egl,gbm]
!x11-libs/glamor
)
kdrive? (
@@ -58,7 +58,7 @@ CDEPEND=">=app-admin/eselect-opengl-1.0.8
!minimal? (
>=x11-libs/libX11-1.1.5
>=x11-libs/libXext-1.0.5
- >=media-libs/mesa-9.2.0[nptl=]
+ >=media-libs/mesa-10.3.4-r1[nptl=]
)
tslib? ( >=x11-libs/tslib-1.0 )
udev? ( >=virtual/udev-150 )
@@ -80,7 +80,7 @@ DEPEND="${CDEPEND}
>=x11-proto/damageproto-1.1
>=x11-proto/fixesproto-5.0
>=x11-proto/fontsproto-2.1.3
- >=x11-proto/glproto-1.4.17
+ >=x11-proto/glproto-1.4.17-r1
>=x11-proto/inputproto-2.2.99.1
>=x11-proto/kbproto-1.0.3
>=x11-proto/randrproto-1.4.0
@@ -186,25 +186,12 @@ src_configure() {
--with-sha1=libcrypto
)
- # 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"
-
xorg-2_src_configure
}
src_install() {
xorg-2_src_install
- dynamic_libgl_install
-
server_based_install
if ! use minimal && use xorg; then
@@ -247,19 +234,6 @@ pkg_postrm() {
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
"${ED}"/usr/$(get_libdir)/xorg/modules/extensions/lib{glx,dri,dri2}*; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f ${x}
"${ED}"/usr/$(get_libdir)/opengl/xorg-x11/extensions
- fi
- done
- eend 0
-}
-
server_based_install() {
if ! use xorg; then
rm "${ED}"/usr/share/man/man1/Xserver.1x \
diff --git a/x11-proto/glproto/glproto-9999.ebuild
b/x11-proto/glproto/glproto-9999.ebuild
index f720432..33d70a8 100644
--- a/x11-proto/glproto/glproto-9999.ebuild
+++ b/x11-proto/glproto/glproto-9999.ebuild
@@ -12,30 +12,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
~s390 ~sh ~sparc ~x86
LICENSE="SGI-B-2.0"
IUSE=""
-RDEPEND=">=app-admin/eselect-opengl-1.2.6"
+RDEPEND=">=app-admin/eselect-opengl-1.3.0"
DEPEND=""
src_install() {
xorg-2_src_install
- dynamic_libgl_install
}
pkg_postinst() {
xorg-2_pkg_postinst
eselect opengl set --ignore-missing --use-old xorg-x11
}
-
-dynamic_libgl_install() {
- # next section is to setup the dynamic libGL stuff
- ebegin "Moving GL files for dynamic switching"
- local gldir=/usr/$(get_libdir)/opengl/xorg-x11/include/GL
- dodir ${gldir}
- local x=""
- # glext.h added for #54984
- for x in
"${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
- if [[ -f ${x} || -L ${x} ]]; then
- mv -f "${x}" "${ED}"${gldir}
- fi
- done
- eend 0
-}
