diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-02 18:45:54 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-12-02 18:45:54 +0100 |
| commit | b8f966a1a310829fa88d0e7c48a41c5bd199bda7 (patch) | |
| tree | 6f21663af05d8b6e4244c39952078db69e06465f /package | |
| parent | a4a0ac503bdaefff0199a08e3f07018490b285e9 (diff) | |
| parent | eadbd60e3c14938645248266625916925d11dc06 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package')
| -rw-r--r-- | package/MesaLib/Makefile | 6 | ||||
| -rw-r--r-- | package/MesaLib/patches/patch-configure_ac | 11 |
2 files changed, 16 insertions, 1 deletions
diff --git a/package/MesaLib/Makefile b/package/MesaLib/Makefile index 10482b799..416cbb475 100644 --- a/package/MesaLib/Makefile +++ b/package/MesaLib/Makefile @@ -11,7 +11,7 @@ PKG_DESCR:= MESA 3D graphics library PKG_SECTION:= libs PKG_DEPENDS:= libxdamage libxfixes libdrm libxxf86vm libexpat PKG_DEPENDS+= libxml2 libxml2-python -PKG_BUILDDEP:= python2 libxml2 libXdamage libXfixes libXxf86vm libdrm +PKG_BUILDDEP:= autotool python2 libxml2 libXdamage libXfixes libXxf86vm libdrm PKG_BUILDDEP+= dri2proto glproto expat libXext PKG_URL:= http://www.mesa3d.org/ PKG_SITES:= ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/ @@ -28,11 +28,15 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,MESALIB,mesalib,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) include $(TOPDIR)/mk/python.mk +ifeq ($(ADK_HOST_DARWIN),y) +PYTHON:=/opt/local/bin/python2.7 +endif ifeq (${ADK_TARGET_SYSTEM_IBM_X40},y) DRI_DRIVERS:=i915 endif +AUTOTOOL_STYLE:= autoreconf CONFIGURE_ARGS+= --disable-static \ --disable-gallium-llvm \ --with-gallium-drivers=swrast \ diff --git a/package/MesaLib/patches/patch-configure_ac b/package/MesaLib/patches/patch-configure_ac new file mode 100644 index 000000000..c788ea1cd --- /dev/null +++ b/package/MesaLib/patches/patch-configure_ac @@ -0,0 +1,11 @@ +--- Mesa-9.2.2.orig/configure.ac 2013-10-19 01:36:09.000000000 +0200 ++++ Mesa-9.2.2/configure.ac 2013-12-01 14:08:00.000000000 +0100 +@@ -69,7 +69,7 @@ AC_PATH_PROG([PERL], [perl]) + + AC_CHECK_PROG(INDENT, indent, indent, cat) + if test "x$INDENT" != "xcat"; then +- AC_SUBST(INDENT_FLAGS, '-i4 -nut -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool') ++ AC_SUBST(INDENT_FLAGS, '-i4 -br -brs -npcs -ce -TGLubyte -TGLbyte -TBool') + fi + + AC_PROG_INSTALL |