From 6bb474177b12497168cbd6725e847e4e8a29ccc9 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Thu, 7 Dec 2006 04:24:05 +0000 Subject: [PATCH] Fix 3D on i965 (bug #156569, riku) and make sure libX11 was built with xcb when building +xcb (bug #156397, Priit Laes). Package-Manager: portage-2.1.2_rc2-r5 --- media-libs/mesa/Manifest | 26 +- media-libs/mesa/files/digest-mesa-6.5.1-r3 | 3 - media-libs/mesa/mesa-6.5.1-r3.ebuild | 333 --------------------- 3 files changed, 15 insertions(+), 347 deletions(-) delete mode 100644 media-libs/mesa/files/digest-mesa-6.5.1-r3 delete mode 100644 media-libs/mesa/mesa-6.5.1-r3.ebuild diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index ea3ddc1c6493..09623482d012 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -18,6 +18,10 @@ AUX 6.5.1-freebsd-dri.patch 1255 RMD160 71ee7336e879d72a20095251899ec8c7472c6255 MD5 b4af1ae8f957df589e6e0462cfa91dbf files/6.5.1-freebsd-dri.patch 1255 RMD160 71ee7336e879d72a20095251899ec8c7472c6255 files/6.5.1-freebsd-dri.patch 1255 SHA256 ddd69fc07866d1efda8a78d26708e821196e844c8d941e7fcc0e30afa18b0ed6 files/6.5.1-freebsd-dri.patch 1255 +AUX 6.5.1-i965-bufmgr.patch 324 RMD160 af86372126288309218afbf27453be595cee01a6 SHA1 0853f6a838ae3b7c6a4a5f0af570c1a24ae12a01 SHA256 4df78296e642cfe9e5b18d04d7279762faaa96c07cdf68afbf62c9e3a0bc1cb4 +MD5 792dd493bc687ddcfa1125396ab4c430 files/6.5.1-i965-bufmgr.patch 324 +RMD160 af86372126288309218afbf27453be595cee01a6 files/6.5.1-i965-bufmgr.patch 324 +SHA256 4df78296e642cfe9e5b18d04d7279762faaa96c07cdf68afbf62c9e3a0bc1cb4 files/6.5.1-i965-bufmgr.patch 324 AUX 6.5.1-mach64-dri-private-dma-2.patch 5194 RMD160 24fbdebc6be01fc9deba0135a987e2a78a3946c9 SHA1 9d415229c8861f30251bf3e6d1c631c1dde3b540 SHA256 96610d9b697c3d6aa9f058c68f7d6de7251d402876d0fcfa47a4555326647f29 MD5 b5f891710a01488b758ac671af7276f2 files/6.5.1-mach64-dri-private-dma-2.patch 5194 RMD160 24fbdebc6be01fc9deba0135a987e2a78a3946c9 files/6.5.1-mach64-dri-private-dma-2.patch 5194 @@ -86,18 +90,18 @@ EBUILD mesa-6.5.1-r2.ebuild 8979 RMD160 8f4abf9c4b64d2bb9deb1b4b8f5bde05ff5d94fe MD5 170a7fc9abbfbc49ea96da8547bebc53 mesa-6.5.1-r2.ebuild 8979 RMD160 8f4abf9c4b64d2bb9deb1b4b8f5bde05ff5d94fe mesa-6.5.1-r2.ebuild 8979 SHA256 20693be3ecc219304fc9c83311e7d454fe851cadad7638c403a2989442511dc6 mesa-6.5.1-r2.ebuild 8979 -EBUILD mesa-6.5.1-r3.ebuild 9094 RMD160 aee9c57d06aedc03647b183c9d6144dbbadc46ae SHA1 546d2e0867bb2a04ea344899372c6abfcb7098ab SHA256 0e829a14b20afc93637ad250664604d3be7a00e0c48e11a418def338d774896e -MD5 388b9aff327f5bc3d73fb0edb723f9da mesa-6.5.1-r3.ebuild 9094 -RMD160 aee9c57d06aedc03647b183c9d6144dbbadc46ae mesa-6.5.1-r3.ebuild 9094 -SHA256 0e829a14b20afc93637ad250664604d3be7a00e0c48e11a418def338d774896e mesa-6.5.1-r3.ebuild 9094 +EBUILD mesa-6.5.1-r4.ebuild 9328 RMD160 db319b7c263151d98fa75d054da174c18bca247a SHA1 15509ab4a5c823b2578793bbd9fea2e997264553 SHA256 7d70919ec9579760c5167b1b64a92a123d83c34139d88963868ed1c22fd6a065 +MD5 da7c78bb11222825e2cb2b05037103a8 mesa-6.5.1-r4.ebuild 9328 +RMD160 db319b7c263151d98fa75d054da174c18bca247a mesa-6.5.1-r4.ebuild 9328 +SHA256 7d70919ec9579760c5167b1b64a92a123d83c34139d88963868ed1c22fd6a065 mesa-6.5.1-r4.ebuild 9328 EBUILD mesa-6.5.2.ebuild 8754 RMD160 d7b9f53d24f0aecc47e703de909d8c745d20eba8 SHA1 f96df4541be341cd5c5231d6eab55449b286ecae SHA256 19e3e07bdcd003205987dc86e3f8b1dd7fbcd3f0aea7c17763eb93eb93a1f653 MD5 ac3845b1648c81bc5ca33a98353dc658 mesa-6.5.2.ebuild 8754 RMD160 d7b9f53d24f0aecc47e703de909d8c745d20eba8 mesa-6.5.2.ebuild 8754 SHA256 19e3e07bdcd003205987dc86e3f8b1dd7fbcd3f0aea7c17763eb93eb93a1f653 mesa-6.5.2.ebuild 8754 -MISC ChangeLog 23674 RMD160 389f8a6da79ec9ca760c656fa70d20a5f599c6ed SHA1 4a5312d18fd3e15e9e155b388365a2900120325f SHA256 c79f1c1ba72151f9addf0ced83987e2e5433fc843db9d0d2770a063c897c5d93 -MD5 680e5852f5e502f1ff8527dd28705396 ChangeLog 23674 -RMD160 389f8a6da79ec9ca760c656fa70d20a5f599c6ed ChangeLog 23674 -SHA256 c79f1c1ba72151f9addf0ced83987e2e5433fc843db9d0d2770a063c897c5d93 ChangeLog 23674 +MISC ChangeLog 23969 RMD160 5b49dfca08a5ac69dd0ececad930794011ca1dbf SHA1 d5b810abeb1eb7a91e663cc28828fba15e03abdf SHA256 fb10d8c2e33f7949c2ce8ff3cec60bc2c1a31fec8262676cf7e65ef597cce457 +MD5 ad7d9ef6073124f17e7cbe6b1870b2b6 ChangeLog 23969 +RMD160 5b49dfca08a5ac69dd0ececad930794011ca1dbf ChangeLog 23969 +SHA256 fb10d8c2e33f7949c2ce8ff3cec60bc2c1a31fec8262676cf7e65ef597cce457 ChangeLog 23969 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 @@ -117,9 +121,9 @@ SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/di MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r2 247 RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r2 247 SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r2 247 -MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r3 247 -RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r3 247 -SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r3 247 +MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r4 247 +RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r4 247 +SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r4 247 MD5 c0c5f49d272303a5fb0883697d6594ef files/digest-mesa-6.5.2 247 RMD160 5e03f47a1a56342ba577b02e917b260302afb1a7 files/digest-mesa-6.5.2 247 SHA256 f9339d87fc164d7137d1f589bb7a5995d6a19302bf26d4002f92e9bf4d1a9821 files/digest-mesa-6.5.2 247 diff --git a/media-libs/mesa/files/digest-mesa-6.5.1-r3 b/media-libs/mesa/files/digest-mesa-6.5.1-r3 deleted file mode 100644 index 45b5cf135d2d..000000000000 --- a/media-libs/mesa/files/digest-mesa-6.5.1-r3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 c46f2c6646a270911b791dd8e1c2d977 MesaLib-6.5.1.tar.bz2 3138257 -RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 MesaLib-6.5.1.tar.bz2 3138257 -SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 MesaLib-6.5.1.tar.bz2 3138257 diff --git a/media-libs/mesa/mesa-6.5.1-r3.ebuild b/media-libs/mesa/mesa-6.5.1-r3.ebuild deleted file mode 100644 index d4cae4e5d7fd..000000000000 --- a/media-libs/mesa/mesa-6.5.1-r3.ebuild +++ /dev/null @@ -1,333 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.1-r3.ebuild,v 1.1 2006/12/07 03:08:42 joshuabaergen Exp $ - -inherit eutils toolchain-funcs multilib flag-o-matic portability - -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/" -SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2" -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.0.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 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 - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - # Fixes for bug #146892 - epatch "${FILESDIR}"/6.5.1-freebsd-dri.patch - cd ${S} - # FreeBSD 6.* doesn't have posix_memalign(). - [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri} - - # Fixes for fd.o bug #8521 - epatch "${FILESDIR}"/${PV}-xcb-dont-unlock-twice.patch - - # Use XCB API as of 1.0RC2 - epatch "${FILESDIR}"/${PV}-use-new-xcb-naming.patch - - # Fix compile against newer libdrm bug #154827 - epatch "${FILESDIR}"/${PV}-mach64-dri-private-dma-2.patch - - # 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 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 - dosym libGLU.so.1.3.060501 /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} $@" -} -- 2.26.2