From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Se3w7-0001Yv-A7 for garchives@archives.gentoo.org; Mon, 11 Jun 2012 12:41:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A88DE073A; Mon, 11 Jun 2012 12:41:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E25E4E073A for ; Mon, 11 Jun 2012 12:41:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F0411B4022 for ; Mon, 11 Jun 2012 12:41:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0F716E5428 for ; Mon, 11 Jun 2012 12:41:24 +0000 (UTC) From: "Tomas Chvatal" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tomas Chvatal" Message-ID: <1339418477.0e96e74763ee40943e8896e24c4e2caea5f7a102.scarabeus@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: media-libs/mesa/ X-VCS-Repository: proj/x11 X-VCS-Files: media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: scarabeus X-VCS-Committer-Name: Tomas Chvatal X-VCS-Revision: 0e96e74763ee40943e8896e24c4e2caea5f7a102 X-VCS-Branch: master Date: Mon, 11 Jun 2012 12:41:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 0e13d97f-83bf-4980-98a6-547ac3654a6d X-Archives-Hash: 7714d0e8ba59dcda17d605b856d705e4 commit: 0e96e74763ee40943e8896e24c4e2caea5f7a102 Author: Tomas Chvatal suse cz> AuthorDate: Mon Jun 11 12:41:17 2012 +0000 Commit: Tomas Chvatal gentoo org> CommitDate: Mon Jun 11 12:41:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D0e96e747 [media-libs/mesa] sync with main tree. --- media-libs/mesa/mesa-9999.ebuild | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999= .ebuild index e211f82..2bb17a8 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -81,7 +81,7 @@ LIBDRM_DEPSTRING=3D">=3Dx11-libs/libdrm-2.4.34" # depend on this package, bug #342393 EXTERNAL_DEPEND=3D" >=3Dx11-proto/dri2proto-2.6 - >=3Dx11-proto/glproto-1.4.15 + >=3Dx11-proto/glproto-1.4.15-r1 " # keep correct libdrm and dri2proto dep # keep blocks in rdepend for binpkg @@ -92,7 +92,7 @@ RDEPEND=3D"${EXTERNAL_DEPEND} !<=3Dx11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) - >=3Dapp-admin/eselect-opengl-1.2.2 + >=3Dapp-admin/eselect-opengl-1.2.6 dev-libs/expat gbm? ( sys-fs/udev ) >=3Dx11-libs/libX11-1.3.99.901 @@ -130,9 +130,9 @@ DEPEND=3D"${RDEPEND} ) =3Ddev-lang/python-2* dev-libs/libxml2[python] - dev-util/pkgconfig sys-devel/bison sys-devel/flex + virtual/pkgconfig x11-misc/makedepend >=3Dx11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto @@ -295,17 +295,24 @@ src_install() { # 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" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} local x - for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL,OpenVG}.{la,a,so*}; do + local gl_dir=3D"/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}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ + 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}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include = \ + 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