diff --git a/bin/mklib b/bin/mklib index 90bf834b435..2fb215e7d7f 100755 --- a/bin/mklib +++ b/bin/mklib @@ -107,6 +107,9 @@ do -L*) DEPS="$DEPS $1" ;; + -Wl*) + DEPS="$DEPS $1" + ;; -pthread) # this is a special case (see bugzilla 10876) DEPS="$DEPS $1" @@ -198,7 +201,7 @@ fi # case $ARCH in - 'Linux' | 'OpenBSD' | 'GNU' | GNU/*) + 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/*) # we assume gcc if [ "x$LINK" = "x" ] ; then diff --git a/configs/autoconf.in b/configs/autoconf.in index 33d72d6e1c0..e5f2fb72c00 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -87,6 +87,7 @@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) @APP_LIB_DEPS@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) @DRI_LIB_DEPS@ LIBDRM_CFLAGS = @LIBDRM_CFLAGS@ LIBDRM_LIB = @LIBDRM_LIBS@ +DRI2PROTO_CFLAGS = @DRI2PROTO_CFLAGS@ EXPAT_INCLUDES = @EXPAT_INCLUDES@ # Autoconf directories diff --git a/configure.ac b/configure.ac index b9ad819fe43..7db1830af48 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl Check for progs AC_PROG_CPP AC_PROG_CC AC_PROG_CXX -AC_PATH_PROG(MAKE, make) +AC_CHECK_PROGS(MAKE, [gmake make]) AC_PATH_PROG(MKDEP, makedepend) AC_PATH_PROG(SED, sed) @@ -40,6 +40,11 @@ if test "x$GCC" = xyes; then fi AC_SUBST(MKDEP_OPTIONS) +dnl Check to see if dlopen is in default libraries (like Solaris, which +dnl has it in libc), or if libdl is needed to get it. +AC_CHECK_FUNC([dlopen], [], + AC_CHECK_LIB([dl], [dlopen], DLOPEN_LIBS="-ldl")) + dnl Make sure the pkg-config macros are defined m4_ifdef([PKG_PROG_PKG_CONFIG],,[ AC_MSG_ERROR([The pkg-config autoconf macros are not defined. @@ -64,11 +69,11 @@ AC_SUBST(X11_INCLUDES) dnl Compiler macros DEFINES="" AC_SUBST(DEFINES) -if test "x$GCC" = xyes; then - DEFINES="-D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE" -fi case "$host_os" in linux*) +if test "x$GCC" = xyes; then + DEFINES="$DEFINES -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE" +fi DEFINES="$DEFINES -D_SVID_SOURCE -D_GNU_SOURCE -DPTHREADS -DHAVE_POSIX_MEMALIGN" ;; esac @@ -383,6 +388,7 @@ dri) # Check for libdrm PKG_CHECK_MODULES(LIBDRM, libdrm) + PKG_CHECK_MODULES(DRI2PROTO, dri2proto >= 1.1) # find the DRI deps for libGL if test "$x11_pkgconfig" = yes; then @@ -396,7 +402,7 @@ dri) fi # need DRM libs, -lpthread, etc. - GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread -ldl" + GL_LIB_DEPS="$GL_LIB_DEPS $LIBDRM_LIBS -lm -lpthread $DLOPEN_LIBS" ;; osmesa) # No libGL for osmesa @@ -504,7 +510,7 @@ if test "$mesa_driver" = dri; then ;; esac ;; - freebsd*) + freebsd* | dragonfly*) DEFINES="$DEFINES -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1" DEFINES="$DEFINES -DIN_DRI_DRIVER -DHAVE_ALIAS" DEFINES="$DEFINES -DGLX_INDIRECT_RENDERING" @@ -547,7 +553,7 @@ if test "$mesa_driver" = dri; then AC_MSG_ERROR([Expat required for DRI.])) # put all the necessary libs together - DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread -ldl" + DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS" fi AC_SUBST(DRI_DIRS) AC_SUBST(EXPAT_INCLUDES) @@ -804,7 +810,7 @@ linux*) ;; esac ;; -freebsd*) +freebsd* | dragonfly*) PIC_FLAGS="-fPIC" case "$host_cpu" in i*86) @@ -893,5 +899,5 @@ echo " CXXFLAGS: $cxxflags" echo " Macros: $defines" echo "" -echo " Run 'make' to build Mesa" +echo " Run '${MAKE-make}' to build Mesa" echo "" diff --git a/docs/download.html b/docs/download.html index 90f566351e8..b0b672b5e18 100644 --- a/docs/download.html +++ b/docs/download.html @@ -9,7 +9,7 @@

Downloading

-Last stable release: 7.0 +Last stable release: 7.0.3

diff --git a/docs/news.html b/docs/news.html index ce5a684312e..79224f1e2b9 100644 --- a/docs/news.html +++ b/docs/news.html @@ -11,6 +11,13 @@

News

+

April 4, 2008

+

+Mesa 7.0.3 is released. +This is a bug-fix release. +

+ +

January 24, 2008

diff --git a/docs/relnotes-7.0.3.html b/docs/relnotes-7.0.3.html new file mode 100644 index 00000000000..5c8efc79d7c --- /dev/null +++ b/docs/relnotes-7.0.3.html @@ -0,0 +1,84 @@ + + +Mesa Release Notes + + + + + + + +

Mesa 7.0.3 Release Notes / April 4, 2008

+ +

+Mesa 7.0.3 is a stable release with bug fixes since version 7.0.2. +

+ + +

MD5 checksums

+
+3fd1cb76531b2515ef7db92d9a93dbf8  MesaLib-7.0.3.tar.gz
+e6e6379d7793af40a6bc3ce1bace572e  MesaLib-7.0.3.tar.bz2
+97882bac195229ee0b78cab82e0e3be1  MesaLib-7.0.3.zip
+8abf6bbcb1661e7dd4ce73b3fbb85898  MesaDemos-7.0.3.tar.gz
+47fd6863621d3c9c7dbb870ab7f0c303  MesaDemos-7.0.3.tar.bz2
+99e442e14da1928f76a7297bb421a3af  MesaDemos-7.0.3.zip
+2b50fe9fadc4709b57c52adef09fce3c  MesaGLUT-7.0.3.tar.gz
+0ff23c4e91b238abae63a5fc9fa003e7  MesaGLUT-7.0.3.tar.bz2
+70e83554a4462dad28e0d6e20f79aada  MesaGLUT-7.0.3.zip
+
+ + +

Bug fixes

+ + +

Changes

+ + + + +

Driver Status

+ +
+Driver			Status
+----------------------	----------------------
+DRI drivers		varies with the driver
+XMesa/GLX (on Xlib)	implements OpenGL 2.1
+OSMesa (off-screen)	implements OpenGL 2.1
+Windows/Win32		implements OpenGL 2.1
+Glide (3dfx Voodoo1/2)	implements OpenGL 1.3
+SVGA			unsupported
+Wind River UGL		unsupported
+DJGPP			unsupported
+GGI			unsupported
+BeOS			unsupported
+Allegro			unsupported
+D3D			unsupported
+
+ + + diff --git a/docs/relnotes.html b/docs/relnotes.html index 73bae8590f8..b0e0e9f9cfb 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -21,6 +21,9 @@ The release notes summarize what's new or changed in each Mesa release.