From a7e49eb2af5d2ca6e53fb908fddfddd92696910a Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 10 Aug 2007 19:07:51 +0000
Subject: Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. 
 Doesn't quite work yet for me, but this clearly is a huge project and not
 having it quite work on the first pass is hardly unexpected.  We definately
 want this stuff in buildroot.

---
 package/x11r7/mesa3d/Config.in                     |  8 ++
 .../x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch    | 11 +++
 package/x11r7/mesa3d/mesa3d.mk                     | 85 ++++++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 package/x11r7/mesa3d/Config.in
 create mode 100644 package/x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch
 create mode 100644 package/x11r7/mesa3d/mesa3d.mk

(limited to 'package/x11r7/mesa3d')

diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
new file mode 100644
index 000000000..c1f4ab542
--- /dev/null
+++ b/package/x11r7/mesa3d/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_MESA3D
+	bool "Mesa 3D Graphics Library"
+	default n
+	select BR2_PACKAGE_XPROTO_GLPROTO
+	select BR2_PACKAGE_XSERVER_XORG_SERVER
+	help
+	  Mesa 3D, an open-source implementation of the OpenGL specification.
+
diff --git a/package/x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch b/package/x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch
new file mode 100644
index 000000000..22b511168
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d-6.5.3-gen_matypes.patch
@@ -0,0 +1,11 @@
+--- Mesa-6.5.3/src/mesa/x86/Makefile.orig	2007-06-09 06:23:46.000000000 +0200
++++ Mesa-6.5.3/src/mesa/x86/Makefile	2007-06-09 06:24:53.000000000 +0200
+@@ -21,7 +21,7 @@
+ 
+ 
+ gen_matypes: gen_matypes.c
+-	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
++	$(CC_FOR_BUILD) $(INCLUDE_DIRS) $(CFLAGS_FOR_BUILD) gen_matypes.c -o gen_matypes
+ 
+ # need some special rules here, unfortunately
+ matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
new file mode 100644
index 000000000..fab4670ff
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -0,0 +1,85 @@
+#############################################################
+#
+# mesa3d
+#
+#############################################################
+MESA3D_VERSION:=6.5.3
+#MESA3D_VERSION:=6.4.2
+MESA3D_SOURCE:=MesaLib-$(MESA3D_VERSION).tar.gz
+MESA3D_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/mesa3d
+MESA3D_DIR:=$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)
+MESA_TARGET=linux-dri-x86
+MESA_BUILD_ENV=$(TARGET_CONFIGURE_OPTS)
+MESA_CONFIG_FILE=$(MESA3D_DIR)/configs/$(MESA_TARGET)
+#MESA_DRIVERS= i810 i915 i965 mga mach64 r128 r200 r300 s3v savage sis ffb tdfx trident unichrome
+MESA_DRIVERS=
+
+$(DL_DIR)/$(MESA3D_SOURCE):
+	$(WGET) -P $(DL_DIR) $(MESA3D_SITE)/$(MESA3D_SOURCE)
+
+$(MESA3D_DIR)/.extracted: $(DL_DIR)/$(MESA3D_SOURCE)
+	$(ZCAT) $(DL_DIR)/$(MESA3D_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	toolchain/patch-kernel.sh $(MESA3D_DIR) package/mesa3d/ mesa3d\*.patch
+	touch $@
+
+$(MESA3D_DIR)/.configured: $(MESA3D_DIR)/.extracted
+	( export $(TARGET_CONFIGURE_OPTS) ; \
+		echo "DRI_DIRS = $(MESA_DRIVERS)" && \
+		echo "OPT_FLAGS = $(TARGET_CFLAGS)" && \
+		echo "CC = $(TARGET_CC)" && \
+		echo "CXX = $(TARGET_CXX)" && \
+		echo "PIC_FLAGS = -fPIC" && \
+		echo "SRC_DIRS = glx/x11 mesa glu glut/glx" && \
+		echo "USING_EGL = 0" && \
+		echo "X11_INCLUDES = " && \
+		echo "EXTRA_LIB_PATH = " && \
+		echo "PROGRAM_DIRS =" \
+	) >> $(MESA_CONFIG_FILE)
+	touch $@
+
+$(MESA3D_DIR)/.built: BR2_JLEVEL=1
+$(MESA3D_DIR)/.built: $(MESA3D_DIR)/.configured
+	gccinc=$$($(TARGET_CC) -print-search-dirs | grep '^install:' | sed 's@^install: @@')include ; \
+	rm -f $(MESA3D_DIR)/config/current
+	env $(MESA_BUILD_ENV) $(MAKE) \
+		MKDEP="makedepend -I$$gccinc" \
+		CC=$(TARGET_CC) CXX=$(TARGET_CXX) CC_FOR_BUILD=/usr/bin/gcc \
+		-C $(MESA3D_DIR) $(MESA_TARGET)
+	touch $@
+
+$(MESA3D_DIR)/.installed: $(MESA3D_DIR)/.built
+	env $(MESA_BUILD_ENV) $(MAKE) \
+		INSTALL_DIR=$(STAGING_DIR)/usr \
+		DRI_DRIVER_INSTALL_DIR=$(STAGING_DIR)/usr/lib/dri \
+		-C $(MESA3D_DIR) install
+	env $(MESA_BUILD_ENV) $(MAKE) \
+		INSTALL_DIR=$(TARGET_DIR)/usr \
+		DRI_DRIVER_INSTALL_DIR=$(TARGET_DIR)/usr/lib/dri \
+		-C $(MESA3D_DIR) install
+	rm -Rf $(TARGET_DIR)/usr/include/GL
+	touch $@
+
+mesa3d-depends:   xproto_glproto xproto_xf86vidmodeproto xlib_libXxf86vm xlib_libXmu xlib_libXdamage libdrm
+mesa3d-source:    $(MESA3D_DIR)/.extracted
+mesa3d-configure: $(MESA3D_DIR)/.configured
+mesa3d-build:     $(MESA3D_DIR)/.built
+mesa3d:           mesa3d-depends $(MESA3D_DIR)/.installed	
+
+mesa3d-clean:
+	$(MAKE) prefix=$(STAGING_DIR)/usr -C $(MESA3D_DIR) uninstall
+	$(MAKE) prefix=$(TARGET_DIR)/usr  -C $(MESA3D_DIR) uninstall
+	-$(MAKE) -C $(MESA3D_DIR) clean
+
+mesa3d-dirclean:
+	rm -rf $(MESA3D_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_MESA3D)),y)
+TARGETS+=mesa3d
+endif
+# :mode=makefile:
+
-- 
cgit v1.2.3