Limited Update to Mesa3D 7.6.1 and libdrm 2.4.17.

[MEMO]
In this commit, no version changed.  But if you put
'WITHOUT_NOUVEAU' on /etc/make.conf, you can use
new version of Mesa3D and libdrm.

Discussed with:	rnoland on freebsd-ports/freebsd-x11.
This commit is contained in:
Norikatsu Shigemura 2010-02-07 11:51:08 +00:00
parent 4ab1590020
commit f18d011411
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=249366
27 changed files with 143 additions and 44 deletions

1
KNOBS
View File

@ -83,6 +83,7 @@ NCURSES Adds ncurses console graphics support
NHC98 Prefer/use nhc98 Haskell compiler
NIS Support for NIS/YP
NLS Native Language Support via gettext utilities
NOUVEAU Use MesaLib 7.4.4/libdrm 2.4.12 with xf86-video-nouveau
NVIDIA_GL Use libGL provided by NVidia binary drivers
OGG OGG multimedia container format
OPENAL Adds OpenAL support

View File

@ -5,6 +5,25 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20100207:
AFFECTS: users of Mesa3D libraries and x11-drivers/xf86-video-nouveau
AUTHOR: nork@FreeBSD.org
If you want to use Mesa3D 7.6.1 and libdrm 2.4.17 rather than 7.4.4
and 2.4.12, you must define WITHOUT_NOUVEAU global macro, at least,
enabled on graphics/libGL*, graphics/libglut, graphics/dri,
graphics/mesa-demos and graphics/libdrm. And please give up using
x11-drivers/xf86-video-nouveau.
In this time, I can't enable latest Mesa3D and libdrm, because these
break xf86-video-nouveau. But old(current?) Mesa3D and libdrm don't
break any drivers.
for AMD Radeon HD 2xxx/3xxx/4xxx users
If you use AMD Radeon HD [234]xxx series, please define WITHOUT_NOVEAU
global macro. You can use OpenGL Hardware Accelerator feature on
these series.
20100206:
AFFECTS: users of net/samba4-devel
AUTHOR: timur@FreeBSD.org

View File

@ -21,6 +21,10 @@ MAKE_JOBS_UNSAFE= yes
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
.ifdef WITH_NOUVEAU
EXTRA_PATCHES= mesalib74-configure
.endif
do-install:
cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri

View File

@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995

View File

@ -7,6 +7,7 @@ lib/dri/mga_dri.so
lib/dri/r128_dri.so
lib/dri/r200_dri.so
lib/dri/r300_dri.so
%%MESALIB76%%lib/dri/r600_dri.so
lib/dri/radeon_dri.so
lib/dri/savage_dri.so
lib/dri/sis_dri.so

View File

@ -17,6 +17,10 @@ LIB_DEPENDS+= drm:${PORTSDIR}/graphics/libdrm \
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
.ifdef WITH_NOUVEAU
EXTRA_PATCHES= mesalib74-configure
.endif
do-install:
${RM} ${WRKSRC}/include/GL/glu*.h
cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl

View File

@ -12,16 +12,28 @@
# - graphics/libGL
# - graphics/libGLU
# - graphics/libGLw
# - graphics/libglut
# - graphics/dri
#
# $FreeBSD$
#
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= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
.ifdef WITHOUT_NOUVEAU
MESABASEVERSION= 7.6.1
MESASUBVERSION=
PLIST_SUB+= MESALIB76= MESALIB74="@comment "
.else
MESABASEVERSION= 7.4.4
MESASUBVERSION=
PLIST_SUB+= MESALIB74= MESALIB76="@comment "
.endif
MASTER_SITES?= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut,demos
MASTER_SITE_SUBDIR= mesa3d
DISTFILES= MesaLib-${MESAVERSION}${EXTRACT_SUFX}:mesa
DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
MAINTAINER?= x11@FreeBSD.org
USE_BZIP2= yes
@ -32,6 +44,7 @@ MAKE_JOBS_SAFE= yes
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-gallium
ALL_TARGET= default
@ -39,7 +52,7 @@ ALL_TARGET= default
#CFLAGS+= -DUSE_XSHM -DHZ=100
#FILESDIR= ${.CURDIR}/../../graphics/libGL/files
WRKSRC= ${WRKDIR}/Mesa-${MESAVERSION}
WRKSRC= ${WRKDIR}/Mesa-${MESABASEVERSION}
.if !defined(ARCH)
ARCH!= uname -p
@ -60,8 +73,7 @@ CONFIGURE_ARGS+= --disable-glu --disable-glut
CONFIGURE_ARGS+= --disable-glut
. endif
.else
MASTER_SITES+= SF/mesa3d/MesaGLUT/${MESAVERSION}:glut
DISTFILES+= MesaGLUT-${MESAVERSION}${EXTRACT_SUFX}:glut
DISTFILES+= MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut
.endif
.if ${COMPONENT:Mglw} == ""
@ -73,8 +85,7 @@ CONFIGURE_ARGS+= --enable-motif
.if ${COMPONENT:Mdemos} == ""
CONFIGURE_ARGS+= --with-demos=no
.else
MASTER_SITES+= SF/mesa3d/MesaDemos/${MESAVERSION}:demos
DISTFILES+= MesaDemos-${MESAVERSION}${EXTRACT_SUFX}:demos
DISTFILES+= MesaDemos-${MESADISTVERSION}${EXTRACT_SUFX}:demos
CONFIGURE_ARGS+= --with-demos=demos,xdemos
.endif

View File

@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995

View File

@ -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
%%MESALIB76%%include/GL/wglext.h
include/GL/wmesa.h
lib/libGL.so
lib/libGL.so.1

View File

@ -14,6 +14,10 @@ COMMENT= OpenGL utility library
USE_GL= gl
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto
.ifdef WITH_NOUVEAU
EXTRA_PATCHES= mesalib74-configure
.endif
do-install:
cd ${WRKSRC}/src/glu; ${GMAKE} install
${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/

View File

@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995

View File

@ -17,6 +17,10 @@ LIB_DEPENDS+= Xm.3:${PORTSDIR}/x11-toolkits/open-motif
USE_GL= gl
USE_XORG= glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
.ifdef WITH_NOUVEAU
EXTRA_PATCHES= mesalib74-configure
.endif
do-install:
cd ${WRKSRC}/src/glw; ${GMAKE} install

View File

@ -1,3 +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 (MesaLib-7.6.1.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995

View File

@ -6,7 +6,7 @@
#
PORTNAME= libdrm
PORTVERSION= 2.4.12
PORTVERSION= ${LIBDRM_VERSION}
CATEGORIES= graphics x11
MASTER_SITES= http://dri.freedesktop.org/libdrm/
@ -22,7 +22,16 @@ USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
.ifdef WITHOUT_NOUVEAU
LIBDRM_VERSION= 2.4.17
CONFIGURE_ARGS= --disable-nouveau-experimental-api \
--disable-radeon-experimental-api
PLIST_SUB+= NEW= OLD="@comment "
.else
LIBDRM_VERSION= 2.4.12
CONFIGURE_ARGS= --enable-nouveau-experimental-api
PLIST_SUB+= OLD= NEW="@comment "
.endif
pre-patch:
@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \

View File

@ -1,3 +1,6 @@
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.17.tar.bz2) = 667d81f993f7fd8a1b1b1b830a28a748
SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
SIZE (libdrm-2.4.17.tar.bz2) = 408882

View File

@ -4,25 +4,25 @@ include/drm/drm_sarea.h
include/drm/i915_drm.h
include/drm/mach64_drm.h
include/drm/mga_drm.h
include/drm/nouveau_drm.h
include/drm/nouveau_drmif.h
%%OLD%%include/drm/nouveau_drm.h
%%OLD%%include/drm/nouveau_drmif.h
include/drm/r128_drm.h
include/drm/r300_reg.h
%%OLD%%include/drm/r300_reg.h
include/drm/radeon_drm.h
include/drm/savage_drm.h
include/drm/sis_drm.h
include/drm/via_3d_reg.h
%%OLD%%include/drm/via_3d_reg.h
include/drm/via_drm.h
include/drm/xgi_drm.h
%%OLD%%include/drm/xgi_drm.h
include/intel_bufmgr.h
include/nouveau/nouveau_bo.h
include/nouveau/nouveau_channel.h
include/nouveau/nouveau_class.h
include/nouveau/nouveau_device.h
include/nouveau/nouveau_grobj.h
include/nouveau/nouveau_notifier.h
include/nouveau/nouveau_pushbuf.h
include/nouveau/nouveau_resource.h
%%OLD%%include/nouveau/nouveau_bo.h
%%OLD%%include/nouveau/nouveau_channel.h
%%OLD%%include/nouveau/nouveau_class.h
%%OLD%%include/nouveau/nouveau_device.h
%%OLD%%include/nouveau/nouveau_grobj.h
%%OLD%%include/nouveau/nouveau_notifier.h
%%OLD%%include/nouveau/nouveau_pushbuf.h
%%OLD%%include/nouveau/nouveau_resource.h
include/xf86drm.h
include/xf86drmMode.h
lib/libdrm.la
@ -31,11 +31,11 @@ lib/libdrm.so.2
lib/libdrm_intel.la
lib/libdrm_intel.so
lib/libdrm_intel.so.1
lib/libdrm_nouveau.la
lib/libdrm_nouveau.so
lib/libdrm_nouveau.so.1
%%OLD%%lib/libdrm_nouveau.la
%%OLD%%lib/libdrm_nouveau.so
%%OLD%%lib/libdrm_nouveau.so.1
libdata/pkgconfig/libdrm.pc
libdata/pkgconfig/libdrm_intel.pc
libdata/pkgconfig/libdrm_nouveau.pc
%%OLD%%libdata/pkgconfig/libdrm_nouveau.pc
@dirrm include/drm
@dirrm include/nouveau
%%OLD%%@dirrm include/nouveau

View File

@ -15,6 +15,10 @@ COMMENT= OpenGL utility toolkit
USE_GL= glu
USE_XORG= glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
.ifdef WITH_NOUVEAU
EXTRA_PATCHES= mesalib74-configure
.endif
do-install:
cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \

View File

@ -4,3 +4,9 @@ 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.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
MD5 (MesaGLUT-7.6.1.tar.bz2) = ca9aecb91f05b1da9fd7d5eeb19d47d7
SHA256 (MesaGLUT-7.6.1.tar.bz2) = c828f572a4e5c521e87ef265c5d2f1f02ba99ea2307e6323aa8165b152e4eb9d
SIZE (MesaGLUT-7.6.1.tar.bz2) = 321756

View File

@ -4,3 +4,9 @@ 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.tar.bz2) = 7db4617e9e10ad3aca1b64339fd71b7d
SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
MD5 (MesaDemos-7.6.1.tar.bz2) = a4226f06732a02556fcf6be290b86dff
SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b
SIZE (MesaDemos-7.6.1.tar.bz2) = 1547790

