[Buildroot] [PATCH 2/2] package/{mesa3d, mesa3d-headers}: bump version to 10.5.2

Bernd Kuhls bernd.kuhls at t-online.de
Sun Mar 29 00:29:08 UTC 2015


Add two patches to remove dependency on host-python.

0002-disable-python2.patch
is a patch fixing the remaining problems of patch #3

0003-configure.ac-error-out-if-python-mako-is-not-found-when-required.patch
was ported from an upstream patch proposal to 10.5 branch

Fixes python3-related build error
http://autobuild.buildroot.net/results/1ce/1ce2509c8abb7483397c7d0f21c299095e94a254/

Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
---
 package/mesa3d-headers/mesa3d-headers.mk           |    2 +-
 package/mesa3d/0002-disable-python2.patch          |   29 ++++++++++
 ...if-python-mako-is-not-found-when-required.patch |   61 ++++++++++++++++++++
 package/mesa3d/mesa3d.hash                         |    4 +-
 package/mesa3d/mesa3d.mk                           |    3 +-
 5 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 package/mesa3d/0002-disable-python2.patch
 create mode 100644 package/mesa3d/0003-configure.ac-error-out-if-python-mako-is-not-found-when-required.patch

diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk
index 0708a0f..3eec2c8 100644
--- a/package/mesa3d-headers/mesa3d-headers.mk
+++ b/package/mesa3d-headers/mesa3d-headers.mk
@@ -12,7 +12,7 @@ endif
 
 # Not possible to directly refer to mesa3d variables, because of
 # first/second expansion trickery...
-MESA3D_HEADERS_VERSION = 10.5.1
+MESA3D_HEADERS_VERSION = 10.5.2
 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
 MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION)
 MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos
diff --git a/package/mesa3d/0002-disable-python2.patch b/package/mesa3d/0002-disable-python2.patch
new file mode 100644
index 0000000..b09561c
--- /dev/null
+++ b/package/mesa3d/0002-disable-python2.patch
@@ -0,0 +1,29 @@
+Upstream tarball provides all files generated by python,
+this patch convinces the build system that host-python
+is not needed anymore ;)
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr mesa-10.5.2.org/configure.ac mesa-10.5.2/configure.ac
+--- mesa-10.5.2.org/configure.ac	2015-03-28 19:20:39.000000000 +0100
++++ mesa-10.5.2/configure.ac	2015-03-28 21:41:01.743499679 +0100
+@@ -87,7 +87,6 @@
+ AM_PROG_CC_C_O
+ AM_PROG_AS
+ AX_CHECK_GNU_MAKE
+-AC_CHECK_PROGS([PYTHON2], [python2 python])
+ AC_PROG_SED
+ AC_PROG_MKDIR_P
+ 
+diff -uNr mesa-10.5.2.org/src/mesa/drivers/dri/common/xmlpool/Makefile.am mesa-10.5.2/src/mesa/drivers/dri/common/xmlpool/Makefile.am
+--- mesa-10.5.2.org/src/mesa/drivers/dri/common/xmlpool/Makefile.am	2015-03-21 01:51:19.000000000 +0100
++++ mesa-10.5.2/src/mesa/drivers/dri/common/xmlpool/Makefile.am	2015-03-28 22:01:54.279952601 +0100
+@@ -63,7 +63,7 @@
+ 
+ # Default target options.h
+ options.h: LOCALEDIR := .
+-options.h: t_options.h $(MOS)
++options.h: t_options.h
+ 	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h
+ 
+ # Update .mo files from the corresponding .po files.
diff --git a/package/mesa3d/0003-configure.ac-error-out-if-python-mako-is-not-found-when-required.patch b/package/mesa3d/0003-configure.ac-error-out-if-python-mako-is-not-found-when-required.patch
new file mode 100644
index 0000000..a6aef51
--- /dev/null
+++ b/package/mesa3d/0003-configure.ac-error-out-if-python-mako-is-not-found-when-required.patch
@@ -0,0 +1,61 @@
+[Mesa-dev,2/2] configure.ac: error out if python/mako is not found when required
+
+Ported upstream patch proposal to 10.5 branch:
+https://freedesktop.org/patch/45469/
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
+
+diff -uNr mesa-10.5.2.org/configure.ac mesa-10.5.2/configure.ac
+--- mesa-10.5.2.org/configure.ac	2015-03-28 19:20:39.000000000 +0100
++++ mesa-10.5.2/configure.ac	2015-03-29 00:02:41.479890004 +0100
+@@ -115,8 +114,48 @@
+ fi
+ 
+ AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
+-if test -n "$PYTHON2" -a "x$acv_mako_found" != "xyes"; then
+-    AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
++
++if test -z "$PYTHON2"; then
++    if test ! -f "$srcdir/src/gallium/auxiliary/indices/u_indices_gen.c" -o \
++            ! -f "$srcdir/src/gallium/auxiliary/indices/u_unfilled_gen.c" -o \
++            ! -f "$srcdir/src/gallium/auxiliary/util/u_format_table.c" -o \
++            ! -f "$srcdir/src/glx/indirect.c" -o \
++            ! -f "$srcdir/src/glx/indirect.h" -o \
++            ! -f "$srcdir/src/glx/indirect_init.c" -o \
++            ! -f "$srcdir/src/glx/indirect_size.c" -o \
++            ! -f "$srcdir/src/glx/indirect_size.h" -o \
++            ! -f "$srcdir/src/mapi/es1api/glapi_mapi_tmp.h" -o \
++            ! -f "$srcdir/src/mapi/es2api/glapi_mapi_tmp.h" -o \
++            ! -f "$srcdir/src/mapi/glapi/glapi_mapi_tmp.h" -o \
++            ! -f "$srcdir/src/mapi/glapi/glprocs.h" -o \
++            ! -f "$srcdir/src/mapi/glapi/glapitemp.h" -o \
++            ! -f "$srcdir/src/mapi/glapi/glapitable.h" -o \
++            ! -f "$srcdir/src/mapi/glapi/glapi_gentable.c" -o \
++            ! -f "$srcdir/src/mapi/glapi/glapi_x86.S" -o \
++            ! -f "$srcdir/src/mapi/glapi/glapi_x86-64.S" -o \
++            ! -f "$srcdir/src/mapi/glapi/glapi_sparc.S" -o \
++            ! -f "$srcdir/src/mapi/shared-glapi/glapi_mapi_tmp.h" -o \
++            ! -f "$srcdir/src/mesa/drivers/dri/common/xmlpool/options.h" -o \
++            ! -f "$srcdir/src/mesa/main/enums.c" -o \
++            ! -f "$srcdir/src/mesa/main/api_exec.c" -o \
++            ! -f "$srcdir/src/mesa/main/dispatch.h" -o \
++            ! -f "$srcdir/src/mesa/main/format_info.h" -o \
++            ! -f "$srcdir/src/mesa/main/get_hash.h" -o \
++            ! -f "$srcdir/src/mesa/main/remap_helper.h" -o \
++            ! -f "$srcdir/src/util/format_srgb.c"; then
++        AC_MSG_ERROR([Python not found - unable to generate sources])
++    fi
++else
++    if test "x$acv_mako_found" = xno; then
++        if test ! -f "$srcdir/src/glsl/nir/nir_constant_expressions.c" -o \
++                ! -f "$srcdir/src/glsl/nir/nir_opcodes.c" -o \
++                ! -f "$srcdir/src/glsl/nir/nir_opcodes.h" -o \
++                ! -f "$srcdir/src/glsl/nir/nir_opt_algebraic.c" -o \
++                ! -f "$srcdir/src/mesa/main/format_pack.c" -o \
++                ! -f "$srcdir/src/mesa/main/format_unpack.c"; then
++            AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
++        fi
++    fi
+ fi
+ 
+ AC_PROG_INSTALL
diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash
index f562469..f619f52 100644
--- a/package/mesa3d/mesa3d.hash
+++ b/package/mesa3d/mesa3d.hash
@@ -1,2 +1,2 @@
-# From http://lists.freedesktop.org/archives/mesa-announce/2015-March/000146.html
-sha256	ffc51943d15c6812ee7611d053d8980a683fbd6a4986cff567b12cc66637d679	mesa-10.5.1.tar.xz
+# From http://lists.freedesktop.org/archives/mesa-announce/2015-March/000148.html
+sha256	2f4b6fb77c3e7d6f861558d0884a3073f575e1e673dad8d1b0624e78e9c4dd44	mesa-10.5.2.tar.xz
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index fc82227..efda874 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 # When updating the version, please also update mesa3d-headers
-MESA3D_VERSION = 10.5.1
+MESA3D_VERSION = 10.5.2
 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
 MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION)
 MESA3D_LICENSE = MIT, SGI, Khronos
@@ -19,7 +19,6 @@ MESA3D_PROVIDES =
 MESA3D_DEPENDENCIES = \
 	expat \
 	host-gettext \
-	host-python-mako \
 	libdrm
 
 ifeq ($(BR2_PACKAGE_XORG7),y)
-- 
1.7.10.4




More information about the buildroot mailing list