From 623eff34fb443444fbdc4db46eda52d3f8e02963 Mon Sep 17 00:00:00 2001 From: Carlo Landmeter Date: Mon, 27 Sep 2010 15:28:03 +0000 Subject: main/mesa: upgrade to 7.8.2 --- main/mesa/mesa-7.8-git.patch | 2423 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2423 insertions(+) create mode 100644 main/mesa/mesa-7.8-git.patch (limited to 'main/mesa/mesa-7.8-git.patch') diff --git a/main/mesa/mesa-7.8-git.patch b/main/mesa/mesa-7.8-git.patch new file mode 100644 index 0000000000..169b38b05b --- /dev/null +++ b/main/mesa/mesa-7.8-git.patch @@ -0,0 +1,2423 @@ +diff --git a/Makefile b/Makefile +index 84d0038..63fdf87 100644 +--- a/Makefile ++++ b/Makefile +@@ -180,7 +180,7 @@ ultrix-gcc: + + # Rules for making release tarballs + +-VERSION=7.8.2 ++VERSION=7.8.3 + DIRECTORY = Mesa-$(VERSION) + LIB_NAME = MesaLib-$(VERSION) + DEMO_NAME = MesaDemos-$(VERSION) +@@ -285,9 +285,6 @@ MAIN_FILES = \ + $(DIRECTORY)/src/mesa/x86-64/*.[chS] \ + $(DIRECTORY)/src/mesa/x86-64/Makefile \ + $(DIRECTORY)/progs/Makefile \ +- $(DIRECTORY)/progs/util/README \ +- $(DIRECTORY)/progs/util/*.[ch] \ +- $(DIRECTORY)/progs/util/sampleMakefile \ + $(DIRECTORY)/windows/VC8/ + + ES_FILES = \ +@@ -438,7 +435,10 @@ DEMO_FILES = \ + $(DIRECTORY)/progs/glsl/*.c \ + $(DIRECTORY)/progs/glsl/*.frag \ + $(DIRECTORY)/progs/glsl/*.vert \ +- $(DIRECTORY)/progs/glsl/*.shtest ++ $(DIRECTORY)/progs/glsl/*.shtest \ ++ $(DIRECTORY)/progs/util/README \ ++ $(DIRECTORY)/progs/util/*.[ch] \ ++ $(DIRECTORY)/progs/util/sampleMakefile + + GLUT_FILES = \ + $(DIRECTORY)/include/GL/glut.h \ +diff --git a/configs/autoconf.in b/configs/autoconf.in +index fbd5faa..6218be9 100644 +--- a/configs/autoconf.in ++++ b/configs/autoconf.in +@@ -26,6 +26,11 @@ INTEL_LIBS = @INTEL_LIBS@ + INTEL_CFLAGS = @INTEL_CFLAGS@ + X11_LIBS = @X11_LIBS@ + X11_CFLAGS = @X11_CFLAGS@ ++GLW_CFLAGS = @GLW_CFLAGS@ ++GLUT_CFLAGS = @GLUT_CFLAGS@ ++ ++# dlopen ++DLOPEN_LIBS = @DLOPEN_LIBS@ + + # Assembler + MESA_ASM_SOURCES = @MESA_ASM_SOURCES@ +diff --git a/configs/default b/configs/default +index f12bec8..d4b45a3 100644 +--- a/configs/default ++++ b/configs/default +@@ -121,6 +121,8 @@ APP_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LI + APP_LIB_DEPS = -lm + X11_LIBS = -lX11 + ++DLOPEN_LIBS = -ldl ++ + # Installation directories (for make install) + INSTALL_DIR = /usr/local + INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR) +diff --git a/configure.ac b/configure.ac +index e711634..e15371f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -398,6 +398,7 @@ 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"])]) ++AC_SUBST([DLOPEN_LIBS]) + + dnl See if posix_memalign is available + AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"]) +@@ -699,7 +700,7 @@ AC_SUBST([DRI_DRIVER_SEARCH_DIR]) + dnl Direct rendering or just indirect rendering + AC_ARG_ENABLE([driglx-direct], + [AS_HELP_STRING([--disable-driglx-direct], +- [enable direct rendering in GLX for DRI @<:@default=enabled@:>@])], ++ [enable direct rendering in GLX and EGL for DRI @<:@default=enabled@:>@])], + [driglx_direct="$enableval"], + [driglx_direct="yes"]) + dnl Which drivers to build - default is chosen by platform +@@ -1102,10 +1103,6 @@ fi + + if test "x$enable_glut" = xyes; then + SRC_DIRS="$SRC_DIRS glut/glx" +- GLUT_CFLAGS="" +- if test "x$GCC" = xyes; then +- GLUT_CFLAGS="-fexceptions" +- fi + if test "$x11_pkgconfig" = yes; then + PKG_CHECK_MODULES([GLUT],[x11 xmu xi]) + GLUT_PC_REQ_PRIV="x11 xmu xi" +@@ -1116,6 +1113,9 @@ if test "x$enable_glut" = xyes; then + GLUT_PC_LIB_PRIV="$GLUT_LIB_DEPS" + GLUT_PC_CFLAGS="$X11_INCLUDES" + fi ++ if test "x$GCC" = xyes; then ++ GLUT_CFLAGS="$GLUT_CFLAGS -fexceptions" ++ fi + GLUT_LIB_DEPS="$GLUT_LIB_DEPS -lm" + GLUT_PC_LIB_PRIV="$GLUT_PC_LIB_PRIV -lm" + +@@ -1217,6 +1217,10 @@ yes) + if test "x$enable_egl" != xyes; then + AC_MSG_ERROR([cannot build egl state tracker without EGL library]) + fi ++ # define GLX_DIRECT_RENDERING even when the driver is not dri ++ if test "x$mesa_driver" != xdri -a "x$driglx_direct" = xyes; then ++ DEFINES="$DEFINES -DGLX_DIRECT_RENDERING" ++ fi + ;; + xorg) + PKG_CHECK_MODULES([LIBDRM_XORG], [libdrm >= $LIBDRM_XORG_REQUIRED]) +diff --git a/docs/news.html b/docs/news.html +index 92e2a18..01e2834 100644 +--- a/docs/news.html ++++ b/docs/news.html +@@ -11,6 +11,14 @@ +

News

+ + ++

TBD, 2010

++ ++

++Mesa 7.8.3 is released. This is a bug-fix ++release collecting fixes since the 7.8.2 release. ++

++ ++ +

June 16, 2010

+ +

+diff --git a/docs/relnotes-7.8.2.html b/docs/relnotes-7.8.2.html +index 4d7758d..1393b2e 100644 +--- a/docs/relnotes-7.8.2.html ++++ b/docs/relnotes-7.8.2.html +@@ -142,7 +142,5 @@ a471807b65e49c325808ba4551be93ed MesaGLUT-7.8.2.tar.bz2 + + + +-

Changes

+-

None.

+ + +diff --git a/docs/relnotes-7.8.3.html b/docs/relnotes-7.8.3.html +new file mode 100644 +index 0000000..1e9f433 +--- /dev/null ++++ b/docs/relnotes-7.8.3.html +@@ -0,0 +1,89 @@ ++ ++ ++Mesa Release Notes ++ ++ ++ ++ ++ ++ ++ ++

Mesa 7.8.3 Release Notes / (date tbd)

++ ++

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

++

++Mesa 7.8.3 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

++
++x  MesaLib-7.8.3.tar.gz
++x  MesaLib-7.8.3.tar.bz2
++x  MesaLib-7.8.3.zip
++x  MesaDemos-7.8.3.tar.gz
++x  MesaDemos-7.8.3.tar.bz2
++x  MesaDemos-7.8.3.zip
++x  MesaGLUT-7.8.3.tar.gz
++x  MesaGLUT-7.8.3.tar.bz2
++x  MesaGLUT-7.8.3.zip
++
++ ++ ++

New features

++

None.

++ ++ ++

Changes

++ ++ ++ ++

Bug fixes

++ ++ ++ ++ ++ +diff --git a/docs/relnotes.html b/docs/relnotes.html +index 39b02b8..46f6469 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. +

+ +