Fix compiling against newer libdrms (2.2.0+). Thanks for Mart Raudsepp for

the discovery of the patch.  (Fixes bug #154827)
(Portage version: 2.1.2_rc2-r5)

4 files changed, 485 insertions, 1 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 35b044e7a22e..3841690e7094 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.128 2006/12/04 23:40:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.129 2006/12/07 03:08:42 joshuabaergen Exp $
+
+*mesa-6.5.1-r3 (07 Dec 2006)
+
+  07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  +files/6.5.1-mach64-dri-private-dma-2.patch, +mesa-6.5.1-r3.ebuild:
+  Fix compiling against newer libdrms (2.2.0+).  Thanks for Mart Raudsepp for
+  the discovery of the patch.  (Fixes bug #154827)
 
 *mesa-6.5.2 (04 Dec 2006)
 
diff --git a/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch b/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch
new file mode 100644
index 000000000000..885ab3eaf16c
--- /dev/null
+++ b/media-libs/mesa/files/6.5.1-mach64-dri-private-dma-2.patch
@@ -0,0 +1,141 @@
+--- src/mesa/drivers/dri/mach64/mach64_ioctl.c	2006-04-01 05:37:38.000000000 +0300
++++ src/mesa/drivers/dri/mach64-tst/mach64_ioctl.c	2006-07-18 19:43:10.000000000 +0300
+@@ -105,7 +105,7 @@ void mach64FlushVerticesLocked( mach64Co
+    int prim = mmesa->hw_primitive;
+    int fd = mmesa->driScreen->fd;
+    drm_mach64_vertex_t vertex;
+-   int i, ret;
++   int i;
+ 
+    mmesa->num_verts = 0;
+    mmesa->vert_used = 0;
+@@ -123,6 +123,9 @@ void mach64FlushVerticesLocked( mach64Co
+       mmesa->dirty |= MACH64_UPLOAD_CLIPRECTS;
+ 
+    if ( !count || !(mmesa->dirty & MACH64_UPLOAD_CLIPRECTS) ) {
++      int to = 0;
++      int ret;
++
+       /* FIXME: Is this really necessary */
+       if ( nbox == 1 )
+ 	 mmesa->sarea->nbox = 0;
+@@ -133,7 +136,10 @@ void mach64FlushVerticesLocked( mach64Co
+       vertex.buf = buffer;
+       vertex.used = count;
+       vertex.discard = 1;
+-      ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) );
++      do {
++	 ret = drmCommandWrite( fd, DRM_MACH64_VERTEX,
++				&vertex, sizeof(drm_mach64_vertex_t) );
++      } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) );
+       if ( ret ) {
+ 	 UNLOCK_HARDWARE( mmesa );
+ 	 fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret );
+@@ -146,6 +152,8 @@ void mach64FlushVerticesLocked( mach64Co
+ 	 int nr = MIN2( i + MACH64_NR_SAREA_CLIPRECTS, nbox );
+ 	 drm_clip_rect_t *b = mmesa->sarea->boxes;
+ 	 int discard = 0;
++	 int to = 0;
++	 int ret;
+ 
+ 	 mmesa->sarea->nbox = nr - i;
+ 	 for ( ; i < nr ; i++ ) {
+@@ -164,7 +172,10 @@ void mach64FlushVerticesLocked( mach64Co
+ 	 vertex.buf = buffer;
+ 	 vertex.used = count;
+ 	 vertex.discard = discard;
+-	 ret = drmCommandWrite( fd, DRM_MACH64_VERTEX, &vertex, sizeof(drm_mach64_vertex_t) );
++	 do {
++	    ret = drmCommandWrite( fd, DRM_MACH64_VERTEX,
++				   &vertex, sizeof(drm_mach64_vertex_t) );
++	 } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) );
+ 	 if ( ret ) {
+ 	    UNLOCK_HARDWARE( mmesa );
+ 	    fprintf( stderr, "Error flushing vertex buffer: return = %d\n", ret );
+@@ -180,14 +191,15 @@ void mach64FlushVerticesLocked( mach64Co
+  * Texture uploads
+  */
+ 
+-void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
++void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer,
+ 			   GLint offset, GLint pitch, GLint format,
+ 			   GLint x, GLint y, GLint width, GLint height )
+ {
+    drm_mach64_blit_t blit;
+-   GLint ret;
++   int to = 0;
++   int ret;
+ 
+-   blit.idx = buffer->idx;
++   blit.buf = buffer;
+    blit.offset = offset;
+    blit.pitch = pitch;
+    blit.format = format;
+@@ -196,8 +208,10 @@ void mach64FireBlitLocked( mach64Context
+    blit.width = width;
+    blit.height = height;
+ 
+-   ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_BLIT, 
+-                          &blit, sizeof(drm_mach64_blit_t) );
++   do {
++      ret = drmCommandWrite( mmesa->driFd, DRM_MACH64_BLIT, 
++			     &blit, sizeof(drm_mach64_blit_t) );
++   } while ( ( ret == -EAGAIN ) && ( to++ < MACH64_TIMEOUT ) );
+ 
+    if ( ret ) {
+       UNLOCK_HARDWARE( mmesa );
+--- src/mesa/drivers/dri/mach64/mach64_ioctl.h	2005-02-01 01:40:05.000000000 +0200
++++ src/mesa/drivers/dri/mach64-tst/mach64_ioctl.h	2006-04-11 18:52:56.000000000 +0300
+@@ -74,7 +74,7 @@ static __inline void *mach64AllocDmaLock
+    return head;
+ }
+ 
+-extern void mach64FireBlitLocked( mach64ContextPtr mmesa, drmBufPtr buffer,
++extern void mach64FireBlitLocked( mach64ContextPtr mmesa, void *buffer,
+ 				  GLint offset, GLint pitch, GLint format,
+ 				  GLint x, GLint y, GLint width, GLint height );
+ 
+--- src/mesa/drivers/dri/mach64/mach64_screen.c	2005-10-19 05:46:42.000000000 +0300
++++ src/mesa/drivers/dri/mach64-tst/mach64_screen.c	2006-07-16 04:58:55.000000000 +0300
+@@ -520,7 +520,7 @@ void * __driCreateNewScreen_20050727( __
+    __DRIscreenPrivate *psp;
+    static const __DRIversion ddx_expected = { 6, 4, 0 };
+    static const __DRIversion dri_expected = { 4, 0, 0 };
+-   static const __DRIversion drm_expected = { 1, 0, 0 };
++   static const __DRIversion drm_expected = { 2, 0, 0 };
+ 
+    dri_interface = interface;
+ 
+--- src/mesa/drivers/dri/mach64/mach64_texmem.c	2004-06-03 01:45:00.000000000 +0300
++++ src/mesa/drivers/dri/mach64-tst/mach64_texmem.c	2006-04-11 18:54:09.000000000 +0300
+@@ -569,27 +569,17 @@ static void mach64UploadLocalSubImage( m
+ 	 remaining > 0 ;
+ 	 remaining -= rows, y += rows, i++ )
+    {
+-       drmBufPtr buffer;
+-       CARD32 *dst;
+-
+        height = MIN2(remaining, rows);
+ 
+-       /* Grab the dma buffer for the texture blit */
+-       buffer = mach64GetBufferLocked( mmesa );
+-
+-       dst = (CARD32 *)((char *)buffer->address + MACH64_HOSTDATA_BLIT_OFFSET);
+-
+        assert(image->Data);
+ 
+        {
+           const GLubyte *src = (const GLubyte *) image->Data +
+              (y * image->Width + x) * image->TexFormat->TexelBytes;
+-          const GLuint bytes = width * height * image->TexFormat->TexelBytes;
+-          memcpy(dst, src, bytes);
+-       }
+ 
+-       mach64FireBlitLocked( mmesa, buffer, offset, pitch, format,
+-			     x, y, width, height );
++          mach64FireBlitLocked( mmesa, (void *)src, offset, pitch, format,
++				x, y, width, height );
++       }
+ 
+    }
+ 
diff --git a/media-libs/mesa/files/digest-mesa-6.5.1-r3 b/media-libs/mesa/files/digest-mesa-6.5.1-r3
new file mode 100644
index 000000000000..45b5cf135d2d
--- /dev/null
+++ b/media-libs/mesa/files/digest-mesa-6.5.1-r3
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..d4cae4e5d7fd
--- /dev/null
+++ b/media-libs/mesa/mesa-6.5.1-r3.ebuild
@@ -0,0 +1,333 @@
+# 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} $@"
+}