[HEADS UP] Experimental 3D HW accel support for Radeon HD 2xxx, 3xxx and 4xxx.

Sat Dec 5 18:21:32 UTC 2009

On Sun, 6 Dec 2009 02:52:35 +0900
Norikatsu Shigemura <nork at FreeBSD.org> wrote:
> On Sun, 6 Dec 2009 02:22:00 +0900
> Norikatsu Shigemura <nork at FreeBSD.org> wrote:
> > 	Hum.. When 7.6.1 release?  If not yet, I'll back port.
> > 	But, I don't understand fix by https://bugs.freedesktop.org/show_bug.cgi?id=24266
> > 	How should I find git's commit id from http://cgit.freedesktop.org/mesa/mesa/ ?
> 	I give up.  So I remaked 7.6.1-rc2.  I'll update to 7.6.1-rc2.

	Oops, more quick hack for libglut.  I remade patch.
-------------- next part --------------
Index: dri/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/dri/distinfo,v
retrieving revision 1.17
diff -u -r1.17 distinfo

--- dri/distinfo	24 Jun 2009 01:15:07 -0000	1.17
+++ dri/distinfo	5 Dec 2009 17:41:57 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1-rc2.tar.bz2) = 965e157b47e241efaadaf84e3c5bd9e0
+SHA256 (MesaLib-7.6.1-rc2.tar.bz2) = 695db159bdb521001229e0bbe3e89fe1346b3be018c4c211cc4b6408fe375195
+SIZE (MesaLib-7.6.1-rc2.tar.bz2) = 4897510
Index: dri/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/dri/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- dri/pkg-plist	24 Jan 2009 18:13:00 -0000	1.11
+++ dri/pkg-plist	5 Dec 2009 00:59:36 -0000
@@ -7,6 +7,7 @@
 lib/dri/r128_dri.so
 lib/dri/r200_dri.so
 lib/dri/r300_dri.so
+lib/dri/r600_dri.so
 lib/dri/radeon_dri.so
 lib/dri/savage_dri.so
 lib/dri/sis_dri.so
Index: dri/files/patch-configure
===================================================================
RCS file: dri/files/patch-configure
diff -N dri/files/patch-configure
--- dri/files/patch-configure	10 Apr 2009 18:00:47 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: libGL/bsd.mesalib.mk
===================================================================
RCS file: /home/ncvs/ports/graphics/libGL/bsd.mesalib.mk,v
retrieving revision 1.15
diff -u -r1.15 bsd.mesalib.mk
--- libGL/bsd.mesalib.mk	22 Aug 2009 00:22:54 -0000	1.15
+++ libGL/bsd.mesalib.mk	5 Dec 2009 18:09:56 -0000
@@ -12,16 +12,16 @@
 #    - graphics/libGL
 #    - graphics/libGLU
 #    - graphics/libGLw
+#    - graphics/libglut
 #    - graphics/dri
 #
 # $FreeBSD: ports/graphics/libGL/bsd.mesalib.mk,v 1.15 2009/08/22 00:22:54 amdmi3 Exp $
 #
 
-MESAVERSION=	7.4.4
-MASTER_SITES?=	SF/mesa3d/MesaLib/${PORTVERSION}:mesa \
-		ftp://ftp.fu-berlin.de/pub/unix/X11/graphics/Mesa/:mesa,glut,demos
+MESAVERSION=	7.6.1.rc2
+MASTER_SITES?=	ftp://ftp.freedesktop.org/pub/mesa/${MESAVERSION}/:mesa,glut,demos
 MASTER_SITE_SUBDIR=	mesa3d
-DISTFILES=	MesaLib-${MESAVERSION}${EXTRACT_SUFX}:mesa
+DISTFILES=	MesaLib-${MESAVERSION:C/\.rc/-rc/}${EXTRACT_SUFX}:mesa
 MAINTAINER?=	x11 at FreeBSD.org
 
 USE_BZIP2=	yes
@@ -32,6 +32,7 @@
 
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-gallium
 
 ALL_TARGET=	default
 
@@ -39,7 +40,7 @@
 #CFLAGS+=	-DUSE_XSHM -DHZ=100
 
 #FILESDIR=	${.CURDIR}/../../graphics/libGL/files
