Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11 In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5707
Modified Files: mesa-libglw.patch Log Message: update to Mesa 7.2 sources Index: mesa-libglw.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/mesa-libglw.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- mesa-libglw.patch 2 Jul 2008 00:31:11 -0000 1.3 +++ mesa-libglw.patch 1 Jan 2009 16:20:34 -0000 1.4 @@ -1,19 +1,28 @@ ---- Mesa-7.0.2.orig/configs/darwin 2007-11-01 15:09:01.000000000 -0400 -+++ Mesa-7.0.2/configs/darwin 2008-04-27 11:52:43.000000000 -0400 -@@ -7,6 +7,12 @@ - # Compiler and flags - CC = cc - CXX = cc -+ -+COPY_LIBS = cp -f -+ -+MKDEP = gcc -M -MG -+MKDEP_OPTIONS = -MF depend -+ - CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin - CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin +diff -uNr Mesa-7.2/bin/mklib Mesa-7.2.fink/bin/mklib +--- Mesa-7.2/bin/mklib 2008-08-25 10:46:41.000000000 -0400 ++++ Mesa-7.2.fink/bin/mklib 2009-01-01 10:12:42.000000000 -0500 +@@ -638,7 +638,7 @@ + else + LIBSUFFIX="dylib" + if [ -z "$ID" ] ; then +- ID="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ++ ID="@FINKPREFIX@/lib/liblib${LIBNAME}.${MAJOR}.${MINOR}.${LIBSUFFIX}" + fi + OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name ${ID}" + fi +diff -uNr Mesa-7.2/configs/darwin Mesa-7.2.fink/configs/darwin +--- Mesa-7.2/configs/darwin 2008-08-25 10:46:41.000000000 -0400 ++++ Mesa-7.2.fink/configs/darwin 2009-01-01 11:12:05.000000000 -0500 +@@ -4,7 +4,7 @@ -@@ -18,16 +24,13 @@ + CONFIG_NAME = darwin + +-INSTALL_DIR = /usr/X11 ++INSTALL_DIR = @FINKPREFIX@ + + # Compiler and flags + CC = gcc +@@ -29,7 +29,7 @@ GL_LIB_NAME = libGL.dylib GLU_LIB_NAME = libGLU.dylib GLUT_LIB_NAME = libglut.dylib @@ -21,61 +30,24 @@ +GLW_LIB_NAME = libg...@motif@.dylib OSMESA_LIB_NAME = libOSMesa.dylib - GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread - OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL - GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL - GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext --GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib -+GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt -l$(GL_LIB) /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib -...@finkprefix@/lib -lXm - APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm + # globs used to install the lib and all symlinks +@@ -43,11 +43,9 @@ + OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXi -lXext +-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXt ++GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -l$(GL_LIB) /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXt -L/@FINKPREFIX@/lib -lXm + APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm -# omit glw lib for now: --SRC_DIRS = mesa glu glut/glx -- ---- Mesa-6.5.1/bin/mklib.org 2008-02-27 00:02:50.000000000 -0500 -+++ Mesa-6.5.1/bin/mklib 2008-02-27 00:06:25.000000000 -0500 -@@ -584,7 +584,7 @@ - OPTS="${ARCHOPT} -bundle -multiply_defined suppress" - else - LIBSUFFIX="dylib" -- OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" -+ OPTS="${ARCHOPT} -dynamiclib -multiply_defined suppress -current_version ${MAJOR}.${MINOR}.0 -compatibility_version ${MAJOR}.${MINOR}.0 -install_name @FINKPREFIX@/lib/lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" - fi - LINKNAME="lib${LIBNAME}.${LIBSUFFIX}" - LIBNAME="lib${LIBNAME}.${MAJOR}.${LIBSUFFIX}" ---- Mesa-7.0.2/src/glw/Makefile.orig 2007-09-28 20:43:28.000000000 -0400 -+++ Mesa-7.0.2/src/glw/Makefile 2008-02-27 15:13:25.000000000 -0500 -@@ -7,7 +7,7 @@ - MINOR = 0 - TINY = 0 - --INCDIRS = -I$(TOP)/include -I/usr/include/Motif1.2 $(X11_INCLUDES) -+INCDIRS = -I$(TOP)/include -...@finkprefix@/include $(X11_INCLUDES) - - - OBJECTS = $(GLW_SOURCES:.c=.o) -@@ -33,13 +33,11 @@ - glw.pc: glw.pc.in - $(pcedit) $< > $@ - --install: glw.pc -- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL -- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) -- $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig -- $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_DIR)/include/GL -- $(INSTALL) $(TOP)/$(LIB_DIR)/libGLw.* $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR) -- $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig -+install: -+ $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)@FINKPREFIX@/include/GL -+ $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)@FINKPREFIX@/$(LIB_DIR) -+ $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_DIR)@FINKPREFIX@/include/GL -+ $(INSTALL) $(TOP)/$(LIB_DIR)/libg...@motif@.1.* $(DESTDIR)$(INSTALL_DIR)@FINKPREFIX@/$(LIB_DIR) - - clean: - -rm depend depend.bak ---- Mesa-7.0.2.orig/configs/default 2007-11-01 11:30:52.000000000 -0400 -+++ Mesa-7.0.2/configs/default 2008-04-27 12:07:55.000000000 -0400 -@@ -38,7 +38,7 @@ +-SRC_DIRS = glx/x11 mesa glu glw glut/glx + GLU_DIRS = sgi + DRIVER_DIRS = osmesa + #DRIVER_DIRS = dri +diff -uNr Mesa-7.2/configs/default Mesa-7.2.fink/configs/default +--- Mesa-7.2/configs/default 2008-09-13 16:32:10.000000000 -0400 ++++ Mesa-7.2.fink/configs/default 2009-01-01 10:12:42.000000000 -0500 +@@ -43,7 +43,7 @@ GL_LIB = GL GLU_LIB = GLU GLUT_LIB = glut @@ -84,12 +56,14 @@ OSMESA_LIB = OSMesa -@@ -55,12 +55,12 @@ +@@ -66,13 +66,13 @@ # GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in # order to build the Motif widget too) -GLW_SOURCES = GLwDrawA.c +-MOTIF_CFLAGS = -I/usr/include/Motif1.2 +GLW_SOURCES = GLwDrawA.c GLwMDrawA.c ++MOTIF_CFLAGS = -...@finkprefix@/include # Directories to build @@ -99,12 +73,42 @@ GLU_DIRS = sgi DRIVER_DIRS = x11 osmesa # Which subdirs under $(TOP)/progs/ to enter: -@@ -73,7 +73,7 @@ +@@ -85,7 +85,7 @@ OSMESA_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm - GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXi -lm -GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 +GLW_LIB_DEPS = -l$(GL_LIB) -lXt -lX11 # Program dependencies - specific GL/glut libraries added in Makefiles APP_LIB_DEPS = -lm +diff -uNr Mesa-7.2/src/glw/Makefile Mesa-7.2.fink/src/glw/Makefile +--- Mesa-7.2/src/glw/Makefile 2008-08-25 10:46:42.000000000 -0400 ++++ Mesa-7.2.fink/src/glw/Makefile 2009-01-01 10:12:42.000000000 -0500 +@@ -34,13 +34,13 @@ + glw.pc: glw.pc.in + $(pcedit) $< > $@ + +-install: glw.pc ++install: + $(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL + $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR) +- $(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig + $(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL +- $(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR) +- $(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig ++ $(INSTALL) $(TOP)/$(LIB_DIR)/lib$(GLW_LIB).$(MAJOR).$(MINOR).dylib $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) $(TOP)/$(LIB_DIR)/lib$(GLW_LIB).$(MAJOR).dylib $(DESTDIR)$(INSTALL_LIB_DIR) ++ $(INSTALL) $(TOP)/$(LIB_DIR)/lib$(GLW_LIB).dylib $(DESTDIR)$(INSTALL_LIB_DIR) + + clean: + -rm -f depend depend.bak +@@ -53,7 +53,7 @@ + -major $(MAJOR) -minor $(MINOR) -patch $(TINY) \ + $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \ + -id $(INSTALL_LIB_DIR)/lib$(GLW_LIB).$(MAJOR).dylib \ +- $(GLW_LIB_DEPS) $(OBJECTS) ++ $(OBJECTS) $(GLW_LIB_DEPS) + + + # ------------------------------------------------------------------------------ _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs