Add 6.5.3. Supports OpenGL 2.0 and 2.1 in software, adds new GLSL code generator...
authorDonnie Berkholz <dberkholz@gentoo.org>
Sun, 29 Apr 2007 19:08:16 +0000 (19:08 +0000)
committerDonnie Berkholz <dberkholz@gentoo.org>
Sun, 29 Apr 2007 19:08:16 +0000 (19:08 +0000)
Package-Manager: portage-2.1.2.5

media-libs/mesa/ChangeLog
media-libs/mesa/Manifest
media-libs/mesa/files/digest-mesa-6.5.3 [new file with mode: 0644]
media-libs/mesa/mesa-6.5.3.ebuild [new file with mode: 0644]

index a09dd405280f249b1695b18398d823318d067194..fcc5204447b7887900c7827659b4063d0d34db21 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.144 2007/04/29 05:59:04 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.145 2007/04/29 19:08:16 dberkholz Exp $
+
+*mesa-6.5.3 (29 Apr 2007)
+
+  29 Apr 2007; Donnie Berkholz <dberkholz@gentoo.org>; +mesa-6.5.3.ebuild:
+  Add 6.5.3. Supports OpenGL 2.0 and 2.1 in software, adds new GLSL code
+  generator, new vertex buffer object (vbo) infrastructure, and more.
 
   29 Apr 2007; Andrej Kacian <ticho@gentoo.org> mesa-6.5.2-r1.ebuild:
   Stable on x86, bug #175465.
index 18260b2dcd3b46cfab6ba8d9c86a069433cac26e..129fd00cfb6fb337613397d4077cb46d5b975a5e 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e
 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
 RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421
@@ -51,6 +48,7 @@ RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 files/lib/libGLU.la 752
 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/lib/libGLU.la 752
 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
+DIST MesaLib-6.5.3.tar.bz2 3351899 RMD160 becb4d9e9896b7086cd7c738a2ee0ebbae3bfe4e SHA1 8ab86e54976752028fbffcc21a9e0d2ebefeeff4 SHA256 f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
 EBUILD mesa-6.5-r3.ebuild 9175 RMD160 643fc0ebdb961aa275baef35752b064ae6643a8a SHA1 1ad081b504573901f70a655675b487789232fefc SHA256 21b1598f03b580a5ad6d35acc729949d84835fecb7c2b98762fdf94fde23e1bf
 MD5 0e81b722404c62a8bb29f26d2bcdde5f mesa-6.5-r3.ebuild 9175
@@ -72,10 +70,14 @@ EBUILD mesa-6.5.2.ebuild 8985 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 SH
 MD5 430f13380cc4d0fbb3b2bda923fd0a4d mesa-6.5.2.ebuild 8985
 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 mesa-6.5.2.ebuild 8985
 SHA256 8724b3d005228dcdfdfc05c799272a16bb73c310af895eede7caab693f3b8ef6 mesa-6.5.2.ebuild 8985
-MISC ChangeLog 25944 RMD160 d8120edf405316c18b7052ad9395034b7da73f01 SHA1 42366d5fa92465b62aa93b3a44bdaed706c25424 SHA256 ea2eec3596332be0b081b194d4535bc632aaff8393e1fca6d7c74a0bc38aee95
-MD5 8cfa52222e34614da74584ee1d1817ae ChangeLog 25944
-RMD160 d8120edf405316c18b7052ad9395034b7da73f01 ChangeLog 25944
-SHA256 ea2eec3596332be0b081b194d4535bc632aaff8393e1fca6d7c74a0bc38aee95 ChangeLog 25944
+EBUILD mesa-6.5.3.ebuild 9311 RMD160 fbe5c5381fbd87513b9352e56ed7f21ec7f6ec41 SHA1 8da0920f889e2ee1e9c20a114fd5e67c3e3e9008 SHA256 2fc5cea35da116406b467742d3df9e355e96211d6f822b778152e3b121c1493d
+MD5 41244925ff14603c6a1ef3371674456a mesa-6.5.3.ebuild 9311
+RMD160 fbe5c5381fbd87513b9352e56ed7f21ec7f6ec41 mesa-6.5.3.ebuild 9311
+SHA256 2fc5cea35da116406b467742d3df9e355e96211d6f822b778152e3b121c1493d mesa-6.5.3.ebuild 9311
+MISC ChangeLog 26194 RMD160 67ebe0a974956c0231c29ea4281719637c149fbb SHA1 6fb77b7bf1e1fb1ec104ab7c111f208a7ae8d6d1 SHA256 bb975e7a404c2ce4d6b07b40d6074dbd334a709991a0f7ed893d7c729813ba53
+MD5 299143dc962edc10836613421c9464b3 ChangeLog 26194
+RMD160 67ebe0a974956c0231c29ea4281719637c149fbb ChangeLog 26194
+SHA256 bb975e7a404c2ce4d6b07b40d6074dbd334a709991a0f7ed893d7c729813ba53 ChangeLog 26194
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -95,10 +97,6 @@ SHA256 f9339d87fc164d7137d1f589bb7a5995d6a19302bf26d4002f92e9bf4d1a9821 files/di
 MD5 c0c5f49d272303a5fb0883697d6594ef files/digest-mesa-6.5.2-r1 247
 RMD160 5e03f47a1a56342ba577b02e917b260302afb1a7 files/digest-mesa-6.5.2-r1 247
 SHA256 f9339d87fc164d7137d1f589bb7a5995d6a19302bf26d4002f92e9bf4d1a9821 files/digest-mesa-6.5.2-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGNDSMQlM6RnzZP+IRAqprAJ9XPtgapeW1BBR2BbVJm7DBRhhTAwCfSGt4
-eM+VVm3wSv4AZon9w/pvPB0=
-=NFap
------END PGP SIGNATURE-----
+MD5 94a246fcccc80a365890b769483e285e files/digest-mesa-6.5.3 247
+RMD160 a1f1af3caace92b13de7449c4a3bd84c0bf2fbbd files/digest-mesa-6.5.3 247
+SHA256 fa883ad916bf826b1e721083eeffcd8e67d692192038abf1e0bb16a0d6d6b1a6 files/digest-mesa-6.5.3 247
diff --git a/media-libs/mesa/files/digest-mesa-6.5.3 b/media-libs/mesa/files/digest-mesa-6.5.3
new file mode 100644 (file)
index 0000000..f08c71a
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 46359457147c469745f24b5074a186f0 MesaLib-6.5.3.tar.bz2 3351899
+RMD160 becb4d9e9896b7086cd7c738a2ee0ebbae3bfe4e MesaLib-6.5.3.tar.bz2 3351899
+SHA256 f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3 MesaLib-6.5.3.tar.bz2 3351899
diff --git a/media-libs/mesa/mesa-6.5.3.ebuild b/media-libs/mesa/mesa-6.5.3.ebuild
new file mode 100644 (file)
index 0000000..965383c
--- /dev/null
@@ -0,0 +1,339 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.3.ebuild,v 1.1 2007/04/29 19:08:16 dberkholz Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV//_}"
+MY_SRC_P="${MY_PN}Lib-${PV//_}"
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+if [[ $PV = *_rc* ]]; then
+       SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz"
+else
+       SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE_VIDEO_CARDS="
+       video_cards_i810
+       video_cards_mach64
+       video_cards_mga
+       video_cards_none
+       video_cards_r128
+       video_cards_radeon
+       video_cards_s3virge
+       video_cards_savage
+       video_cards_sis
+       video_cards_sunffb
+       video_cards_tdfx
+       video_cards_trident
+       video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS}
+       debug
+       doc
+       hardened
+       motif
+       nptl
+       xcb"
+
+RESTRICT="stricter"
+RDEPEND="dev-libs/expat
+       x11-libs/libX11
+       x11-libs/libXext
+       x11-libs/libXxf86vm
+       x11-libs/libXi
+       x11-libs/libXmu
+       >=x11-libs/libdrm-2.2
+       x11-libs/libICE
+       app-admin/eselect-opengl
+       motif? ( virtual/motif )
+       doc? ( app-doc/opengl-manpages )
+       !<=x11-base/xorg-x11-6.9
+       xcb? ( x11-libs/libxcb )"
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       x11-misc/makedepend
+       x11-proto/inputproto
+       x11-proto/xextproto
+       !hppa? ( x11-proto/xf86driproto )
+       x11-proto/xf86vidmodeproto
+       >=x11-proto/glproto-1.4.8
+       motif? ( x11-proto/printproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+if use debug; then
+       if ! has splitdebug ${FEATURES}; then
+               RESTRICT="${RESTRICT} nostrip"
+       fi
+fi
+
+pkg_setup() {
+       if use xcb; then
+               if ! built_with_use x11-libs/libX11 xcb; then
+                       msg="You must build libX11 with xcb enabled."
+                       eerror ${msg}
+                       die ${msg}
+               fi
+       fi
+
+       if use debug; then
+               strip-flags
+               append-flags -g
+       fi
+
+       append-flags -fno-strict-aliasing
+
+       if use x86-fbsd; then
+               CONFIG="freebsd-dri-x86"
+       elif use amd64-fbsd; then
+               CONFIG="freebsd-dri-amd64"
+       elif use kernel_FreeBSD; then
+               CONFIG="freebsd-dri"
+       elif use x86; then
+               CONFIG="linux-dri-x86"
+       elif use amd64; then
+               [[ ${ABI} == "amd64" ]] && CONFIG="linux-dri-x86-64"
+               [[ ${ABI} == "x86" ]] && CONFIG="linux-dri-x86"
+       elif use ppc; then
+               CONFIG="linux-dri-ppc"
+       else
+               CONFIG="linux-dri"
+       fi
+}
+
+src_unpack() {
+       HOSTCONF="${S}/configs/${CONFIG}"
+
+       unpack ${A}
+       cd ${S}
+
+       # FreeBSD 6.* doesn't have posix_memalign().
+       [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
+
+       # Don't compile debug code with USE=-debug - bug #125004
+       if ! use debug; then
+          einfo "Removing DO_DEBUG defs in dri drivers..."
+          find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
+       fi
+
+       # Set up libdir
+       echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+
+       # Set default dri drivers directory
+       echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+
+       # Do we want thread-local storage (TLS)?
+       if use nptl; then
+               echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+       fi
+
+       echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+       if use xcb; then
+               echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
+               echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
+               echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+       fi
+
+       # Configurable DRI drivers
+       if use video_cards_i810; then
+               add_drivers i810 i915 i915tex i965
+       fi
+       if use video_cards_mach64; then
+               add_drivers mach64
+       fi
+       if use video_cards_mga; then
+               add_drivers mga
+       fi
+       if use video_cards_r128; then
+               add_drivers r128
+       fi
+       if use video_cards_radeon; then
+               add_drivers radeon r200 r300
+       fi
+       if use video_cards_s3virge; then
+               add_drivers s3v
+       fi
+       if use video_cards_savage; then
+               add_drivers savage
+       fi
+       if use video_cards_sis; then
+               add_drivers sis
+       fi
+       if use video_cards_sunffb; then
+               add_drivers ffb
+       fi
+       if use video_cards_tdfx; then
+               add_drivers tdfx
+       fi
+       if use video_cards_trident; then
+               add_drivers trident
+       fi
+       if use video_cards_via; then
+               add_drivers unichrome
+       fi
+
+       # Set drivers to everything on which we ran add_drivers()
+       echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+
+       if use hardened; then
+               einfo "Deactivating assembly code for hardened build"
+               echo "ASM_FLAGS =" >> ${HOSTCONF}
+               echo "ASM_SOURCES =" >> ${HOSTCONF}
+               echo "ASM_API =" >> ${HOSTCONF}
+       fi
+
+       if use sparc; then
+               einfo "Sparc assembly code is not working; deactivating"
+               echo "ASM_FLAGS =" >> ${HOSTCONF}
+               echo "ASM_SOURCES =" >> ${HOSTCONF}
+       fi
+
+       # Replace hardcoded /usr/X11R6 with this
+       echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+
+       echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${HOSTCONF}
+       echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
+       echo "CC = $(tc-getCC)" >> ${HOSTCONF}
+       echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
+       # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
+       echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
+
+       # Removed glut, since we have separate freeglut/glut ebuilds
+       # Remove EGL, since Brian Paul says it's not ready for a release
+       echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
+
+       # Get rid of glut includes
+       rm -f ${S}/include/GL/glut*h
+
+       # r200 breaks without this, since it's the only EGL-enabled driver so far
+       echo "USING_EGL = 0" >> ${HOSTCONF}
+
+       # Don't build EGL demos. EGL isn't ready for release, plus they produce a
+       # circular dependency with glut.
+       echo "PROGRAM_DIRS =" >> ${HOSTCONF}
+
+       # Documented in configs/default
+       if use motif; then
+               # Add -lXm
+               echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
+               # Add GLwMDrawA.c
+               echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
+       fi
+}
+
+src_compile() {
+       emake -j1 ${CONFIG} || die "Build failed"
+}
+
+src_install() {
+       dodir /usr
+       make \
+               INSTALL_DIR="${D}/usr" \
+               DRI_DRIVER_INSTALL_DIR="${D}/usr/\$(LIB_DIR)/dri" \
+               INCLUDE_DIR="${D}/usr/include" \
+               install || die "Installation failed"
+
+       if ! use motif; then
+               rm ${D}/usr/include/GL/GLwMDrawA.h
+       fi
+
+       # Don't install private headers
+       rm ${D}/usr/include/GL/GLw*P.h
+
+       fix_opengl_symlinks
+       dynamic_libgl_install
+
+       # Install libtool archives
+       insinto /usr/$(get_libdir)
+       # (#67729) Needs to be lib, not $(get_libdir)
+       doins ${FILESDIR}/lib/libGLU.la
+       sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
+               > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+       # On *BSD libcs dlopen() and similar functions are present directly in
+       # libc.so and does not require linking to libdl. portability eclass takes
+       # care of finding the needed library (if needed) witht the dlopen_lib
+       # function.
+       sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
+               ${D}/usr/$(get_libdir)/libGLU.la \
+               ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+       # Create the two-number versioned libs (.so.#.#), since only .so.# and
+       # .so.#.#.# were made
+       local MAJOR_2="$(printf "%.2i" $(get_version_component_range 1 ${PV}))"
+       local MINOR_2="$(printf "%.2i" $(get_version_component_range 2 ${PV}))"
+       local MICRO_2="$(printf "%.2i" $(get_version_component_range 3 ${PV}))"
+       dosym libGLU.so.1.3.060503 /usr/$(get_libdir)/libGLU.so.1.3
+       dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
+
+       # libGLU doesn't get the plain .so symlink either
+       dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
+
+       # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
+       # as the default libGL.so.1
+}
+
+pkg_postinst() {
+       switch_opengl_implem
+}
+
+fix_opengl_symlinks() {
+       # Remove invalid symlinks
+       local LINK
+       for LINK in $(find ${D}/usr/$(get_libdir) \
+               -name libGL\.* -type l); do
+               rm -f ${LINK}
+       done
+       # Create required symlinks
+       if [[ ${CHOST} == *-freebsd* ]]; then
+               # FreeBSD doesn't use major.minor versioning, so the library is only
+               # libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
+               # libGL.so symlink and leave libGL.so.1 being the real thing
+               dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
+       else
+               dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
+               dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
+       fi
+}
+
+dynamic_libgl_install() {
+       # next section is to setup the dynamic libGL stuff
+       ebegin "Moving libGL and friends for dynamic switching"
+               dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
+               local x=""
+               for x in ${D}/usr/$(get_libdir)/libGL.so* \
+                       ${D}/usr/$(get_libdir)/libGL.la \
+                       ${D}/usr/$(get_libdir)/libGL.a; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               # libGL.a cause problems with tuxracer, etc
+                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
+                       fi
+               done
+               # glext.h added for #54984
+               for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+                       fi
+               done
+       eend 0
+}
+
+switch_opengl_implem() {
+               # Switch to the xorg implementation.
+               # Use new opengl-update that will not reset user selected
+               # OpenGL interface ...
+               echo
+               eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+add_drivers() {
+       DRI_DRIVERS="${DRI_DRIVERS} $@"
+}