diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc index 46fd104eb4..109491f498 100644 --- a/meta/conf/distro/include/preferred-xorg-versions.inc +++ b/meta/conf/distro/include/preferred-xorg-versions.inc @@ -135,7 +135,7 @@ PREFERRED_VERSION_xtrans-native ?= "1.2.6" PREFERRED_VERSION_xtrans-nativesdk ?= "1.2.6" PREFERRED_VERSION_xvinfo ?= "1.1.1" PREFERRED_VERSION_xwininfo ?= "1.1.1" -PREFERRED_VERSION_mesa-dri ?= "7.10" +PREFERRED_VERSION_mesa-dri ?= "7.10.2" PREFERRED_VERSION_libdrm ?= "2.4.25" PREFERRED_VERSION_xcb-proto ?= "1.6" PREFERRED_VERSION_libxcb ?= "1.7" diff --git a/meta/recipes-graphics/mesa/files/talloc-removal.patch b/meta/recipes-graphics/mesa/files/talloc-removal.patch deleted file mode 100644 index 3038f6a5e6..0000000000 --- a/meta/recipes-graphics/mesa/files/talloc-removal.patch +++ /dev/null @@ -1,15571 +0,0 @@ -mesa: sync with mesa 7.10.1 devel branch to replace GPLv3 talloc with BSD-license ralloc - -mesa 7.10.1 devel branch already has the patch to replace talloc with ralloc, so this patch is the diff of mesa-7.10(7a3f869a4) and mesa 7.10.1 ralloc commit (546aade2) - -Pick-from-upstream-by: Yu Ke - -diff --git a/Makefile b/Makefile -index d62ec43..32a5f2f 100644 ---- a/Makefile -+++ b/Makefile -@@ -180,7 +180,7 @@ ultrix-gcc: - - # Rules for making release tarballs - --VERSION=7.10 -+VERSION=7.10.1-devel - DIRECTORY = Mesa-$(VERSION) - LIB_NAME = MesaLib-$(VERSION) - GLUT_NAME = MesaGLUT-$(VERSION) -diff --git a/configs/autoconf.in b/configs/autoconf.in -index e2d70c6..1538d9a 100644 ---- a/configs/autoconf.in -+++ b/configs/autoconf.in -@@ -34,9 +34,6 @@ LLVM_LIBS = @LLVM_LIBS@ - GLW_CFLAGS = @GLW_CFLAGS@ - GLUT_CFLAGS = @GLUT_CFLAGS@ - --TALLOC_LIBS = @TALLOC_LIBS@ --TALLOC_CFLAGS = @TALLOC_CFLAGS@ -- - # dlopen - DLOPEN_LIBS = @DLOPEN_LIBS@ - -diff --git a/configs/default b/configs/default -index 0301345..2301a68 100644 ---- a/configs/default -+++ b/configs/default -@@ -82,9 +82,6 @@ GLESv1_CM_LIB_GLOB = $(GLESv1_CM_LIB_NAME)* - GLESv2_LIB_GLOB = $(GLESv2_LIB_NAME)* - VG_LIB_GLOB = $(VG_LIB_NAME)* - --TALLOC_LIBS = `pkg-config --libs talloc` --TALLOC_CFLAGS = `pkg-config --cflags talloc` -- - # Optional assembly language optimization files for libGL - MESA_ASM_SOURCES = - -@@ -119,7 +116,7 @@ EGL_CLIENT_APIS = $(GL_LIB) - - # Library dependencies - #EXTRA_LIB_PATH ?= --GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread $(TALLOC_LIBS) -+GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread - EGL_LIB_DEPS = $(EXTRA_LIB_PATH) -ldl -lpthread - OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) - GLU_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -diff --git a/configs/linux-dri b/configs/linux-dri -index 64fc407..1c94ed0 100644 ---- a/configs/linux-dri -+++ b/configs/linux-dri -@@ -45,7 +45,7 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib - - LIBDRM_CFLAGS = $(shell pkg-config --cflags libdrm) - LIBDRM_LIB = $(shell pkg-config --libs libdrm) --DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl -ltalloc $(LIBDRM_LIB) -+DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) - GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ - -lm -lpthread -ldl $(LIBDRM_LIB) - -diff --git a/configs/linux-llvm b/configs/linux-llvm -index 22de066..e699953 100644 ---- a/configs/linux-llvm -+++ b/configs/linux-llvm -@@ -41,4 +41,4 @@ else - endif - - LD = g++ --GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -ltalloc -lstdc++ -ludis86 -+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++ -ludis86 -diff --git a/configure.ac b/configure.ac -index b451f7c..6662b8a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -572,10 +572,6 @@ xno) - ;; - esac - --PKG_CHECK_MODULES([TALLOC], [talloc]) --AC_SUBST([TALLOC_LIBS]) --AC_SUBST([TALLOC_CFLAGS]) -- - dnl - dnl Driver specific build directories - dnl -@@ -714,8 +710,8 @@ xlib) - GL_PC_LIB_PRIV="$GL_LIB_DEPS" - GL_PC_CFLAGS="$X11_INCLUDES" - fi -- GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS" -- GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread $TALLOC_LIBS" -+ GL_LIB_DEPS="$GL_LIB_DEPS $SELINUX_LIBS -lm -lpthread" -+ GL_PC_LIB_PRIV="$GL_PC_LIB_PRIV $SELINUX_LIBS -lm -lpthread" - - # if static, move the external libraries to the programs - # and empty the libraries for libGL -@@ -964,7 +960,7 @@ if test "$mesa_driver" = dri -o "$mesa_driver" = no; then - fi - - # put all the necessary libs together -- DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS $TALLOC_LIBS" -+ DRI_LIB_DEPS="$SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIB -lm -lpthread $DLOPEN_LIBS" - fi - AC_SUBST([DRI_DIRS]) - AC_SUBST([EXPAT_INCLUDES]) -@@ -1040,12 +1036,12 @@ case "$DRIVER_DIRS" in - *osmesa*) - # only link libraries with osmesa if shared - if test "$enable_static" = no; then -- OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS" -+ OSMESA_LIB_DEPS="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" - else - OSMESA_LIB_DEPS="" - fi - OSMESA_MESA_DEPS="" -- OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS $TALLOC_LIBS" -+ OSMESA_PC_LIB_PRIV="-lm -lpthread $SELINUX_LIBS $DLOPEN_LIBS" - ;; - esac - AC_SUBST([OSMESA_LIB_DEPS]) -diff --git a/docs/news.html b/docs/news.html -index 72d38ee..ce0cd0c 100644 ---- a/docs/news.html -+++ b/docs/news.html -@@ -11,6 +11,19 @@ -

News

- - -+

January 7, 2011

-+ -+

-+Mesa 7.10 (final) is released. This is a new -+development release. -+

-+ -+

-+Also, Mesa 7.9.1 (final) is released. -+This is a bug fix release. -+

-+ -+ -

October 4, 2010

- -

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

Mesa 7.10.1 Release Notes / TBD

-+ -+

-+Mesa 7.10.1 is a bug fix release which fixes bugs found since the 7.10 release. -+

-+

-+Mesa 7.10.1 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.

-+ -+

Bug fixes

-+

This list is likely incomplete.

-+ -+ -+ -+

Changes

-+

The full set of changes can be viewed by using the following GIT command:

-+ -+
-+  git log mesa-7.10..origin/7.10
-+
-+ -+

-+ -+ -+ -diff --git a/docs/relnotes-7.10.html b/docs/relnotes-7.10.html -index 2abbc4a..3f4f229 100644 ---- a/docs/relnotes-7.10.html -+++ b/docs/relnotes-7.10.html -@@ -1,8 +1,10 @@ - - -+ - Mesa Release Notes -- -- -+ -+ -+ - - - -@@ -28,7 +30,12 @@ for DRI hardware acceleration. - -

MD5 checksums

- 
--tbd
-+0a70c15c135561824bdcae92bf232e43  MesaLib-7.10.tar.gz
-+33fb94eccc02cbb4d8d1365615e38e46  MesaLib-7.10.tar.bz2
-+5cafdc0eda0f9bf370b95c98df3338fa  MesaLib-7.10.zip
-+bc644be551ed585fc4f66c16b64a91c9  MesaGLUT-7.10.tar.gz
-+5c2677a155672352d62b177e4f0f92e8  MesaGLUT-7.10.tar.bz2
-+2ce5001f74496d1ba719ef74d910a5cf  MesaGLUT-7.10.zip
-
- - -diff --git a/docs/relnotes-7.9.1.html b/docs/relnotes-7.9.1.html -index a46eb16..bef4ef1 100644 ---- a/docs/relnotes-7.9.1.html -+++ b/docs/relnotes-7.9.1.html -@@ -1,8 +1,10 @@ - - -+ - Mesa Release Notes -- -- -+ -+ -+ - - - -diff --git a/docs/relnotes.html b/docs/relnotes.html -index 4487af9..036d3f8 100644 ---- a/docs/relnotes.html -+++ b/docs/relnotes.html -@@ -13,6 +13,8 @@ The release notes summarize what's new or changed in each Mesa release. -

- -