View File

@ -6,9 +6,11 @@ bin/clearspd
bin/copypix
bin/corender
bin/cubemap
%%MESALIB76%%bin/dinoshade
bin/drawpix
bin/engine
bin/fbo_firecube
%%MESALIB76%%bin/fbotexture
bin/fire
bin/fogcoord
bin/fplight
@ -19,11 +21,11 @@ bin/gears
bin/geartrain
bin/glinfo
bin/gloss
bin/glslnoise
%%MESALIB74%%bin/glslnoise
bin/glsync
bin/gltestperf
bin/glthreads
bin/glutfx
%%MESALIB74%%bin/glutfx
bin/glxcontexts
bin/glxdemo
bin/glxgears
@ -41,12 +43,14 @@ bin/lodbias
bin/manywin
bin/morph3d
bin/multiarb
%%MESALIB76%%bin/multictx
bin/offset
bin/overlay
bin/paltex
bin/pbdemo
bin/pbinfo
bin/pointblast
%%MESALIB76%%bin/projtex
bin/rain
bin/ray
bin/readpix
@ -54,19 +58,21 @@ bin/reflect
bin/renormal
bin/shadowtex
bin/sharedtex
%%MESALIB76%%bin/sharedtex_mt
bin/singlebuffer
bin/spectex
bin/spriteblast
bin/stex3d
bin/streaming_rect
%%MESALIB74%%bin/streaming_rect
bin/teapot
bin/terrain
bin/tessdemo
bin/texcyl
bin/texdown
%%MESALIB74%%bin/texdown
bin/texenv
bin/texobj
%%MESALIB74%%bin/texobj
bin/texture_from_pixmap
%%MESALIB76%%bin/textures
bin/trispd
bin/tunnel
bin/tunnel2

View File

@ -20,6 +20,10 @@ MAN4= nouveau.4x
MAKE_JOBS_SAFE= yes
.if defined(WITHOUT_NOUVEAU)
BROKEN= Please disable WITHOUT_NOUVEAU global macro.
.endif
post-configure:
${REINPLACE_CMD} '/NV_DRIVER_DATE/s/".*"/"${SNAPDATE}.${SNAPREV}"/' ${WRKSRC}/config.h