Author: pebender
Date: Sat Jun 20 13:24:41 2009
New Revision: 4998
Added:
trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.4.3-parallel_build.patch
Modified:
trunk/gar-minimyth/script/xorg-7.4/Mesa/Makefile
trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums
Log:
- Fixed xorg-7.4/Mesa parallel build.
Modified: trunk/gar-minimyth/script/xorg-7.4/Mesa/Makefile
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/Mesa/Makefile (original)
+++ trunk/gar-minimyth/script/xorg-7.4/Mesa/Makefile Sat Jun 20 13:24:41
2009
@@ -4,7 +4,7 @@
MASTER_SITES = http://www.mesa3d.org/beta/
MASTER_SITES += http://easynews.dl.sourceforge.net/sourceforge/mesa3d/
DISTFILES = MesaLib-$(GARVERSION).tar.gz MesaGLUT-$(GARVERSION).tar.gz
MesaDemos-$(GARVERSION).tar.gz
-PATCHFILES = $(DISTNAME)-pkg_config.patch $(DISTNAME)-gen_matypes.patch
$(DISTNAME).patch.gar
+PATCHFILES = $(DISTNAME)-parallel_build.patch
$(DISTNAME)-pkg_config.patch $(DISTNAME)-gen_matypes.patch
$(DISTNAME).patch.gar
PATCHFILES += $(DISTNAME)-version.patch
LICENSE = LGPL2/MIT
Modified: trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums
==============================================================================
--- trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums (original)
+++ trunk/gar-minimyth/script/xorg-7.4/Mesa/checksums Sat Jun 20 13:24:41
2009
@@ -1,6 +1,7 @@
34c5a6c47ed51f31c4fa36e269831352 download/MesaLib-7.4.3.tar.gz
20e24f6692c0c90e7e3b220f79c4108d download/MesaGLUT-7.4.3.tar.gz
56752b7adede212e6097afb10d0c0d59 download/MesaDemos-7.4.3.tar.gz
+ec381a8156cdc9e82887d0a8915715fd download/Mesa-7.4.3-parallel_build.patch
b901a7b67e70ae685ce08686d202cf29 download/Mesa-7.4.3-pkg_config.patch
be615e325186601bb661a0d0ef93465b download/Mesa-7.4.3-gen_matypes.patch
7b219e377db07b2c2cdacbec4d176bf1 download/Mesa-7.4.3.patch.gar
Added:
trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.4.3-parallel_build.patch
==============================================================================
--- (empty file)
+++
trunk/gar-minimyth/script/xorg-7.4/Mesa/files/Mesa-7.4.3-parallel_build.patch
Sat Jun 20 13:24:41 2009
@@ -0,0 +1,24 @@
+diff -Naur Mesa-7.4.3-old/progs/glsl/Makefile
Mesa-7.4.3-new/progs/glsl/Makefile
+--- Mesa-7.4.3-old/progs/glsl/Makefile 2009-06-17 10:31:54.000000000 -0700
++++ Mesa-7.4.3-new/progs/glsl/Makefile 2009-06-20 13:15:11.000000000 -0700
+@@ -71,7 +71,7 @@
+ shaderutil.h: $(TOP)/progs/util/shaderutil.h
+ cp $< .
+
+-shaderutil.o: shaderutil.c shaderutil.h
++shaderutil.o: shaderutil.c shaderutil.h extfuncs.h
+ $(CC) -c -I$(INCDIR) $(CFLAGS) shaderutil.c
+
+
+@@ -124,6 +124,11 @@
+ mandelbrot: mandelbrot.o shaderutil.o
+ $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o
$(LIBS)
-o $@
+
++multinoise.o: multinoise.c extfuncs.h
++ $(CC) -c -I$(INCDIR) $(CFLAGS) multinoise.c
++
++multinoise: multinoise.o shaderutil.o
++ $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multinoise.o $(LIBS) -o $@
+
+ multitex.o: multitex.c extfuncs.h readtex.h shaderutil.h
+ $(CC) -c -I$(INCDIR) $(CFLAGS) multitex.c
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
