* [gentoo-commits] gentoo-x86 commit in media-libs/mesa: ChangeLog mesa-7.7.ebuild
@ 2009-12-22 20:46 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-12-22 20:46 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/12/22 20:46:21
Modified: ChangeLog mesa-7.7.ebuild
Log:
Sync with in-overlay updates prepared for 7.7 final release.
(Portage version: 2.2_rc60/cvs/Linux i686, RepoMan options: --force)
Revision Changes Path
1.251 media-libs/mesa/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.251&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.251&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.250&r2=1.251
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
retrieving revision 1.250
retrieving revision 1.251
diff -u -r1.250 -r1.251
--- ChangeLog 22 Dec 2009 13:54:59 -0000 1.250
+++ ChangeLog 22 Dec 2009 20:46:21 -0000 1.251
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.250 2009/12/22 13:54:59 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.251 2009/12/22 20:46:21 scarabeus Exp $
+
+ 22 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.ebuild:
+ Sync with in-overlay updates prepared for 7.7 final release.
22 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
-mesa-7.6.1_rc4.ebuild, -mesa-7.7_rc3.ebuild:
1.2 media-libs/mesa/mesa-7.7.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?r1=1.1&r2=1.2
Index: mesa-7.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mesa-7.7.ebuild 22 Dec 2009 13:50:33 -0000 1.1
+++ mesa-7.7.ebuild 22 Dec 2009 20:46:21 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v 1.1 2009/12/22 13:50:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v 1.2 2009/12/22 20:46:21 scarabeus Exp $
EAPI="2"
@@ -9,7 +9,6 @@
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git"
EXPERIMENTAL="true"
- IUSE_VIDEO_CARDS_UNSTABLE="video_cards_nouveau"
fi
inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability
@@ -17,7 +16,7 @@
OPENGL_DIR="xorg-x11"
MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_*}"
+MY_P="${MY_PN}-${PV/_/-}"
MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
DESCRIPTION="OpenGL-like graphic library for Linux"
HOMEPAGE="http://mesa3d.sourceforge.net/"
@@ -34,21 +33,13 @@
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE_VIDEO_CARDS="${IUSE_VIDEO_CARDS_UNSTABLE}
- video_cards_intel
- video_cards_mach64
- video_cards_mga
- video_cards_none
- video_cards_r128
- video_cards_radeon
- video_cards_radeonhd
- video_cards_savage
- video_cards_sis
- video_cards_sunffb
- video_cards_tdfx
- video_cards_via"
+VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
IUSE="${IUSE_VIDEO_CARDS}
- debug gallium motif +nptl pic +xcb kernel_FreeBSD"
+ debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD"
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
@@ -128,45 +119,35 @@
driver_enable video_cards_tdfx tdfx
driver_enable video_cards_via unichrome
- # all live (experimental) stuff is wrapped around with experimental variable
- # so the users cant get to this parts even with enabled useflags (downgrade
- # from live to stable for example)
- if [[ -n ${EXPERIMENTAL} ]]; then
- # nouveau works only with gallium
- use gallium && myconf="${myconf} $(use_enable video_cards_nouveau gallium-nouveau)"
- if use video_cards_nouveau && ! use gallium ; then
- elog "Nouveau driver is available only via gallium interface."
- elog "Enable gallium useflag if you want to use nouveau."
- echo
- fi
- fi
-
myconf="${myconf} $(use_enable gallium)"
if use gallium; then
- elog "Warning gallium interface is highly experimental so use"
- elog "it only if you feel really really brave."
- elog
- elog "Intel: works only i915."
- elog "Nouveau: only available implementation, so no other choice"
- elog "Radeon: implementation up to the r500."
+ elog "You have enabled gallium infrastructure."
+ elog "This infrastructure currently support these drivers:"
+ elog " Intel: works only i915."
+ elog " Nouveau: only available implementation, so no other choice"
+ elog " Radeon: implementation up to the r500."
+ elog " Svga: VMWare Virtual GPU driver."
echo
myconf="${myconf}
--with-state-trackers=glx,dri,egl,xorg
+ $(use_enable video_cards_svga gallium-svga)
$(use_enable video_cards_nouveau gallium-nouveau)
$(use_enable video_cards_intel gallium-intel)"
- if ! use video_cards_radeon && ! use video_cards_radeonhd; then
- myconf="${myconf} --disable-gallium-radeon"
- else
+ if use video_cards_radeon || use video_cards_radeonhd; then
myconf="${myconf} --enable-gallium-radeon"
+ else
+ myconf="${myconf} --disable-gallium-radeon"
+ fi
+ else
+ if use video_cards_nouveau || use video_cards_svga; then
+ elog "SVGA and nouveau drivers are available only via gallium interface."
+ elog "Enable gallium useflag if you want to use them."
fi
fi
- # Deactivate assembly code for pic build
- myconf="${myconf} $(use_enable !pic asm)"
-
- # --with-driver=dri|xlib|osmesa ; might get changed later to something
- # else than dri
+ # --with-driver=dri|xlib|osmesa || do we need osmesa?
econf \
+ --disable-option-checking \
--with-driver=dri \
--disable-glut \
--without-demos \
@@ -175,7 +156,7 @@
$(use_enable motif) \
$(use_enable nptl glx-tls) \
$(use_enable xcb) \
- --disable-gallium-svga \
+ $(use_enable !pic asm) \
--with-dri-drivers=${DRI_DRIVERS} \
${myconf}
}
@@ -223,13 +204,13 @@
case $# in
# for enabling unconditionally
1)
- DRI_DRIVERS="${DRI_DRIVERS},$1"
+ DRI_DRIVERS+=",$1"
;;
*)
if use $1; then
shift
for i in $@; do
- DRI_DRIVERS="${DRI_DRIVERS},${i}"
+ DRI_DRIVERS+=",${i}"
done
fi
;;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/mesa: ChangeLog mesa-7.7.ebuild
@ 2009-12-24 13:17 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-12-24 13:17 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/12/24 13:17:51
Modified: ChangeLog mesa-7.7.ebuild
Log:
Rdepend on xorg-server[-minimal]. Thx to Tommy for reporting.
(Portage version: 2.2_rc60/cvs/Linux i686)
Revision Changes Path
1.252 media-libs/mesa/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.252&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.252&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.251&r2=1.252
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- ChangeLog 22 Dec 2009 20:46:21 -0000 1.251
+++ ChangeLog 24 Dec 2009 13:17:50 -0000 1.252
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.251 2009/12/22 20:46:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.252 2009/12/24 13:17:50 scarabeus Exp $
+
+ 24 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.ebuild:
+ Rdepend on xorg-server[-minimal]. Thx to Tommy for reporting.
22 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.ebuild:
Sync with in-overlay updates prepared for 7.7 final release.
1.3 media-libs/mesa/mesa-7.7.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?r1=1.2&r2=1.3
Index: mesa-7.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mesa-7.7.ebuild 22 Dec 2009 20:46:21 -0000 1.2
+++ mesa-7.7.ebuild 24 Dec 2009 13:17:50 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v 1.2 2009/12/22 20:46:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v 1.3 2009/12/24 13:17:50 scarabeus Exp $
EAPI="2"
@@ -43,10 +43,11 @@
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
-RDEPEND="!<x11-base/xorg-server-1.7
+RDEPEND="
!<=x11-proto/xf86driproto-2.0.3
>=app-admin/eselect-opengl-1.1.1-r2
dev-libs/expat
+ >=x11-base/xorg-server-1.7[-minimal]
>=x11-libs/libdrm-2.4.17
x11-libs/libICE
x11-libs/libX11[xcb?]
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/mesa: ChangeLog mesa-7.7.ebuild
@ 2009-12-26 15:58 Tomas Chvatal (scarabeus)
0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-12-26 15:58 UTC (permalink / raw
To: gentoo-commits
scarabeus 09/12/26 15:58:50
Modified: ChangeLog mesa-7.7.ebuild
Log:
Do not depend on xorg-server.
(Portage version: 2.2_rc60/cvs/Linux i686)
Revision Changes Path
1.253 media-libs/mesa/ChangeLog
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.253&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?rev=1.253&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/ChangeLog?r1=1.252&r2=1.253
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- ChangeLog 24 Dec 2009 13:17:50 -0000 1.252
+++ ChangeLog 26 Dec 2009 15:58:50 -0000 1.253
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/mesa
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.252 2009/12/24 13:17:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.253 2009/12/26 15:58:50 scarabeus Exp $
+
+ 26 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.ebuild:
+ Do not depend on xorg-server.
24 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> mesa-7.7.ebuild:
Rdepend on xorg-server[-minimal]. Thx to Tommy for reporting.
1.4 media-libs/mesa/mesa-7.7.ebuild
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild?r1=1.3&r2=1.4
Index: mesa-7.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mesa-7.7.ebuild 24 Dec 2009 13:17:50 -0000 1.3
+++ mesa-7.7.ebuild 26 Dec 2009 15:58:50 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v 1.3 2009/12/24 13:17:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.ebuild,v 1.4 2009/12/26 15:58:50 scarabeus Exp $
EAPI="2"
@@ -44,10 +44,10 @@
# keep correct libdrm and dri2proto dep
# keep blocks in rdepend for binpkg
RDEPEND="
+ !<x11-base/xorg-server-1.7
!<=x11-proto/xf86driproto-2.0.3
>=app-admin/eselect-opengl-1.1.1-r2
dev-libs/expat
- >=x11-base/xorg-server-1.7[-minimal]
>=x11-libs/libdrm-2.4.17
x11-libs/libICE
x11-libs/libX11[xcb?]
@@ -130,7 +130,7 @@
elog " Svga: VMWare Virtual GPU driver."
echo
myconf="${myconf}
- --with-state-trackers=glx,dri,egl,xorg
+ --with-state-trackers=glx,dri,egl
$(use_enable video_cards_svga gallium-svga)
$(use_enable video_cards_nouveau gallium-nouveau)
$(use_enable video_cards_intel gallium-intel)"
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-26 15:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-26 15:58 [gentoo-commits] gentoo-x86 commit in media-libs/mesa: ChangeLog mesa-7.7.ebuild Tomas Chvatal (scarabeus)
-- strict thread matches above, loose matches on Subject: below --
2009-12-24 13:17 Tomas Chvatal (scarabeus)
2009-12-22 20:46 Tomas Chvatal (scarabeus)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox