From bf1df315dff8849b1bcff4b4c5b907139d1baa9e Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 15 Mar 2014 16:41:35 +0800 Subject: [PATCH] Externals - Updated makefiles --- Externals/mesa/Makefile | 4 ++-- Externals/mesa/patches/bin/config.sub.patch | 7 +++++++ Externals/mplayer/Makefile | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 Externals/mesa/patches/bin/config.sub.patch diff --git a/Externals/mesa/Makefile b/Externals/mesa/Makefile index 2fbcfbfe..eb68c25d 100644 --- a/Externals/mesa/Makefile +++ b/Externals/mesa/Makefile @@ -7,8 +7,8 @@ DEPS := TARBALL_PATTERN := MesaLib-*.tar.bz2 TARBALL_TO_DIR_L := MesaLib-%.tar.bz2 TARBALL_TO_DIR_R := Mesa-% -PATCHES := +PATCHES := bin/config.sub CONFIGURE_ARGS = --enable-osmesa --with-osmesa-bits=8 --disable-dri --disable-glx --with-dri-drivers=swrast --without-gallium-drivers --disable-egl --enable-shared -include ../common.mk +include ../common_automake.mk diff --git a/Externals/mesa/patches/bin/config.sub.patch b/Externals/mesa/patches/bin/config.sub.patch new file mode 100644 index 00000000..9012a560 --- /dev/null +++ b/Externals/mesa/patches/bin/config.sub.patch @@ -0,0 +1,7 @@ +--- config.sub 2013-06-17 11:39:39.670720710 +0800 ++++ config.sub 2013-06-17 11:48:09.149384231 +0800 +@@ -1350,2 +1350,3 @@ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ ++ | -acess2 \ + | -aos* | -aros* \ + diff --git a/Externals/mplayer/Makefile b/Externals/mplayer/Makefile index b2f546fd..6d374d07 100644 --- a/Externals/mplayer/Makefile +++ b/Externals/mplayer/Makefile @@ -9,7 +9,7 @@ TARBALL_TO_DIR_L := %.tar.xz TARBALL_TO_DIR_R := % CONFIGURE_LINE = $(SDIR)/configure --cc=$(HOST)-gcc --prefix=$(PREFIX) PATCHES := -NOBDIR = yes +NOBDIR = no -include ../common.mk +include ../common_automake.mk -- 2.20.1