[gentoo-commits] gentoo-x86 commit in media-libs/mesa: ChangeLog mesa-7.10.2.ebuild

["Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@gentoo.org>]

chithanh    11/04/11 11:18:15

  Modified:             ChangeLog mesa-7.10.2.ebuild
  Log:
  Ensure that /usr/$(get_libdir)/dri gets always created.
  
  (Portage version: 2.2.0_alpha29/cvs/Linux x86_64)

Revision  Changes    Path
1.330                media-libs/mesa/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.330&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.330&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.329&r2=1.330

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- ChangeLog	8 Apr 2011 16:15:57 -0000	1.329
+++ ChangeLog	11 Apr 2011 11:18:15 -0000	1.330
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.329 2011/04/08 16:15:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.330 2011/04/11 11:18:15 chithanh Exp $
+
+  11 Apr 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  mesa-7.10.2.ebuild:
+  Ensure that /usr/$(get_libdir)/dri gets always created.
 
   08 Apr 2011; Markus Meier <maekke@gentoo.org> mesa-7.9.2.ebuild:
   arm stable, bug #359059



1.2                  media-libs/mesa/mesa-7.10.2.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-7.10.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-7.10.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/mesa-7.10.2.ebuild?r1=1.1&r2=1.2

Index: mesa-7.10.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.10.2.ebuild	6 Apr 2011 23:00:03 -0000	1.1
+++ mesa-7.10.2.ebuild	11 Apr 2011 11:18:15 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.2.ebuild,v 1.1 2011/04/06 23:00:03 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.2.ebuild,v 1.2 2011/04/11 11:18:15 chithanh Exp $
 
 EAPI=3
 
@@ -53,7 +53,8 @@
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	>=app-admin/eselect-mesa-0.0.3
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.1.1-r2
 	dev-libs/expat
 	dev-libs/libxml2[python]
@@ -279,8 +280,9 @@
 	eend $?
 
 	if use classic || use gallium; then
-		ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			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 )
+			keepdir /usr/$(get_libdir)/dri
 			dodir /usr/$(get_libdir)/mesa
 			for x in ${gallium_drivers[@]}; do
 				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
@@ -317,7 +319,9 @@
 	echo
 	eselect opengl set --use-old ${OPENGL_DIR}
 	# Select classic/gallium drivers
-	eselect mesa set --auto
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
 }
 
 # $1 - VIDEO_CARDS flag