diff --git a/configs/autoconf.in b/configs/autoconf.in index 3063787..fbd5faa 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -24,6 +24,8 @@ RADEON_CFLAGS = @RADEON_CFLAGS@ RADEON_LDFLAGS = @RADEON_LDFLAGS@ INTEL_LIBS = @INTEL_LIBS@ INTEL_CFLAGS = @INTEL_CFLAGS@ +X11_LIBS = @X11_LIBS@ +X11_CFLAGS = @X11_CFLAGS@ # Assembler MESA_ASM_SOURCES = @MESA_ASM_SOURCES@ diff --git a/configs/darwin b/configs/darwin index d28d590..e519684 100644 --- a/configs/darwin +++ b/configs/darwin @@ -13,7 +13,10 @@ CC = gcc CXX = g++ PIC_FLAGS = -fPIC DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \ - -DGLX_ALIAS_UNSUPPORTED -DGLX_INDIRECT_RENDERING + -DGLX_ALIAS_UNSUPPORTED \ + -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL + +# -DGLX_INDIRECT_RENDERING \ # -D_GNU_SOURCE - for src/mesa/main ... # -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx @@ -49,7 +52,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = glsl glx mesa gallium glu glut/glx glew +SRC_DIRS = glsl glx/apple mesa gallium glu glut/glx glew GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri diff --git a/configs/default b/configs/default index 47d6923..fbd795f 100644 --- a/configs/default +++ b/configs/default @@ -119,7 +119,7 @@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI # Program dependencies - specific GL/glut libraries added in Makefiles APP_LIB_DEPS = -lm - +X11_LIBS = -lX11 # Installation directories (for make install) INSTALL_DIR = /usr/local diff --git a/configs/linux-osmesa b/configs/linux-osmesa index c112642..3015f5f 100644 --- a/configs/linux-osmesa +++ b/configs/linux-osmesa @@ -9,7 +9,7 @@ CONFIG_NAME = linux-osmesa # Compiler and flags CC = gcc CXX = g++ -CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS +CFLAGS = -g -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE # Work around aliasing bugs - developers should comment this out @@ -17,12 +17,12 @@ CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing # Directories -SRC_DIRS = gallium mesa glu +SRC_DIRS = glsl mesa glu DRIVER_DIRS = osmesa PROGRAM_DIRS = osdemos # Dependencies -OSMESA_LIB_DEPS = -lm -lpthread +OSMESA_LIB_DEPS = -lm -lpthread -ldl GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB) APP_LIB_DEPS = -lm -lpthread diff --git a/configs/linux-osmesa16 b/configs/linux-osmesa16 index b3c8da0..090ca27 100644 --- a/configs/linux-osmesa16 +++ b/configs/linux-osmesa16 @@ -20,7 +20,7 @@ OSMESA_LIB_NAME = libOSMesa16.so # Directories -SRC_DIRS = gallium mesa glu +SRC_DIRS = glsl mesa glu DRIVER_DIRS = osmesa PROGRAM_DIRS = diff --git a/configs/linux-osmesa32 b/configs/linux-osmesa32 index 5804ef8..63de7f9 100644 --- a/configs/linux-osmesa32 +++ b/configs/linux-osmesa32 @@ -20,7 +20,7 @@ OSMESA_LIB_NAME = libOSMesa32.so # Directories -SRC_DIRS = gallium mesa glu +SRC_DIRS = glsl mesa glu DRIVER_DIRS = osmesa PROGRAM_DIRS = diff --git a/configure.ac b/configure.ac index 61487c3..4e43683 100644 --- a/configure.ac +++ b/configure.ac @@ -547,8 +547,14 @@ else x11_pkgconfig=no fi dnl Use the autoconf macro if no pkg-config files -if test "$x11_pkgconfig" = no; then +if test "$x11_pkgconfig" = yes; then + PKG_CHECK_MODULES([X11], [x11]) +else AC_PATH_XTRA + test -z "$X11_CFLAGS" && X11_CFLAGS="$X_CFLAGS" + test -z "$X11_LIBS" && X11_LIBS="$X_LIBS -lX11" + AC_SUBST([X11_CFLAGS]) + AC_SUBST([X11_LIBS]) fi dnl Try to tell the user that the --x-* options are only used when diff --git a/docs/lists.html b/docs/lists.html index 9c17a9f..1487891 100644 --- a/docs/lists.html +++ b/docs/lists.html @@ -13,14 +13,14 @@

@@ -40,6 +40,15 @@ versions are sent to this list. Very low traffic. Follow the links above for list archives.

+

+The old Mesa lists hosted at SourceForge are no longer in use. +The archives are still available, however: +mesa3d-announce, +mesa3d-users, +mesa3d-dev. +

+ +

For mailing lists about Direct Rendering Modules (drm) in Linux/BSD kernels, see the diff --git a/docs/relnotes-7.8.2.html b/docs/relnotes-7.8.2.html new file mode 100644 index 0000000..2194b65 --- /dev/null +++ b/docs/relnotes-7.8.2.html @@ -0,0 +1,52 @@ + + +Mesa Release Notes + + + + + + + +

Mesa 7.8.2 Release Notes / April, 5, 2010

+ +

+Mesa 7.8.2 is a bug fix release which fixes bugs found since the 7.8.1 release. +

+

+Mesa 7.8.2 implements the OpenGL 2.1 API, but the version reported by +glGetString(GL_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 2.1. +

+

+See the Compiling/Installing page for prerequisites +for DRI hardware acceleration. +

+ + +

MD5 checksums

+
+tbd
+
+ + +

New features

+

None.

+ + +

Changes

+ + + +

Bug fixes

+ + + +

Changes

+

None.

+ + diff --git a/docs/relnotes.html b/docs/relnotes.html index f7e2c69..39b02b8 100644 --- a/docs/relnotes.html +++ b/docs/relnotes.html @@ -13,6 +13,7 @@ The release notes summarize what's new or changed in each Mesa release.