-WRKSRC=		${WRKDIR}/Mesa-${MESAVERSION}
+WRKSRC=		${WRKDIR}/Mesa-${MESAVERSION:C/\.rc.*//}
 
 .if !defined(ARCH)
 ARCH!=		uname -p
@@ -60,8 +61,9 @@
 CONFIGURE_ARGS+=	--disable-glut
 . endif
 .else
-MASTER_SITES+=	SF/mesa3d/MesaGLUT/${MESAVERSION}:glut
-DISTFILES+=	MesaGLUT-${MESAVERSION}${EXTRACT_SUFX}:glut
+DISTFILES+=	MesaGLUT-${MESAVERSION:C/\.rc2/-rc1/}${EXTRACT_SUFX}:glut
+post-extract:
+	${CP} -pr ${WRKSRC}-rc1/* ${WRKSRC}
 .endif
 
 .if ${COMPONENT:Mglw} == ""
@@ -73,8 +75,7 @@
 .if ${COMPONENT:Mdemos} == ""
 CONFIGURE_ARGS+=	--with-demos=no
 .else
-MASTER_SITES+=	SF/mesa3d/MesaDemos/${MESAVERSION}:demos
-DISTFILES+=	MesaDemos-${MESAVERSION}${EXTRACT_SUFX}:demos
+DISTFILES+=	MesaDemos-${MESAVERSION:C/\.rc/-rc/}${EXTRACT_SUFX}:demos
 CONFIGURE_ARGS+=	--with-demos=demos,xdemos
 .endif
 
Index: libGL/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libGL/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- libGL/distinfo	24 Jun 2009 01:15:06 -0000	1.11
+++ libGL/distinfo	5 Dec 2009 17:41:51 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1-rc2.tar.bz2) = 965e157b47e241efaadaf84e3c5bd9e0
+SHA256 (MesaLib-7.6.1-rc2.tar.bz2) = 695db159bdb521001229e0bbe3e89fe1346b3be018c4c211cc4b6408fe375195
+SIZE (MesaLib-7.6.1-rc2.tar.bz2) = 4897510
Index: libGL/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/libGL/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- libGL/pkg-plist	25 Jan 2009 02:00:47 -0000	1.3
+++ libGL/pkg-plist	5 Dec 2009 00:59:36 -0000
@@ -1,17 +1,18 @@
 include/GL/dmesa.h
 include/GL/ggimesa.h
-include/GL/gl_mangle.h
 include/GL/gl.h
+include/GL/gl_mangle.h
 include/GL/glext.h
 include/GL/glfbdev.h
-include/GL/glx_mangle.h
 include/GL/glx.h
+include/GL/glx_mangle.h
 include/GL/glxext.h
 include/GL/mesa_wgl.h
 include/GL/mglmesa.h
 include/GL/osmesa.h
 include/GL/svgamesa.h
 include/GL/vms_x_fix.h
+include/GL/wglext.h
 include/GL/wmesa.h
 lib/libGL.so
 lib/libGL.so.1
Index: libGL/files/patch-configure
===================================================================
RCS file: libGL/files/patch-configure
diff -N libGL/files/patch-configure
--- libGL/files/patch-configure	10 Apr 2009 18:00:47 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: libGLU/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libGLU/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- libGLU/distinfo	24 Jun 2009 01:15:06 -0000	1.14
+++ libGLU/distinfo	5 Dec 2009 17:42:03 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1-rc2.tar.bz2) = 965e157b47e241efaadaf84e3c5bd9e0
+SHA256 (MesaLib-7.6.1-rc2.tar.bz2) = 695db159bdb521001229e0bbe3e89fe1346b3be018c4c211cc4b6408fe375195
+SIZE (MesaLib-7.6.1-rc2.tar.bz2) = 4897510
Index: libGLU/files/patch-configure
===================================================================
RCS file: libGLU/files/patch-configure
diff -N libGLU/files/patch-configure
--- libGLU/files/patch-configure	10 Apr 2009 18:00:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: libGLw/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libGLw/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- libGLw/distinfo	24 Jun 2009 01:15:06 -0000	1.10
+++ libGLw/distinfo	5 Dec 2009 17:42:07 -0000
@@ -1,3 +1,3 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
+MD5 (MesaLib-7.6.1-rc2.tar.bz2) = 965e157b47e241efaadaf84e3c5bd9e0
+SHA256 (MesaLib-7.6.1-rc2.tar.bz2) = 695db159bdb521001229e0bbe3e89fe1346b3be018c4c211cc4b6408fe375195
+SIZE (MesaLib-7.6.1-rc2.tar.bz2) = 4897510
Index: libGLw/files/patch-configure
===================================================================
RCS file: libGLw/files/patch-configure
diff -N libGLw/files/patch-configure
--- libGLw/files/patch-configure	10 Apr 2009 18:00:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: libdrm/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/libdrm/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- libdrm/Makefile	1 Aug 2009 17:39:21 -0000	1.17
+++ libdrm/Makefile	5 Dec 2009 00:59:36 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libdrm
-PORTVERSION=	2.4.12
+PORTVERSION=	2.4.16
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
@@ -22,7 +22,7 @@
 
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ARGS=	--enable-nouveau-experimental-api
+CONFIGURE_ARGS=	--enable-nouveau-experimental-api --enable-radeon-experimental-api
 
 pre-patch:
 	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
Index: libdrm/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libdrm/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- libdrm/distinfo	1 Aug 2009 17:39:21 -0000	1.13
+++ libdrm/distinfo	5 Dec 2009 00:59:36 -0000
@@ -1,3 +1,3 @@
-MD5 (libdrm-2.4.12.tar.bz2) = 15d26219c046377d5fcb1cb37e7b03a2
-SHA256 (libdrm-2.4.12.tar.bz2) = 89e3b16aff13c5219d13b08f9143793f74777b752d87c760ec6e52fb8676bd31
-SIZE (libdrm-2.4.12.tar.bz2) = 414175
+MD5 (libdrm-2.4.16.tar.bz2) = fa47a49641a8e846510566787a85cb8b
+SHA256 (libdrm-2.4.16.tar.bz2) = ca8e95d1c93c302b25cd2899040ea8eb0987f7d1d02eb658274243d9ada933ca
+SIZE (libdrm-2.4.16.tar.bz2) = 395916
Index: libdrm/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/libdrm/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- libdrm/pkg-plist	9 Apr 2009 20:03:54 -0000	1.8
+++ libdrm/pkg-plist	5 Dec 2009 00:59:36 -0000
@@ -7,13 +7,15 @@
 include/drm/nouveau_drm.h
 include/drm/nouveau_drmif.h
 include/drm/r128_drm.h
-include/drm/r300_reg.h
+include/drm/radeon_bo.h
+include/drm/radeon_bo_gem.h
+include/drm/radeon_cs.h
+include/drm/radeon_cs_gem.h
 include/drm/radeon_drm.h
+include/drm/radeon_track.h
 include/drm/savage_drm.h
 include/drm/sis_drm.h
-include/drm/via_3d_reg.h
 include/drm/via_drm.h
-include/drm/xgi_drm.h
 include/intel_bufmgr.h
 include/nouveau/nouveau_bo.h
 include/nouveau/nouveau_channel.h
@@ -34,8 +36,12 @@
 lib/libdrm_nouveau.la
 lib/libdrm_nouveau.so
 lib/libdrm_nouveau.so.1
+lib/libdrm_radeon.la
+lib/libdrm_radeon.so
+lib/libdrm_radeon.so.1
 libdata/pkgconfig/libdrm.pc
 libdata/pkgconfig/libdrm_intel.pc
 libdata/pkgconfig/libdrm_nouveau.pc
+libdata/pkgconfig/libdrm_radeon.pc
 @dirrm include/drm
 @dirrm include/nouveau
Index: libglut/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/libglut/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- libglut/distinfo	24 Jun 2009 01:15:06 -0000	1.19
+++ libglut/distinfo	5 Dec 2009 17:44:45 -0000
@@ -1,6 +1,6 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-MD5 (MesaGLUT-7.4.4.tar.bz2) = e14bbb52517e8121b31f1387515365ab
-SHA256 (MesaGLUT-7.4.4.tar.bz2) = 66c9486d73061ffd8d17a05b6e62851fec575867a99ad8cfc6137c2c16848c2e
-SIZE (MesaGLUT-7.4.4.tar.bz2) = 328900
+MD5 (MesaLib-7.6.1-rc2.tar.bz2) = 965e157b47e241efaadaf84e3c5bd9e0
+SHA256 (MesaLib-7.6.1-rc2.tar.bz2) = 695db159bdb521001229e0bbe3e89fe1346b3be018c4c211cc4b6408fe375195
+SIZE (MesaLib-7.6.1-rc2.tar.bz2) = 4897510
+MD5 (MesaGLUT-7.6.1-rc1.tar.bz2) = bd1e94d5c09a8465f831c5ae30ef59b1
+SHA256 (MesaGLUT-7.6.1-rc1.tar.bz2) = 8b9442ab9a1ecc718ea23e9d1e434cc9a19433c6c6989387eab3405e00f4544a
+SIZE (MesaGLUT-7.6.1-rc1.tar.bz2) = 325243
Index: libglut/files/patch-configure
===================================================================
RCS file: libglut/files/patch-configure
diff -N libglut/files/patch-configure
--- libglut/files/patch-configure	10 Apr 2009 18:00:48 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
Index: mesa-demos/distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/mesa-demos/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- mesa-demos/distinfo	24 Jun 2009 01:15:07 -0000	1.21
+++ mesa-demos/distinfo	5 Dec 2009 17:44:50 -0000
@@ -1,6 +1,6 @@
-MD5 (MesaLib-7.4.4.tar.bz2) = b66528d314c574dccbe0ed963cac5e93
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
-MD5 (MesaDemos-7.4.4.tar.bz2) = 628142ec9a54cd28cc027e6ce26cff47
-SHA256 (MesaDemos-7.4.4.tar.bz2) = 2b055f1b364795caec122092dedca9ac3ecce4fcf61947f52a286a681e9d1111
-SIZE (MesaDemos-7.4.4.tar.bz2) = 1367659
+MD5 (MesaLib-7.6.1-rc2.tar.bz2) = 965e157b47e241efaadaf84e3c5bd9e0
+SHA256 (MesaLib-7.6.1-rc2.tar.bz2) = 695db159bdb521001229e0bbe3e89fe1346b3be018c4c211cc4b6408fe375195
+SIZE (MesaLib-7.6.1-rc2.tar.bz2) = 4897510
+MD5 (MesaDemos-7.6.1-rc2.tar.bz2) = afc6bb9054126d4718e2da321e6ec1c3
+SHA256 (MesaDemos-7.6.1-rc2.tar.bz2) = 2a243e272665491a08b19edde0e1f73999affd4859db4498c8be4baa6fe43cb9
+SIZE (MesaDemos-7.6.1-rc2.tar.bz2) = 1547369
Index: mesa-demos/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/mesa-demos/pkg-plist,v
retrieving revision 1.4
diff -u -r1.4 pkg-plist
--- mesa-demos/pkg-plist	24 Jan 2009 18:13:01 -0000	1.4
+++ mesa-demos/pkg-plist	5 Dec 2009 00:59:36 -0000
@@ -6,9 +6,11 @@
 bin/copypix
 bin/corender
 bin/cubemap
+bin/dinoshade
 bin/drawpix
 bin/engine
 bin/fbo_firecube
+bin/fbotexture
 bin/fire
 bin/fogcoord
 bin/fplight
@@ -19,11 +21,9 @@
 bin/geartrain
 bin/glinfo
 bin/gloss
-bin/glslnoise
 bin/glsync
 bin/gltestperf
 bin/glthreads
-bin/glutfx
 bin/glxcontexts
 bin/glxdemo
 bin/glxgears
@@ -41,12 +41,14 @@
 bin/manywin
 bin/morph3d
 bin/multiarb
+bin/multictx
 bin/offset
 bin/overlay
 bin/paltex
 bin/pbdemo
 bin/pbinfo
 bin/pointblast
+bin/projtex
 bin/rain
 bin/ray
 bin/readpix
@@ -54,19 +56,18 @@
 bin/renormal
 bin/shadowtex
 bin/sharedtex
+bin/sharedtex_mt
 bin/singlebuffer
 bin/spectex
 bin/spriteblast
 bin/stex3d
-bin/streaming_rect
 bin/teapot
 bin/terrain
 bin/tessdemo
 bin/texcyl
-bin/texdown
 bin/texenv
-bin/texobj
 bin/texture_from_pixmap
+bin/textures
 bin/trispd
 bin/tunnel
 bin/tunnel2
Index: mesa-demos/files/patch-configure
===================================================================
RCS file: mesa-demos/files/patch-configure
diff -N mesa-demos/files/patch-configure
--- mesa-demos/files/patch-configure	10 Apr 2009 18:00:49 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac
