* [PATCH 1/4] mesa-dri-7.10: replace GPLv3 talloc with MIT-x licensed ralloc
2011-02-09 14:00 [PATCH 0/4] mesa: replace talloc with MIT-x licensed ralloc Yu Ke
@ 2011-02-09 14:00 ` Yu Ke
2011-02-09 14:00 ` [PATCH 2/4] mesa-7.10: set mesa 7.10 as default instead of 7.8.2 Yu Ke
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Yu Ke @ 2011-02-09 14:00 UTC (permalink / raw)
To: poky
mesa 7.10.1 devel branch has the patch to replace talloc with ralloc.
so add a patch to sync with 7.10.1 devel branch.
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../mesa/files/talloc-removal.patch |15571 ++++++++++++++++++++
meta/recipes-graphics/mesa/mesa-dri_7.10.bb | 5 +-
2 files changed, 15574 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/files/talloc-removal.patch
the patch is too big (>500K) to be attached in this email. please see detail in
http://git.pokylinux.org/cgit/cgit.cgi/poky-contrib/commit/?h=kyu3/mesa&id=30cb044469c390de534b770ce7c33a7e1b8499cc
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/4] mesa-7.10: set mesa 7.10 as default instead of 7.8.2
2011-02-09 14:00 [PATCH 0/4] mesa: replace talloc with MIT-x licensed ralloc Yu Ke
2011-02-09 14:00 ` [PATCH 1/4] mesa-dri-7.10: replace GPLv3 " Yu Ke
@ 2011-02-09 14:00 ` Yu Ke
2011-02-09 14:00 ` [PATCH 3/4] mesa-xlib: upgrade to 7.10 Yu Ke
2011-02-09 14:00 ` [PATCH 4/4] talloc: remove talloc recipe Yu Ke
3 siblings, 0 replies; 5+ messages in thread
From: Yu Ke @ 2011-02-09 14:00 UTC (permalink / raw)
To: poky
originally mesa 7.8.2 is set as default because 7.10
has depency of GPLv3 talloc. since mesa 7.10 has resolved
the GPLv3 talloc dependency issue, it is safe to set 7.10
as default
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../distro/include/preferred-xorg-versions.inc | 2 +-
meta/recipes-graphics/mesa/mesa-dri_7.10.bb | 5 ++++-
meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb | 5 +----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/meta/conf/distro/include/preferred-xorg-versions.inc b/meta/conf/distro/include/preferred-xorg-versions.inc
index 3a4bd33..b164b77 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.8.2"
+PREFERRED_VERSION_mesa-dri ?= "7.10"
PREFERRED_VERSION_libdrm ?= "2.4.23"
PREFERRED_VERSION_xcb-proto ?= "1.6"
PREFERRED_VERSION_libxcb ?= "1.7"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.10.bb b/meta/recipes-graphics/mesa/mesa-dri_7.10.bb
index 1984ff6..cca1cc9 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.10.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.10.bb
@@ -8,7 +8,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://talloc-removal.patch \
@@ -20,6 +20,9 @@ SRC_URI[sha256sum] = "bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
+# Atom PCs have DRI support so use mesa-dri by default
+DEFAULT_PREFERENCE_atom-pc = "1"
+
LEAD_SONAME = "libGL.so.1"
EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
diff --git a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
index 60edddf..1b4606d 100644
--- a/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri_7.8.2.bb
@@ -7,7 +7,7 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} mesa-dri-glsl-native"
-PR = "r2"
+PR = "r3"
SRC_URI += "file://crossfix.patch"
@@ -20,9 +20,6 @@ SRC_URI[mesademos.sha256sum] = "ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794
# most of our targets do not have DRI so will use mesa-xlib
DEFAULT_PREFERENCE = "-1"
-# Atom PCs have DRI support so use mesa-dri by default
-DEFAULT_PREFERENCE_atom-pc = "1"
-
LEAD_SONAME = "libGL.so.1"
EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/4] mesa-xlib: upgrade to 7.10
2011-02-09 14:00 [PATCH 0/4] mesa: replace talloc with MIT-x licensed ralloc Yu Ke
2011-02-09 14:00 ` [PATCH 1/4] mesa-dri-7.10: replace GPLv3 " Yu Ke
2011-02-09 14:00 ` [PATCH 2/4] mesa-7.10: set mesa 7.10 as default instead of 7.8.2 Yu Ke
@ 2011-02-09 14:00 ` Yu Ke
2011-02-09 14:00 ` [PATCH 4/4] talloc: remove talloc recipe Yu Ke
3 siblings, 0 replies; 5+ messages in thread
From: Yu Ke @ 2011-02-09 14:00 UTC (permalink / raw)
To: poky
- add patch to replace GPLv3 talloc with ralloc
- add SRC_URI checksum
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../mesa/{mesa-xlib_7.9.bb => mesa-xlib_7.10.bb} | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-xlib_7.9.bb => mesa-xlib_7.10.bb} (60%)
diff --git a/meta/recipes-graphics/mesa/mesa-xlib_7.9.bb b/meta/recipes-graphics/mesa/mesa-xlib_7.10.bb
similarity index 60%
rename from meta/recipes-graphics/mesa/mesa-xlib_7.9.bb
rename to meta/recipes-graphics/mesa/mesa-xlib_7.10.bb
index a816e93..5cc719e 100644
--- a/meta/recipes-graphics/mesa/mesa-xlib_7.9.bb
+++ b/meta/recipes-graphics/mesa/mesa-xlib_7.10.bb
@@ -1,15 +1,20 @@
include mesa-common.inc
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+ file://talloc-removal.patch \
+ "
+
+SRC_URI[md5sum] = "33fb94eccc02cbb4d8d1365615e38e46"
+SRC_URI[sha256sum] = "bcf28f43f39c28da271c0f5857fb32898d4ade3e035e80a0ceece1c2df6e0aca"
LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes talloc libxml2-native"
+LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-native"
DEPENDS = "${PROTO_DEPS} ${LIB_DEPS}"
PE = "1"
-PR = "r1"
+PR = "r0"
EXTRA_OECONF += "--with-driver=xlib"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 4/4] talloc: remove talloc recipe
2011-02-09 14:00 [PATCH 0/4] mesa: replace talloc with MIT-x licensed ralloc Yu Ke
` (2 preceding siblings ...)
2011-02-09 14:00 ` [PATCH 3/4] mesa-xlib: upgrade to 7.10 Yu Ke
@ 2011-02-09 14:00 ` Yu Ke
3 siblings, 0 replies; 5+ messages in thread
From: Yu Ke @ 2011-02-09 14:00 UTC (permalink / raw)
To: poky
mesa no long need talloc, so remove it
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
meta/recipes-support/talloc/talloc_2.0.1.bb | 24 ------------------------
1 files changed, 0 insertions(+), 24 deletions(-)
delete mode 100644 meta/recipes-support/talloc/talloc_2.0.1.bb
diff --git a/meta/recipes-support/talloc/talloc_2.0.1.bb b/meta/recipes-support/talloc/talloc_2.0.1.bb
deleted file mode 100644
index dfbaf31..0000000
--- a/meta/recipes-support/talloc/talloc_2.0.1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Hierarchical, reference counted memory pool system with destructors"
-HOMEPAGE = "http://talloc.samba.org"
-BUGTRACKER = "https://bugzilla.samba.org/"
-LICENSE = "LGPLv3+"
-LIC_FILES_CHKSUM = "file://talloc.c;beginline=8;endline=26;md5=ea9b6ec07a6d8b3e771f0ec75ca3a317"
-
-PR = "r0"
-
-SRC_URI = "http://samba.org/ftp/${BPN}/${BPN}-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "c6e736540145ca58cb3dcb42f91cf57b"
-SRC_URI[sha256sum] = "5b810527405f29d54f50efd78bf2c89e318f2cd8bed001f22f2a1412fd27c9b4"
-
-inherit autotools pkgconfig
-
-# autoreconf doesn't work well while reconfiguring included libreplace
-do_configure () {
- gnu-configize
- oe_runconf
-}
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-BBCLASSEXTEND = "native"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 5+ messages in thread